diff --git a/src/data/bard_music/actions.h b/src/data/bard_music/actions.h
index fd8e63061..2015e322b 100644
--- a/src/data/bard_music/actions.h
+++ b/src/data/bard_music/actions.h
@@ -2,628 +2,628 @@
 #define GUARD_DATA_BARD_MUSIC_ACTIONS_H
 const struct BardSound gBardSounds_Actions[][6] = {
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x29),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/adjectives.h b/src/data/bard_music/adjectives.h
index e56efaa24..c6b3914b3 100644
--- a/src/data/bard_music/adjectives.h
+++ b/src/data/bard_music/adjectives.h
@@ -2,292 +2,292 @@
 #define GUARD_DATA_BARD_MUSIC_ADJECTIVES_H
 const struct BardSound gBardSounds_Adjectives[][6] = {
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 }
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
     }
 };
 
diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h
index 1dd5c7f56..9017d451b 100644
--- a/src/data/bard_music/bard_sounds.h
+++ b/src/data/bard_music/bard_sounds.h
@@ -1,7 +1,10 @@
 #ifndef GUARD_BARD_SOUNDS_TABLE_H
 #define GUARD_BARD_SOUNDS_TABLE_H
 
-#define NULL_BARD_SOUND { 0xff }
+#define BARD_SOUND_FULL(var00, var01, var02) { var00, var01, var02, 0x0, 0x0 }
+#define BARD_SOUND(var00)   BARD_SOUND_FULL(var00, 0x0, 0x0)
+#define BARD_SOUND_EMPTY    BARD_SOUND(0x0)
+#define BARD_SOUND_NULL     BARD_SOUND(0xff)
 
 #include "pokemon.h"
 #include "moves.h"
diff --git a/src/data/bard_music/battle.h b/src/data/bard_music/battle.h
index 19d032f56..086ea50a6 100644
--- a/src/data/bard_music/battle.h
+++ b/src/data/bard_music/battle.h
@@ -2,508 +2,508 @@
 #define GUARD_DATA_BARD_MUSIC_BATTLE_H
 const struct BardSound gBardSounds_Battle[][6] = {
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x16, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x16),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/conditions.h b/src/data/bard_music/conditions.h
index d79cc100b..30ed9842f 100644
--- a/src/data/bard_music/conditions.h
+++ b/src/data/bard_music/conditions.h
@@ -2,556 +2,556 @@
 #define GUARD_DATA_BARD_MUSIC_CONDITIONS_H
 const struct BardSound gBardSounds_Conditions[][6] = {
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x29),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x20),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x19, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x19),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x23),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x26),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x26),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x16, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x16),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x16, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x16),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x26),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x21),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/default_sound.h b/src/data/bard_music/default_sound.h
index ad4008e16..39783392a 100644
--- a/src/data/bard_music/default_sound.h
+++ b/src/data/bard_music/default_sound.h
@@ -2,12 +2,12 @@
 #define GUARD_default_sound_H
 
 const struct BardSound gBardSound_InvalidWord[] = {
-    NULL_BARD_SOUND,
-    NULL_BARD_SOUND,
-    NULL_BARD_SOUND,
-    NULL_BARD_SOUND,
-    NULL_BARD_SOUND,
-    NULL_BARD_SOUND
+    BARD_SOUND_NULL,
+    BARD_SOUND_NULL,
+    BARD_SOUND_NULL,
+    BARD_SOUND_NULL,
+    BARD_SOUND_NULL,
+    BARD_SOUND_NULL
 };
 
 #endif //GUARD_default_sound_H
diff --git a/src/data/bard_music/endings.h b/src/data/bard_music/endings.h
index 7e4304521..2ed3c2189 100644
--- a/src/data/bard_music/endings.h
+++ b/src/data/bard_music/endings.h
@@ -2,556 +2,556 @@
 #define GUARD_DATA_BARD_MUSIC_ENDINGS_H
 const struct BardSound gBardSounds_Endings[][6] = {
     {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x10),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x14),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x21),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x23),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/events.h b/src/data/bard_music/events.h
index 70960e15d..79bbb4e4b 100644
--- a/src/data/bard_music/events.h
+++ b/src/data/bard_music/events.h
@@ -2,236 +2,236 @@
 #define GUARD_DATA_BARD_MUSIC_EVENTS_H
 const struct BardSound gBardSounds_Events[][6] = {
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/feelings.h b/src/data/bard_music/feelings.h
index cdab88639..215ff7de9 100644
--- a/src/data/bard_music/feelings.h
+++ b/src/data/bard_music/feelings.h
@@ -2,556 +2,556 @@
 #define GUARD_DATA_BARD_MUSIC_FEELINGS_H
 const struct BardSound gBardSounds_Feelings[][6] = {
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x19, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x19),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x20),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x20),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x20),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x26),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x20),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x20),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/greetings.h b/src/data/bard_music/greetings.h
index 22af4dd5c..86bf9668d 100644
--- a/src/data/bard_music/greetings.h
+++ b/src/data/bard_music/greetings.h
@@ -2,340 +2,340 @@
 #define GUARD_DATA_BARD_MUSIC_GREETINGS_H
 const struct BardSound gBardSounds_Greetings[][6] = {
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x28, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x28),
+        BARD_SOUND(0xd),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/hobbies.h b/src/data/bard_music/hobbies.h
index 66fdbc0c7..5b2b8d92a 100644
--- a/src/data/bard_music/hobbies.h
+++ b/src/data/bard_music/hobbies.h
@@ -2,436 +2,436 @@
 #define GUARD_DATA_BARD_MUSIC_HOBBIES_H
 const struct BardSound gBardSounds_Hobbies[][6] = {
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x4),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2f, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2f),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x8),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/lifestyle.h b/src/data/bard_music/lifestyle.h
index 7054283f4..ea81fdeb5 100644
--- a/src/data/bard_music/lifestyle.h
+++ b/src/data/bard_music/lifestyle.h
@@ -2,364 +2,364 @@
 #define GUARD_DATA_BARD_MUSIC_LIFESTYLE_H
 const struct BardSound gBardSounds_Lifestyle[][6] = {
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/misc.h b/src/data/bard_music/misc.h
index 84e1d5530..2b06baa1a 100644
--- a/src/data/bard_music/misc.h
+++ b/src/data/bard_music/misc.h
@@ -2,340 +2,340 @@
 #define GUARD_DATA_BARD_MUSIC_MISC_H
 const struct BardSound gBardSounds_Misc[][6] = {
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2e),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h
index 06cc68d53..372cc050c 100644
--- a/src/data/bard_music/moves.h
+++ b/src/data/bard_music/moves.h
@@ -7,2844 +7,2844 @@ const u16 gNumBardWords_Moves = MOVES_COUNT;
 
 const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = {
     [MOVE_NONE] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POUND] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_KARATE_CHOP] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DOUBLE_SLAP] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xa, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x2),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_COMET_PUNCH] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEGA_PUNCH] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PAY_DAY] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FIRE_PUNCH] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ICE_PUNCH] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THUNDER_PUNCH] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SCRATCH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_VICE_GRIP] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GUILLOTINE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RAZOR_WIND] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWORDS_DANCE] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CUT] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GUST] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WING_ATTACK] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WHIRLWIND] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLY] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BIND] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLAM] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_VINE_WHIP] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STOMP] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DOUBLE_KICK] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEGA_KICK] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_JUMP_KICK] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROLLING_KICK] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SAND_ATTACK] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HEADBUTT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HORN_ATTACK] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FURY_ATTACK] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HORN_DRILL] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TACKLE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BODY_SLAM] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WRAP] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TAKE_DOWN] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x23, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THRASH] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DOUBLE_EDGE] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0xa, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0xa),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TAIL_WHIP] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POISON_STING] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TWINEEDLE] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PIN_MISSILE] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LEER] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BITE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GROWL] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROAR] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SING] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUPERSONIC] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SONIC_BOOM] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DISABLE] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ACID] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EMBER] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLAMETHROWER] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIST] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WATER_GUN] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HYDRO_PUMP] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SURF] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ICE_BEAM] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BLIZZARD] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PSYBEAM] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BUBBLE_BEAM] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AURORA_BEAM] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_HYPER_BEAM] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PECK] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DRILL_PECK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUBMISSION] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LOW_KICK] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_COUNTER] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SEISMIC_TOSS] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STRENGTH] = {
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ABSORB] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEGA_DRAIN] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LEECH_SEED] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GROWTH] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RAZOR_LEAF] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SOLAR_BEAM] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POISON_POWDER] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STUN_SPORE] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLEEP_POWDER] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PETAL_DANCE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STRING_SHOT] = {
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DRAGON_RAGE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_FIRE_SPIN] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THUNDER_SHOCK] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THUNDERBOLT] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THUNDER_WAVE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THUNDER] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROCK_THROW] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EARTHQUAKE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FISSURE] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DIG] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TOXIC] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CONFUSION] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x29, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PSYCHIC] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HYPNOSIS] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEDITATE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AGILITY] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_QUICK_ATTACK] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RAGE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TELEPORT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_NIGHT_SHADE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIMIC] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SCREECH] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xd, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DOUBLE_TEAM] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RECOVER] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HARDEN] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MINIMIZE] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SMOKESCREEN] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CONFUSE_RAY] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2d, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WITHDRAW] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DEFENSE_CURL] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BARRIER] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LIGHT_SCREEN] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HAZE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_REFLECT] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FOCUS_ENERGY] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
     },
     [MOVE_BIDE] = {
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_METRONOME] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIRROR_MOVE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x29, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x29),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SELF_DESTRUCT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EGG_BOMB] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LICK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SMOG] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLUDGE] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BONE_CLUB] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FIRE_BLAST] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WATERFALL] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CLAMP] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWIFT] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SKULL_BASH] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPIKE_CANNON] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CONSTRICT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AMNESIA] = {
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_KINESIS] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SOFT_BOILED] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HI_JUMP_KICK] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GLARE] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DREAM_EATER] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POISON_GAS] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BARRAGE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LEECH_LIFE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LOVELY_KISS] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_SKY_ATTACK] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TRANSFORM] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BUBBLE] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DIZZY_PUNCH] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPORE] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLASH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PSYWAVE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPLASH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ACID_ARMOR] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CRABHAMMER] = {
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EXPLOSION] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_FURY_SWIPES] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BONEMERANG] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_REST] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROCK_SLIDE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HYPER_FANG] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SHARPEN] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CONVERSION] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TRI_ATTACK] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUPER_FANG] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLASH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUBSTITUTE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STRUGGLE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SKETCH] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TRIPLE_KICK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_THIEF] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPIDER_WEB] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIND_READER] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_NIGHTMARE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLAME_WHEEL] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SNORE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CURSE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLAIL] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CONVERSION_2] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_AEROBLAST] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_COTTON_SPORE] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_REVERSAL] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPITE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POWDER_SNOW] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PROTECT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MACH_PUNCH] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SCARY_FACE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FAINT_ATTACK] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWEET_KISS] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BELLY_DRUM] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLUDGE_BOMB] = {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MUD_SLAP] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_OCTAZOOKA] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x28, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPIKES] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ZAP_CANNON] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FORESIGHT] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DESTINY_BOND] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PERISH_SONG] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ICY_WIND] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DETECT] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BONE_RUSH] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LOCK_ON] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_OUTRAGE] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SANDSTORM] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GIGA_DRAIN] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ENDURE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CHARM] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROLLOUT] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FALSE_SWIPE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWAGGER] = {
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MILK_DRINK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPARK] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FURY_CUTTER] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STEEL_WING] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0xd, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEAN_LOOK] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ATTRACT] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLEEP_TALK] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HEAL_BELL] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0xa, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RETURN] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PRESENT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FRUSTRATION] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SAFEGUARD] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PAIN_SPLIT] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SACRED_FIRE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_MAGNITUDE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DYNAMIC_PUNCH] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEGAHORN] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DRAGON_BREATH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_BATON_PASS] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ENCORE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PURSUIT] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RAPID_SPIN] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWEET_SCENT] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_IRON_TAIL] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_METAL_CLAW] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_VITAL_THROW] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MORNING_SUN] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SYNTHESIS] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MOONLIGHT] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HIDDEN_POWER] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CROSS_CHOP] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TWISTER] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RAIN_DANCE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUNNY_DAY] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CRUNCH] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIRROR_COAT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_PSYCH_UP] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EXTREME_SPEED] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ANCIENT_POWER] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_SHADOW_BALL] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FUTURE_SIGHT] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROCK_SMASH] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WHIRLPOOL] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BEAT_UP] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FAKE_OUT] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_UPROAR] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_STOCKPILE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SPIT_UP] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SWALLOW] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HEAT_WAVE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HAIL] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TORMENT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FLATTER] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WILL_O_WISP] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MEMENTO] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FACADE] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FOCUS_PUNCH] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SMELLING_SALT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FOLLOW_ME] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_NATURE_POWER] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CHARGE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TAUNT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HELPING_HAND] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TRICK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROLE_PLAY] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WISH] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ASSIST] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_INGRAIN] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SUPERPOWER] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MAGIC_COAT] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_RECYCLE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_REVENGE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BRICK_BREAK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_YAWN] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_KNOCK_OFF] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ENDEAVOR] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ERUPTION] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SKILL_SWAP] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_IMPRISON] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_REFRESH] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GRUDGE] = {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SNATCH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SECRET_POWER] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DIVE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ARM_THRUST] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CAMOUFLAGE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TAIL_GLOW] = {
-        { 0x4, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LUSTER_PURGE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MIST_BALL] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FEATHER_DANCE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TEETER_DANCE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BLAZE_KICK] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MUD_SPORT] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ICE_BALL] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_NEEDLE_ARM] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SLACK_OFF] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HYPER_VOICE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1e),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POISON_FANG] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CRUSH_CLAW] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BLAST_BURN] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HYDRO_CANNON] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_METEOR_MASH] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0}
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
     },
     [MOVE_ASTONISH] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WEATHER_BALL] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AROMATHERAPY] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0}
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xe),
     },
     [MOVE_FAKE_TEARS] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AIR_CUTTER] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_OVERHEAT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ODOR_SLEUTH] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROCK_TOMB] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SILVER_WIND] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xf),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_METAL_SOUND] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x21),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_GRASS_WHISTLE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_TICKLE] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_COSMIC_POWER] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WATER_SPOUT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x21),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SIGNAL_BEAM] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SHADOW_PUNCH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_EXTRASENSORY] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
     },
     [MOVE_SKY_UPPERCUT] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SAND_TOMB] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SHEER_COLD] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MUDDY_WATER] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BULLET_SEED] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_AERIAL_ACE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ICICLE_SPEAR] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
     },
     [MOVE_IRON_DEFENSE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BLOCK] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_HOWL] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DRAGON_CLAW] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_FRENZY_PLANT] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BULK_UP] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_BOUNCE] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MUD_SHOT] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_POISON_TAIL] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_COVET] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_VOLT_TACKLE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_MAGICAL_LEAF] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [MOVE_WATER_SPORT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_CALM_MIND] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_LEAF_BLADE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DRAGON_DANCE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_ROCK_BLAST] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_SHOCK_WAVE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_WATER_PULSE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [MOVE_DOOM_DESIRE] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
     },
     [MOVE_PSYCHO_BOOST] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/people.h b/src/data/bard_music/people.h
index 2db017080..850ebed11 100644
--- a/src/data/bard_music/people.h
+++ b/src/data/bard_music/people.h
@@ -2,604 +2,604 @@
 #define GUARD_DATA_BARD_MUSIC_PEOPLE_H
 const struct BardSound gBardSounds_People[][6] = {
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x13, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x13),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1a, -0x9, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND_FULL(0x1a, -0x9, 0x0),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x28, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
index 294cd4078..7f68efb7b 100644
--- a/src/data/bard_music/pokemon.h
+++ b/src/data/bard_music/pokemon.h
@@ -5,3300 +5,3300 @@ const u16 gNumBardWords_Species = NUM_SPECIES;
 
 const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = {
     [SPECIES_NONE] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BULBASAUR] = {
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_IVYSAUR] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VENUSAUR] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHARMANDER] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHARMELEON] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHARIZARD] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_SQUIRTLE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WARTORTLE] = {
-        { 0x8, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BLASTOISE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CATERPIE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_METAPOD] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BUTTERFREE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WEEDLE] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x26, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KAKUNA] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BEEDRILL] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PIDGEY] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PIDGEOTTO] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PIDGEOT] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RATTATA] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RATICATE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SPEAROW] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FEAROW] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_EKANS] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARBOK] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x17, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PIKACHU] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RAICHU] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SANDSHREW] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SANDSLASH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDORAN_F] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDORINA] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDOQUEEN] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDORAN_M] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDORINO] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NIDOKING] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLEFAIRY] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLEFABLE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VULPIX] = {
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NINETALES] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_JIGGLYPUFF] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_WIGGLYTUFF] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_ZUBAT] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GOLBAT] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ODDISH] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GLOOM] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VILEPLUME] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PARAS] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PARASECT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VENONAT] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VENOMOTH] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DIGLETT] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DUGTRIO] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEOWTH] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PERSIAN] = {
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PSYDUCK] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GOLDUCK] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MANKEY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PRIMEAPE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GROWLITHE] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARCANINE] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_POLIWAG] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_POLIWHIRL] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_POLIWRATH] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ABRA] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KADABRA] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ALAKAZAM] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MACHOP] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MACHOKE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MACHAMP] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BELLSPROUT] = {
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WEEPINBELL] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VICTREEBEL] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TENTACOOL] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TENTACRUEL] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GEODUDE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GRAVELER] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GOLEM] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PONYTA] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RAPIDASH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLOWPOKE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLOWBRO] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGNEMITE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGNETON] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FARFETCHD] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DODUO] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DODRIO] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEEL] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DEWGONG] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GRIMER] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MUK] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHELLDER] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLOYSTER] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GASTLY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HAUNTER] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GENGAR] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x8, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ONIX] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DROWZEE] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HYPNO] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KRABBY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KINGLER] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VOLTORB] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ELECTRODE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_EXEGGCUTE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_EXEGGUTOR] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_CUBONE] = {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAROWAK] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1a),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HITMONLEE] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HITMONCHAN] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x15),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LICKITUNG] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KOFFING] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WEEZING] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RHYHORN] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RHYDON] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHANSEY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TANGELA] = {
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KANGASKHAN] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HORSEA] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEADRA] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GOLDEEN] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEAKING] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_STARYU] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_STARMIE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MR_MIME] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SCYTHER] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_JYNX] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ELECTABUZZ] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGMAR] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PINSIR] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TAUROS] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGIKARP] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GYARADOS] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LAPRAS] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DITTO] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_EEVEE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VAPOREON] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_JOLTEON] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FLAREON] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PORYGON] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OMANYTE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OMASTAR] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KABUTO] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KABUTOPS] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AERODACTYL] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SNORLAX] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARTICUNO] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ZAPDOS] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MOLTRES] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DRATINI] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DRAGONAIR] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DRAGONITE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEWTWO] = {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEW] = {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHIKORITA] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BAYLEEF] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEGANIUM] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CYNDAQUIL] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_QUILAVA] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x8, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x8),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TYPHLOSION] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     [SPECIES_TOTODILE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CROCONAW] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FERALIGATR] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
     },
     [SPECIES_SENTRET] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FURRET] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HOOTHOOT] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NOCTOWL] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LEDYBA] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LEDIAN] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SPINARAK] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARIADOS] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CROBAT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHINCHOU] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LANTURN] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PICHU] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLEFFA] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_IGGLYBUFF] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TOGEPI] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TOGETIC] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NATU] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_XATU] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAREEP] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FLAAFFY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AMPHAROS] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BELLOSSOM] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MARILL] = {
-        { 0x8, 0x0, 0x0, 0x0, 0x0},
-        { 0x10, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AZUMARILL] = {
-        { 0x8, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x10, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x10),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SUDOWOODO] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_POLITOED] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HOPPIP] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SKIPLOOM] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_JUMPLUFF] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AIPOM] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SUNKERN] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SUNFLORA] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_YANMA] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WOOPER] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_QUAGSIRE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ESPEON] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_UMBREON] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MURKROW] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLOWKING] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MISDREAVUS] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_UNOWN] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WOBBUFFET] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GIRAFARIG] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PINECO] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FORRETRESS] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DUNSPARCE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GLIGAR] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_STEELIX] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SNUBBULL] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GRANBULL] = {
-        { 0x2, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_QWILFISH] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SCIZOR] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHUCKLE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x26, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HERACROSS] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SNEASEL] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x26, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TEDDIURSA] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_URSARING] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLUGMA] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGCARGO] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SWINUB] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PILOSWINE] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CORSOLA] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_REMORAID] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OCTILLERY] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DELIBIRD] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MANTINE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SKARMORY] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HOUNDOUR] = {
-        { 0x23, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HOUNDOOM] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KINGDRA] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PHANPY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DONPHAN] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PORYGON2] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_STANTLER] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SMEARGLE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x26, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TYROGUE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HITMONTOP] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SMOOCHUM] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ELEKID] = {
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAGBY] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MILTANK] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BLISSEY] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RAIKOU] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ENTEI] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SUICUNE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LARVITAR] = {
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x15, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PUPITAR] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TYRANITAR] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LUGIA] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HO_OH] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CELEBI] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_B] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_C] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_D] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_E] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_F] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_G] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_H] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_I] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_J] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_K] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_L] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_M] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_N] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_O] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_P] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_Q] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_R] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_S] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_T] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_U] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_V] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_W] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_X] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_Y] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_OLD_UNOWN_Z] = {
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TREECKO] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GROVYLE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SCEPTILE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TORCHIC] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_COMBUSKEN] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BLAZIKEN] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MUDKIP] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MARSHTOMP] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SWAMPERT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_POOCHYENA] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MIGHTYENA] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ZIGZAGOON] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LINOONE] = {
-        { 0x14, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WURMPLE] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SILCOON] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x28, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BEAUTIFLY] = {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CASCOON] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DUSTOX] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x17, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LOTAD] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LOMBRE] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LUDICOLO] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEEDOT] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NUZLEAF] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHIFTRY] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NINCADA] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NINJASK] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHEDINJA] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TAILLOW] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SWELLOW] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHROOMISH] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BRELOOM] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SPINDA] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WINGULL] = {
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PELIPPER] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SURSKIT] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MASQUERAIN] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WAILMER] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WAILORD] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SKITTY] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DELCATTY] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KECLEON] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BALTOY] = {
-        { 0x1, 0x0, 0x0, 0x0, 0x0},
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLAYDOL] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NOSEPASS] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TORKOAL] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SABLEYE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BARBOACH] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WHISCASH] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LUVDISC] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CORPHISH] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CRAWDAUNT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FEEBAS] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MILOTIC] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CARVANHA] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHARPEDO] = {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TRAPINCH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VIBRAVA] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_FLYGON] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAKUHITA] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HARIYAMA] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ELECTRIKE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MANECTRIC] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_NUMEL] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0xb, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CAMERUPT] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SPHEAL] = {
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEALEO] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WALREIN] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CACNEA] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CACTURNE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SNORUNT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GLALIE] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LUNATONE] = {
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SOLROCK] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AZURILL] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SPOINK] = {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GRUMPIG] = {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_PLUSLE] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MINUN] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MAWILE] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEDITITE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_MEDICHAM] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SWABLU] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ALTARIA] = {
-        { 0x6, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WYNAUT] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DUSKULL] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x26, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DUSCLOPS] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ROSELIA] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLAKOTH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VIGOROTH] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SLAKING] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GULPIN] = {
-        { 0x24, 0x0, 0x0, 0x0, 0x0},
-        { 0xf, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x24),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SWALOT] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_TROPIUS] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_WHISMUR] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LOUDRED] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_EXPLOUD] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CLAMPERL] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x32, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_HUNTAIL] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GOREBYSS] = {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x2c, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ABSOL] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHUPPET] = {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BANETTE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SEVIPER] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ZANGOOSE] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RELICANTH] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARON] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1d, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LAIRON] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_AGGRON] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CASTFORM] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x1a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_VOLBEAT] = {
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ILLUMISE] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x27, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LILEEP] = {
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CRADILY] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ANORITH] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_ARMALDO] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RALTS] = {
-        { 0x7, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KIRLIA] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GARDEVOIR] = {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BAGON] = {
-        { 0x5, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SHELGON] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_SALAMENCE] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_BELDUM] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_METANG] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_METAGROSS] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_REGIROCK] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_REGICE] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_REGISTEEL] = {
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0xe, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_KYOGRE] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_GROUDON] = {
-        { 0x21, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_RAYQUAZA] = {
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x3, 0x0, 0x0, 0x0, 0x0},
-        { 0x2a, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LATIAS] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_LATIOS] = {
-        { 0x0, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_JIRACHI] = {
-        { 0x30, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_DEOXYS] = {
-        { 0xc, 0x0, 0x0, 0x0, 0x0},
-        { 0x1b, 0x0, 0x0, 0x0, 0x0},
-        { 0x11, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     [SPECIES_CHIMECHO] = {
-        { 0x12, 0x0, 0x0, 0x0, 0x0},
-        { 0x9, 0x0, 0x0, 0x0, 0x0},
-        { 0x18, 0x0, 0x0, 0x0, 0x0},
-        { 0x33, 0x0, 0x0, 0x0, 0x0},
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/speech.h b/src/data/bard_music/speech.h
index d0d4abb11..bd963f235 100644
--- a/src/data/bard_music/speech.h
+++ b/src/data/bard_music/speech.h
@@ -2,484 +2,484 @@
 #define GUARD_DATA_BARD_MUSIC_SPEECH_H
 const struct BardSound gBardSounds_Speech[][6] = {
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xa),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x17),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xb),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x23),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x7),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x10, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x10),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x28, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/status.h b/src/data/bard_music/status.h
index 418fe639a..516c648a4 100644
--- a/src/data/bard_music/status.h
+++ b/src/data/bard_music/status.h
@@ -2,876 +2,876 @@
 #define GUARD_DATA_BARD_MUSIC_STATUS_H
 const struct BardSound gBardSounds_Status[][6] = {
     {
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x6),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
-    {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+    {
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x18),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x29, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x29),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x17),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x20),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x20, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x20),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1e),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x26),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x15),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x3),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x15),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
-    },
+        BARD_SOUND(0x2d),
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+    },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/time.h b/src/data/bard_music/time.h
index 5755353a0..befcf842d 100644
--- a/src/data/bard_music/time.h
+++ b/src/data/bard_music/time.h
@@ -2,364 +2,364 @@
 #define GUARD_DATA_BARD_MUSIC_TIME_H
 const struct BardSound gBardSounds_Time[][6] = {
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x2c),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x28, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x21, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x21),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x5),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x32),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/trainer.h b/src/data/bard_music/trainer.h
index a59689b6c..b98887a68 100644
--- a/src/data/bard_music/trainer.h
+++ b/src/data/bard_music/trainer.h
@@ -2,220 +2,220 @@
 #define GUARD_DATA_BARD_MUSIC_TRAINER_H
 const struct BardSound gBardSounds_Trainer[][6] = {
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2d, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x2d),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x15, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x15),
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x32),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 }
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x6),
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x8, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 }
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x8),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x32, 0x0, 0x0, 0x0, 0x0 },
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x32),
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x1b),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/trendysaying.h b/src/data/bard_music/trendysaying.h
index 4830725ad..75870c241 100644
--- a/src/data/bard_music/trendysaying.h
+++ b/src/data/bard_music/trendysaying.h
@@ -2,268 +2,268 @@
 #define GUARD_DATA_BARD_MUSIC_TRENDYSAYING_H
 const struct BardSound gBardSounds_TrendySaying[][6] = {
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x14, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x14),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x1b),
+        BARD_SOUND(0x17),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x26, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x26),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x12),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x1a),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xe),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x0, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_EMPTY,
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x3, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x3),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x24),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1d, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1d),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2b, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2b),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };
 
diff --git a/src/data/bard_music/voices.h b/src/data/bard_music/voices.h
index 868ebaecf..5919bebcb 100644
--- a/src/data/bard_music/voices.h
+++ b/src/data/bard_music/voices.h
@@ -2,508 +2,508 @@
 #define GUARD_DATA_BARD_MUSIC_VOICES_H
 const struct BardSound gBardSounds_Voices[][6] = {
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1b, 0x5, 0x8, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND_FULL(0x1b, 0x5, 0x8),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x28, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x28),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x19, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x19),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x31, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x31),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x23, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x23),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        { 0x11, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND(0x11),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xa, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xa),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2, 0x0, 0x0, 0x0, 0x0 },
-        { 0x24, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x2),
+        BARD_SOUND(0x24),
+        BARD_SOUND_NULL,
     },
     {
-        { 0x13, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x13),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x12, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x12),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1e, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x1e),
+        BARD_SOUND(0x1e),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        { 0xb, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x17),
+        BARD_SOUND(0xb),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x17, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x17),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x5, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x5),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x13, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x13),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        { 0xc, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND(0xc),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x9, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x9),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x18),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x2a, 0x0, 0x0, 0x0, 0x0 },
-        { 0x2c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x2a),
+        BARD_SOUND(0x2c),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0xe, 0x0, 0x0, 0x0, 0x0 },
-        { 0x30, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0xe),
+        BARD_SOUND(0x30),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x1c, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x1c),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        { 0x27, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x27),
+        BARD_SOUND(0x27),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0xf, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0xf),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x18, 0x0, 0x0, 0x0, 0x0 },
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x18),
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x4, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x4),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x22, 0x0, 0x0, 0x0, 0x0 },
-        { 0xd, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x22),
+        BARD_SOUND(0xd),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x7, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        { 0x33, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x7),
+        BARD_SOUND(0x33),
+        BARD_SOUND(0x33),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL,
     },
     {
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        { 0x6, 0x0, 0x0, 0x0, 0x0 },
-        NULL_BARD_SOUND,
-        NULL_BARD_SOUND
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND(0x6),
+        BARD_SOUND_NULL,
+        BARD_SOUND_NULL
     }
 };