Merge pull request #1318 from GriffinRichards/bardmoves

Minor bard music clean up

7 files changed, 891 insertions, 896 deletions

diff --git a/include/bard_music.h b/include/bard_music.h
index 882606b27..2825d16e6 100644
--- a/include/bard_music.h
+++ b/include/bard_music.h
@@ -1,9 +1,6 @@
 #ifndef GUARD_BARD_MUSIC_H
 #define GUARD_BARD_MUSIC_H
 
-// Exported type declarations
-
-
 struct BardSound
 {
     /*0x00*/ u8 var00;
@@ -34,12 +31,8 @@ struct BardSong
     /*0x30*/ const struct BardSound *sound;
 };
 
-// Exported RAM declarations
-
-// Exported ROM declarations
-
-extern const u16 gNumSpeciesNames;
-extern const u16 gUnknown_085FA1D4;
+extern const u16 gNumBardWords_Species;
+extern const u16 gNumBardWords_Moves;
 const struct BardSound *GetWordSounds(u16 word);
 void GetWordPhonemes(struct BardSong *song, u16 word);
 
diff --git a/include/easy_chat.h b/include/easy_chat.h
index f2ef066d4..2fa7f7b3e 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -127,7 +127,7 @@ u8 * CopyEasyChatWord(u8 *dest, u16 word);
 bool32 sub_811F8D8(int word);
 void InitializeEasyChatWordArray(u16 *words, u16 length);
 u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
-bool8 ECWord_CheckIfOutsideOfValidRange(u16 word);
+bool8 IsBardWordInvalid(u16 word);
 u16 GetRandomEasyChatWordFromGroup(u16 group);
 u16 GetNewHipsterPhraseToTeach(void);
 u16 EasyChat_GetNumWordsInGroup(u8);
diff --git a/src/bard_music.c b/src/bard_music.c
index 1a61c25ff..ad065249a 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -1,5 +1,3 @@
-
-// Includes
 #include "global.h"
 #include "bard_music.h"
 #include "constants/easy_chat.h"
@@ -10,9 +8,9 @@
 #include "data/bard_music/default_sound.h"
 #include "data/bard_music/length_table.h"
 
-s16 CalcWordPitch(int arg0, int songPos)
+static s16 CalcWordPitch(int arg0, int songPos)
 {
-    return gBardSoundPitchTables[arg0][songPos];
+    return sBardSoundPitchTables[arg0][songPos];
 }
 
 const struct BardSound *GetWordSounds(u16 word)
@@ -21,7 +19,7 @@ const struct BardSound *GetWordSounds(u16 word)
     u32 subword;
     const struct BardSound (*ptr)[6];
 
-    if (ECWord_CheckIfOutsideOfValidRange(word))
+    if (IsBardWordInvalid(word))
     {
         return gBardSound_InvalidWord;
     }
diff --git a/src/data/bard_music/moves.h b/src/data/bard_music/moves.h
index 6bb350a7c..06cc68d53 100644
--- a/src/data/bard_music/moves.h
+++ b/src/data/bard_music/moves.h
@@ -1,12 +1,12 @@
 #ifndef GUARD_DATA_BARD_MUSIC_MOVES_H
 #define GUARD_DATA_BARD_MUSIC_MOVES_H
 
-#include "moves.h"
+#include "constants/moves.h"
 
-const u16 gUnknown_085FA1D4 = 0x163;
+const u16 gNumBardWords_Moves = MOVES_COUNT;
 
-const struct BardSound gBardSounds_Moves[][6] = {
-    {
+const struct BardSound gBardSounds_Moves[MOVES_COUNT][6] = {
+    [MOVE_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -14,7 +14,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POUND] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -22,7 +22,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_KARATE_CHOP] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -30,7 +30,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DOUBLE_SLAP] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xa, 0x0, 0x0, 0x0, 0x0},
         { 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -38,7 +38,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_COMET_PUNCH] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -46,7 +46,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEGA_PUNCH] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -54,7 +54,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PAY_DAY] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -62,7 +62,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FIRE_PUNCH] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -70,7 +70,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ICE_PUNCH] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -78,7 +78,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THUNDER_PUNCH] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -86,7 +86,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SCRATCH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -94,7 +94,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_VICE_GRIP] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -102,7 +102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GUILLOTINE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -110,7 +110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RAZOR_WIND] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -118,7 +118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWORDS_DANCE] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1, 0x0, 0x0, 0x0, 0x0},
@@ -126,7 +126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CUT] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -134,7 +134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GUST] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -142,7 +142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WING_ATTACK] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -150,7 +150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WHIRLWIND] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -158,7 +158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLY] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -166,7 +166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BIND] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -174,7 +174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLAM] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -182,7 +182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_VINE_WHIP] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -190,7 +190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STOMP] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -198,7 +198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DOUBLE_KICK] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -206,7 +206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEGA_KICK] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -214,7 +214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_JUMP_KICK] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -222,7 +222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROLLING_KICK] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -230,7 +230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SAND_ATTACK] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -238,7 +238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HEADBUTT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -246,7 +246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HORN_ATTACK] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -254,7 +254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FURY_ATTACK] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -262,7 +262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HORN_DRILL] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -270,7 +270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TACKLE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -278,7 +278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BODY_SLAM] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -286,7 +286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WRAP] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -294,7 +294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TAKE_DOWN] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x23, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -302,7 +302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THRASH] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -310,7 +310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DOUBLE_EDGE] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0xa, 0x0, 0x0, 0x0, 0x0},
@@ -318,7 +318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TAIL_WHIP] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -326,7 +326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POISON_STING] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -334,7 +334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TWINEEDLE] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -342,7 +342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PIN_MISSILE] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -350,7 +350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LEER] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -358,7 +358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BITE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -366,7 +366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GROWL] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -374,7 +374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROAR] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -382,7 +382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SING] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -390,7 +390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUPERSONIC] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -398,7 +398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SONIC_BOOM] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -406,7 +406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DISABLE] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -414,7 +414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ACID] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -422,7 +422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EMBER] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -430,7 +430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLAMETHROWER] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -438,7 +438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIST] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -446,7 +446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WATER_GUN] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -454,7 +454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYDRO_PUMP] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -462,7 +462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SURF] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -470,7 +470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ICE_BEAM] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -478,7 +478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BLIZZARD] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -486,7 +486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PSYBEAM] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -494,7 +494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BUBBLE_BEAM] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -502,7 +502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AURORA_BEAM] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -510,7 +510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYPER_BEAM] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -518,7 +518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PECK] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -526,7 +526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DRILL_PECK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -534,7 +534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUBMISSION] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -542,7 +542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LOW_KICK] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -550,7 +550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_COUNTER] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -558,7 +558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SEISMIC_TOSS] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -566,7 +566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STRENGTH] = {
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -574,7 +574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ABSORB] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -582,7 +582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEGA_DRAIN] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -590,7 +590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LEECH_SEED] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -598,7 +598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GROWTH] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -606,7 +606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RAZOR_LEAF] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -614,7 +614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SOLAR_BEAM] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -622,7 +622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POISON_POWDER] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -630,7 +630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STUN_SPORE] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -638,7 +638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLEEP_POWDER] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -646,7 +646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PETAL_DANCE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2, 0x0, 0x0, 0x0, 0x0},
@@ -654,7 +654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STRING_SHOT] = {
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -662,7 +662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DRAGON_RAGE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -670,7 +670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FIRE_SPIN] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -678,7 +678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THUNDER_SHOCK] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -686,7 +686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THUNDERBOLT] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -694,7 +694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THUNDER_WAVE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -702,7 +702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THUNDER] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -710,7 +710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROCK_THROW] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -718,7 +718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EARTHQUAKE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -726,7 +726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FISSURE] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -734,7 +734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DIG] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -742,7 +742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TOXIC] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -750,7 +750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CONFUSION] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x29, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -758,7 +758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PSYCHIC] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -766,7 +766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYPNOSIS] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -774,7 +774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEDITATE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -782,7 +782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AGILITY] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -790,7 +790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_QUICK_ATTACK] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -798,7 +798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RAGE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -806,7 +806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TELEPORT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -814,7 +814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_NIGHT_SHADE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -822,7 +822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIMIC] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -830,7 +830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SCREECH] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xd, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -838,7 +838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DOUBLE_TEAM] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -846,7 +846,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RECOVER] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -854,7 +854,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HARDEN] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -862,7 +862,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MINIMIZE] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -870,7 +870,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SMOKESCREEN] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -878,7 +878,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CONFUSE_RAY] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2d, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -886,7 +886,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WITHDRAW] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -894,7 +894,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DEFENSE_CURL] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -902,7 +902,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BARRIER] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -910,7 +910,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LIGHT_SCREEN] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -918,7 +918,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HAZE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -926,7 +926,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_REFLECT] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -934,7 +934,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FOCUS_ENERGY] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -942,7 +942,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BIDE] = {
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -950,7 +950,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_METRONOME] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -958,7 +958,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIRROR_MOVE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x29, 0x0, 0x0, 0x0, 0x0},
@@ -966,7 +966,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SELF_DESTRUCT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -974,7 +974,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EGG_BOMB] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -982,7 +982,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LICK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -990,7 +990,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SMOG] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -998,7 +998,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLUDGE] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1006,7 +1006,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BONE_CLUB] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1014,7 +1014,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FIRE_BLAST] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1022,7 +1022,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WATERFALL] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1030,7 +1030,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CLAMP] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1038,7 +1038,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWIFT] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1046,7 +1046,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SKULL_BASH] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1054,7 +1054,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPIKE_CANNON] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1062,7 +1062,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CONSTRICT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1070,7 +1070,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AMNESIA] = {
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1078,7 +1078,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_KINESIS] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1086,7 +1086,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SOFT_BOILED] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1094,7 +1094,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HI_JUMP_KICK] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1102,7 +1102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GLARE] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1110,7 +1110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DREAM_EATER] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1118,7 +1118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POISON_GAS] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1126,7 +1126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BARRAGE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1134,7 +1134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LEECH_LIFE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1142,7 +1142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LOVELY_KISS] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1150,7 +1150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SKY_ATTACK] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1158,7 +1158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TRANSFORM] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1166,7 +1166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BUBBLE] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1174,7 +1174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DIZZY_PUNCH] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1182,7 +1182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPORE] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1190,7 +1190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLASH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1198,7 +1198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PSYWAVE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1206,7 +1206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPLASH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1214,7 +1214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ACID_ARMOR] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1222,7 +1222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CRABHAMMER] = {
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1230,7 +1230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EXPLOSION] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1238,7 +1238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FURY_SWIPES] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1246,7 +1246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BONEMERANG] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1254,7 +1254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_REST] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1262,7 +1262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROCK_SLIDE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1270,7 +1270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYPER_FANG] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1278,7 +1278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SHARPEN] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1286,7 +1286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CONVERSION] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1294,7 +1294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TRI_ATTACK] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1302,7 +1302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUPER_FANG] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1, 0x0, 0x0, 0x0, 0x0},
@@ -1310,7 +1310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLASH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1318,7 +1318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUBSTITUTE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1326,7 +1326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STRUGGLE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1334,7 +1334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SKETCH] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1342,7 +1342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TRIPLE_KICK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1350,7 +1350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_THIEF] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1358,7 +1358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPIDER_WEB] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1366,7 +1366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIND_READER] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1374,7 +1374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_NIGHTMARE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1382,7 +1382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLAME_WHEEL] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1390,7 +1390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SNORE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1398,7 +1398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CURSE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1406,7 +1406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLAIL] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1414,7 +1414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CONVERSION_2] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1422,7 +1422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AEROBLAST] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1430,7 +1430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_COTTON_SPORE] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1438,7 +1438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_REVERSAL] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -1446,7 +1446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPITE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1454,7 +1454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POWDER_SNOW] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1462,7 +1462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PROTECT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1470,7 +1470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MACH_PUNCH] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1478,7 +1478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SCARY_FACE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1486,7 +1486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FAINT_ATTACK] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1494,7 +1494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWEET_KISS] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1502,7 +1502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BELLY_DRUM] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1510,7 +1510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLUDGE_BOMB] = {
         { 0x2b, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1518,7 +1518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MUD_SLAP] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1526,7 +1526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_OCTAZOOKA] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x28, 0x0, 0x0, 0x0, 0x0},
@@ -1534,7 +1534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPIKES] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1542,7 +1542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ZAP_CANNON] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1550,7 +1550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FORESIGHT] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1558,7 +1558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DESTINY_BOND] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1566,7 +1566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PERISH_SONG] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1574,7 +1574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ICY_WIND] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1582,7 +1582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DETECT] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1590,7 +1590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BONE_RUSH] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1598,7 +1598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LOCK_ON] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1606,7 +1606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_OUTRAGE] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1614,7 +1614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SANDSTORM] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1622,7 +1622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GIGA_DRAIN] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1630,7 +1630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ENDURE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1638,7 +1638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CHARM] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1646,7 +1646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROLLOUT] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1654,7 +1654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FALSE_SWIPE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1662,7 +1662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWAGGER] = {
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1670,7 +1670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MILK_DRINK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1678,7 +1678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPARK] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1686,7 +1686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FURY_CUTTER] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1694,7 +1694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STEEL_WING] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0xd, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1702,7 +1702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEAN_LOOK] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1710,7 +1710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ATTRACT] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1718,7 +1718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLEEP_TALK] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1726,7 +1726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HEAL_BELL] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0xa, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1734,7 +1734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RETURN] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1742,7 +1742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PRESENT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1750,7 +1750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FRUSTRATION] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1758,7 +1758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SAFEGUARD] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1766,7 +1766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PAIN_SPLIT] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1774,7 +1774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SACRED_FIRE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1782,7 +1782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MAGNITUDE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1790,7 +1790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DYNAMIC_PUNCH] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1798,7 +1798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEGAHORN] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1806,7 +1806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DRAGON_BREATH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1814,7 +1814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BATON_PASS] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1822,7 +1822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ENCORE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1830,7 +1830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PURSUIT] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1838,7 +1838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RAPID_SPIN] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1846,7 +1846,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWEET_SCENT] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1854,7 +1854,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_IRON_TAIL] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -1862,7 +1862,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_METAL_CLAW] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1870,7 +1870,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_VITAL_THROW] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1878,7 +1878,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MORNING_SUN] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1886,7 +1886,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SYNTHESIS] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1894,7 +1894,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MOONLIGHT] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1902,7 +1902,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HIDDEN_POWER] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -1910,7 +1910,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CROSS_CHOP] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1918,7 +1918,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TWISTER] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1926,7 +1926,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RAIN_DANCE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1934,7 +1934,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUNNY_DAY] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -1942,7 +1942,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CRUNCH] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1950,7 +1950,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIRROR_COAT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1958,7 +1958,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PSYCH_UP] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1966,7 +1966,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EXTREME_SPEED] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1974,7 +1974,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ANCIENT_POWER] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -1982,7 +1982,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SHADOW_BALL] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1990,7 +1990,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FUTURE_SIGHT] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1998,7 +1998,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROCK_SMASH] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2006,7 +2006,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WHIRLPOOL] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2014,7 +2014,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BEAT_UP] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2022,7 +2022,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FAKE_OUT] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2030,7 +2030,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_UPROAR] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2038,7 +2038,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_STOCKPILE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2046,7 +2046,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SPIT_UP] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2054,7 +2054,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SWALLOW] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2062,7 +2062,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HEAT_WAVE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2070,7 +2070,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HAIL] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2078,7 +2078,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TORMENT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2086,7 +2086,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FLATTER] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2094,7 +2094,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WILL_O_WISP] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2102,7 +2102,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MEMENTO] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2110,7 +2110,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FACADE] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2118,7 +2118,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FOCUS_PUNCH] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2126,7 +2126,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SMELLING_SALT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2134,7 +2134,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FOLLOW_ME] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2142,7 +2142,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_NATURE_POWER] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2150,7 +2150,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CHARGE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2158,7 +2158,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TAUNT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2166,7 +2166,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HELPING_HAND] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2174,7 +2174,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TRICK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2182,7 +2182,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROLE_PLAY] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2190,7 +2190,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WISH] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2198,7 +2198,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ASSIST] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2206,7 +2206,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_INGRAIN] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2214,7 +2214,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SUPERPOWER] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2222,7 +2222,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MAGIC_COAT] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2230,7 +2230,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_RECYCLE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2238,7 +2238,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_REVENGE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2246,7 +2246,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BRICK_BREAK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2254,7 +2254,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_YAWN] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2262,7 +2262,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_KNOCK_OFF] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2270,7 +2270,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ENDEAVOR] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2278,7 +2278,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ERUPTION] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2286,7 +2286,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SKILL_SWAP] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2294,7 +2294,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_IMPRISON] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2302,7 +2302,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_REFRESH] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2310,7 +2310,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GRUDGE] = {
         { 0x2b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2318,7 +2318,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SNATCH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2326,7 +2326,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SECRET_POWER] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2334,7 +2334,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DIVE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2342,7 +2342,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ARM_THRUST] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2350,7 +2350,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CAMOUFLAGE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2358,7 +2358,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TAIL_GLOW] = {
         { 0x4, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2366,7 +2366,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LUSTER_PURGE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -2374,7 +2374,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MIST_BALL] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2382,7 +2382,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FEATHER_DANCE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2390,7 +2390,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TEETER_DANCE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2398,7 +2398,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BLAZE_KICK] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2406,7 +2406,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MUD_SPORT] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2414,7 +2414,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ICE_BALL] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2422,7 +2422,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_NEEDLE_ARM] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2430,7 +2430,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SLACK_OFF] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2438,7 +2438,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYPER_VOICE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
@@ -2446,7 +2446,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POISON_FANG] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2454,7 +2454,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CRUSH_CLAW] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2462,7 +2462,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BLAST_BURN] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2470,7 +2470,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HYDRO_CANNON] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2478,7 +2478,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_METEOR_MASH] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2486,7 +2486,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0}
     },
-    {
+    [MOVE_ASTONISH] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2494,7 +2494,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WEATHER_BALL] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2502,7 +2502,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AROMATHERAPY] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2510,7 +2510,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0}
     },
-    {
+    [MOVE_FAKE_TEARS] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2518,7 +2518,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AIR_CUTTER] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2526,7 +2526,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_OVERHEAT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2534,7 +2534,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ODOR_SLEUTH] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -2542,7 +2542,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROCK_TOMB] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2550,7 +2550,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SILVER_WIND] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2558,7 +2558,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_METAL_SOUND] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2566,7 +2566,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_GRASS_WHISTLE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2574,7 +2574,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_TICKLE] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2582,7 +2582,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_COSMIC_POWER] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2590,7 +2590,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WATER_SPOUT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
@@ -2598,7 +2598,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SIGNAL_BEAM] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2606,7 +2606,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SHADOW_PUNCH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2614,7 +2614,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_EXTRASENSORY] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2622,7 +2622,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SKY_UPPERCUT] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2630,7 +2630,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SAND_TOMB] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2638,7 +2638,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SHEER_COLD] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2646,7 +2646,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MUDDY_WATER] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2654,7 +2654,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BULLET_SEED] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2662,7 +2662,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_AERIAL_ACE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2670,7 +2670,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ICICLE_SPEAR] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2678,7 +2678,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_IRON_DEFENSE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2686,7 +2686,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BLOCK] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2694,7 +2694,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_HOWL] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2702,7 +2702,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DRAGON_CLAW] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -2710,7 +2710,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_FRENZY_PLANT] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2718,7 +2718,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BULK_UP] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2726,7 +2726,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_BOUNCE] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2734,7 +2734,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MUD_SHOT] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2742,7 +2742,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_POISON_TAIL] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
@@ -2750,7 +2750,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_COVET] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2758,7 +2758,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_VOLT_TACKLE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2766,7 +2766,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_MAGICAL_LEAF] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -2774,7 +2774,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WATER_SPORT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -2782,7 +2782,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_CALM_MIND] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2790,7 +2790,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_LEAF_BLADE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2798,7 +2798,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DRAGON_DANCE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2806,7 +2806,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_ROCK_BLAST] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2814,7 +2814,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_SHOCK_WAVE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2822,7 +2822,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_WATER_PULSE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -2830,7 +2830,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_DOOM_DESIRE] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2838,7 +2838,7 @@ const struct BardSound gBardSounds_Moves[][6] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [MOVE_PSYCHO_BOOST] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
diff --git a/src/data/bard_music/pokemon.h b/src/data/bard_music/pokemon.h
index 5ccf2f830..294cd4078 100644
--- a/src/data/bard_music/pokemon.h
+++ b/src/data/bard_music/pokemon.h
@@ -1,10 +1,10 @@
 #ifndef GUARD_DATA_BARD_MUSIC_POKEMON_H
 #define GUARD_DATA_BARD_MUSIC_POKEMON_H
 
-const u16 gNumSpeciesNames = NUM_SPECIES;
+const u16 gNumBardWords_Species = NUM_SPECIES;
 
-const struct BardSound gBardSounds_Pokemon[][6] = {
-    {
+const struct BardSound gBardSounds_Pokemon[NUM_SPECIES][6] = {
+    [SPECIES_NONE] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -12,7 +12,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BULBASAUR] = {
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -20,7 +20,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_IVYSAUR] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -28,7 +28,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VENUSAUR] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -36,7 +36,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHARMANDER] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -44,7 +44,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHARMELEON] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -52,7 +52,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHARIZARD] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -60,7 +60,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SQUIRTLE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -68,7 +68,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WARTORTLE] = {
         { 0x8, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -76,7 +76,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BLASTOISE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -84,7 +84,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CATERPIE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -92,7 +92,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_METAPOD] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -100,7 +100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BUTTERFREE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -108,7 +108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WEEDLE] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x26, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -116,7 +116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KAKUNA] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -124,7 +124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BEEDRILL] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -132,7 +132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PIDGEY] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -140,7 +140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PIDGEOTTO] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -148,7 +148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PIDGEOT] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -156,7 +156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RATTATA] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -164,7 +164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RATICATE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -172,7 +172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SPEAROW] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -180,7 +180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FEAROW] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -188,7 +188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_EKANS] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -196,7 +196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARBOK] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x17, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -204,7 +204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PIKACHU] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -212,7 +212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RAICHU] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -220,7 +220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SANDSHREW] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -228,7 +228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SANDSLASH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -236,7 +236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDORAN_F] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -244,7 +244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDORINA] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -252,7 +252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDOQUEEN] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -260,7 +260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDORAN_M] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -268,7 +268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDORINO] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -276,7 +276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NIDOKING] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -284,7 +284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLEFAIRY] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -292,7 +292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLEFABLE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
@@ -300,7 +300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VULPIX] = {
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -308,7 +308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NINETALES] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -316,7 +316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_JIGGLYPUFF] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -324,7 +324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WIGGLYTUFF] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -332,7 +332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ZUBAT] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -340,7 +340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GOLBAT] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -348,7 +348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ODDISH] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -356,7 +356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GLOOM] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -364,7 +364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VILEPLUME] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -372,7 +372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PARAS] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -380,7 +380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PARASECT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -388,7 +388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VENONAT] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -396,7 +396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VENOMOTH] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -404,7 +404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DIGLETT] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -412,7 +412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DUGTRIO] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -420,7 +420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEOWTH] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -428,7 +428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PERSIAN] = {
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -436,7 +436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PSYDUCK] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -444,7 +444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GOLDUCK] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -452,7 +452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MANKEY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -460,7 +460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PRIMEAPE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -468,7 +468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GROWLITHE] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -476,7 +476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARCANINE] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -484,7 +484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_POLIWAG] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -492,7 +492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_POLIWHIRL] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -500,7 +500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_POLIWRATH] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -508,7 +508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ABRA] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -516,7 +516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KADABRA] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -524,7 +524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ALAKAZAM] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -532,7 +532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MACHOP] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -540,7 +540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MACHOKE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -548,7 +548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MACHAMP] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -556,7 +556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BELLSPROUT] = {
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -564,7 +564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WEEPINBELL] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -572,7 +572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VICTREEBEL] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -580,7 +580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TENTACOOL] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -588,7 +588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TENTACRUEL] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -596,7 +596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GEODUDE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -604,7 +604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GRAVELER] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -612,7 +612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GOLEM] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -620,7 +620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PONYTA] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -628,7 +628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RAPIDASH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -636,7 +636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLOWPOKE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -644,7 +644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLOWBRO] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -652,7 +652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGNEMITE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -660,7 +660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGNETON] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -668,7 +668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FARFETCHD] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -676,7 +676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DODUO] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -684,7 +684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DODRIO] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -692,7 +692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEEL] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -700,7 +700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DEWGONG] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -708,7 +708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GRIMER] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -716,7 +716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MUK] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -724,7 +724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHELLDER] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -732,7 +732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLOYSTER] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -740,7 +740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GASTLY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -748,7 +748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HAUNTER] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -756,7 +756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GENGAR] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x8, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -764,7 +764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ONIX] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -772,7 +772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DROWZEE] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -780,7 +780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HYPNO] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -788,7 +788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KRABBY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -796,7 +796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KINGLER] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -804,7 +804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VOLTORB] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -812,7 +812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ELECTRODE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -820,7 +820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_EXEGGCUTE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -828,7 +828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_EXEGGUTOR] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -836,7 +836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CUBONE] = {
         { 0x2d, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -844,7 +844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAROWAK] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -852,7 +852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HITMONLEE] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -860,7 +860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HITMONCHAN] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -868,7 +868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LICKITUNG] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -876,7 +876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KOFFING] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -884,7 +884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WEEZING] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -892,7 +892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RHYHORN] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -900,7 +900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RHYDON] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -908,7 +908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHANSEY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -916,7 +916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TANGELA] = {
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -924,7 +924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KANGASKHAN] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -932,7 +932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HORSEA] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -940,7 +940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEADRA] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -948,7 +948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GOLDEEN] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -956,7 +956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEAKING] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -964,7 +964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_STARYU] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -972,7 +972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_STARMIE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -980,7 +980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MR_MIME] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -988,7 +988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SCYTHER] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -996,7 +996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_JYNX] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1004,7 +1004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ELECTABUZZ] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1012,7 +1012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGMAR] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1020,7 +1020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PINSIR] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1028,7 +1028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TAUROS] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1036,7 +1036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGIKARP] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1044,7 +1044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GYARADOS] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1052,7 +1052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LAPRAS] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1060,7 +1060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DITTO] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1068,7 +1068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_EEVEE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1076,7 +1076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VAPOREON] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1084,7 +1084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_JOLTEON] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1092,7 +1092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FLAREON] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1100,7 +1100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PORYGON] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1108,7 +1108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OMANYTE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1116,7 +1116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OMASTAR] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1124,7 +1124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KABUTO] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -1132,7 +1132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KABUTOPS] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1140,7 +1140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AERODACTYL] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1148,7 +1148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SNORLAX] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1156,7 +1156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARTICUNO] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1164,7 +1164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ZAPDOS] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1172,7 +1172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MOLTRES] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1180,7 +1180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DRATINI] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1188,7 +1188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DRAGONAIR] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
@@ -1196,7 +1196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DRAGONITE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1204,7 +1204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEWTWO] = {
         { 0x2d, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND,
@@ -1212,7 +1212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEW] = {
         { 0x2d, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -1220,7 +1220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHIKORITA] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1228,7 +1228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BAYLEEF] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1236,7 +1236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEGANIUM] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1244,7 +1244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CYNDAQUIL] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1252,7 +1252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_QUILAVA] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x8, 0x0, 0x0, 0x0, 0x0},
@@ -1260,7 +1260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TYPHLOSION] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1268,7 +1268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TOTODILE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1276,7 +1276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CROCONAW] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1284,7 +1284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FERALIGATR] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -1292,7 +1292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SENTRET] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1300,7 +1300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FURRET] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1308,7 +1308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HOOTHOOT] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1316,7 +1316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NOCTOWL] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1324,7 +1324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LEDYBA] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1332,7 +1332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LEDIAN] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1340,7 +1340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SPINARAK] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -1348,7 +1348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARIADOS] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1356,7 +1356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CROBAT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1364,7 +1364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHINCHOU] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1372,7 +1372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LANTURN] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1380,7 +1380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PICHU] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1388,7 +1388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLEFFA] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1396,7 +1396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_IGGLYBUFF] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1404,7 +1404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TOGEPI] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1412,7 +1412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TOGETIC] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1420,7 +1420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NATU] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1428,7 +1428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_XATU] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1436,7 +1436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAREEP] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1444,7 +1444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FLAAFFY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1452,7 +1452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AMPHAROS] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1460,7 +1460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BELLOSSOM] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1468,7 +1468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MARILL] = {
         { 0x8, 0x0, 0x0, 0x0, 0x0},
         { 0x10, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1476,7 +1476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AZUMARILL] = {
         { 0x8, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1484,7 +1484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SUDOWOODO] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -1492,7 +1492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_POLITOED] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1500,7 +1500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HOPPIP] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1508,7 +1508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SKIPLOOM] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1516,7 +1516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_JUMPLUFF] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1524,7 +1524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AIPOM] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1532,7 +1532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SUNKERN] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1540,7 +1540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SUNFLORA] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1548,7 +1548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_YANMA] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1556,7 +1556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WOOPER] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1564,7 +1564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_QUAGSIRE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
@@ -1572,7 +1572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ESPEON] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1580,7 +1580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_UMBREON] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1588,7 +1588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MURKROW] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1596,7 +1596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLOWKING] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1604,7 +1604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MISDREAVUS] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
@@ -1612,7 +1612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_UNOWN] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1620,7 +1620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WOBBUFFET] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1628,7 +1628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GIRAFARIG] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1636,7 +1636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PINECO] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1644,7 +1644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FORRETRESS] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -1652,7 +1652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DUNSPARCE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1660,7 +1660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GLIGAR] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1668,7 +1668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_STEELIX] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1676,7 +1676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SNUBBULL] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1684,7 +1684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GRANBULL] = {
         { 0x2, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1692,7 +1692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_QWILFISH] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1700,7 +1700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SCIZOR] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1708,7 +1708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHUCKLE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x26, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1716,7 +1716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HERACROSS] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1724,7 +1724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SNEASEL] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x26, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1732,7 +1732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TEDDIURSA] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1740,7 +1740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_URSARING] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1748,7 +1748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLUGMA] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1756,7 +1756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGCARGO] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -1764,7 +1764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SWINUB] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1772,7 +1772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PILOSWINE] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -1780,7 +1780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CORSOLA] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -1788,7 +1788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_REMORAID] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -1796,7 +1796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OCTILLERY] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1804,7 +1804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DELIBIRD] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -1812,7 +1812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MANTINE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1820,7 +1820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SKARMORY] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -1828,7 +1828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HOUNDOUR] = {
         { 0x23, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1836,7 +1836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HOUNDOOM] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1844,7 +1844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KINGDRA] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1852,7 +1852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PHANPY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1860,7 +1860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DONPHAN] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1868,7 +1868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PORYGON2] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1876,7 +1876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_STANTLER] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1884,7 +1884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SMEARGLE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x26, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1892,7 +1892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TYROGUE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1900,7 +1900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HITMONTOP] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
@@ -1908,7 +1908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SMOOCHUM] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1916,7 +1916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ELEKID] = {
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1924,7 +1924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAGBY] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1932,7 +1932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MILTANK] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1940,7 +1940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BLISSEY] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1948,7 +1948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RAIKOU] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1956,7 +1956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ENTEI] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1964,7 +1964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SUICUNE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -1972,7 +1972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LARVITAR] = {
         { 0x15, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x15, 0x0, 0x0, 0x0, 0x0},
@@ -1980,7 +1980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PUPITAR] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -1988,7 +1988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TYRANITAR] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -1996,7 +1996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LUGIA] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2004,7 +2004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HO_OH] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2012,7 +2012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CELEBI] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2020,7 +2020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_B] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2028,7 +2028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_C] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2036,7 +2036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_D] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2044,7 +2044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_E] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2052,7 +2052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_F] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2060,7 +2060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_G] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2068,7 +2068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_H] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2076,7 +2076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_I] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2084,7 +2084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_J] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2092,7 +2092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_K] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2100,7 +2100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_L] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2108,7 +2108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_M] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2116,7 +2116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_N] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2124,7 +2124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_O] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2132,7 +2132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_P] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2140,7 +2140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_Q] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2148,7 +2148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_R] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2156,7 +2156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_S] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2164,7 +2164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_T] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2172,7 +2172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_U] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2180,7 +2180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_V] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2188,7 +2188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_W] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2196,7 +2196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_X] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2204,7 +2204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_Y] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2212,7 +2212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_OLD_UNOWN_Z] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
         NULL_BARD_SOUND,
@@ -2220,7 +2220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TREECKO] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2228,7 +2228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GROVYLE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2236,7 +2236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SCEPTILE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2244,7 +2244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TORCHIC] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2252,7 +2252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_COMBUSKEN] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2260,7 +2260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BLAZIKEN] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2268,7 +2268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MUDKIP] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2276,7 +2276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MARSHTOMP] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2284,7 +2284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SWAMPERT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2292,7 +2292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_POOCHYENA] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2300,7 +2300,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MIGHTYENA] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -2308,7 +2308,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ZIGZAGOON] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
@@ -2316,7 +2316,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LINOONE] = {
         { 0x14, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2324,7 +2324,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WURMPLE] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2332,7 +2332,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SILCOON] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x28, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2340,7 +2340,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BEAUTIFLY] = {
         { 0x2d, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2348,7 +2348,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CASCOON] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2356,7 +2356,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DUSTOX] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x17, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2364,7 +2364,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LOTAD] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2372,7 +2372,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LOMBRE] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2380,7 +2380,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LUDICOLO] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
@@ -2388,7 +2388,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEEDOT] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2396,7 +2396,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NUZLEAF] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2404,7 +2404,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHIFTRY] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2412,7 +2412,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NINCADA] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x6, 0x0, 0x0, 0x0, 0x0},
@@ -2420,7 +2420,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NINJASK] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2428,7 +2428,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHEDINJA] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2436,7 +2436,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TAILLOW] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2444,7 +2444,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SWELLOW] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2452,7 +2452,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHROOMISH] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2460,7 +2460,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BRELOOM] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2468,7 +2468,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SPINDA] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2476,7 +2476,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WINGULL] = {
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2484,7 +2484,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PELIPPER] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -2492,7 +2492,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SURSKIT] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2500,7 +2500,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MASQUERAIN] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
@@ -2508,7 +2508,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WAILMER] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2516,7 +2516,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WAILORD] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2524,7 +2524,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SKITTY] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2532,7 +2532,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DELCATTY] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2540,7 +2540,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KECLEON] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2548,7 +2548,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BALTOY] = {
         { 0x1, 0x0, 0x0, 0x0, 0x0},
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2556,7 +2556,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLAYDOL] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2564,7 +2564,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NOSEPASS] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2572,7 +2572,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TORKOAL] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2580,7 +2580,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SABLEYE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2588,7 +2588,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BARBOACH] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2596,7 +2596,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WHISCASH] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2604,7 +2604,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LUVDISC] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2612,7 +2612,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CORPHISH] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2620,7 +2620,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CRAWDAUNT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2628,7 +2628,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FEEBAS] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2636,7 +2636,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MILOTIC] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2644,7 +2644,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CARVANHA] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2652,7 +2652,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHARPEDO] = {
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2660,7 +2660,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TRAPINCH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2668,7 +2668,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VIBRAVA] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2676,7 +2676,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_FLYGON] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2684,7 +2684,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAKUHITA] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2692,7 +2692,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HARIYAMA] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2700,7 +2700,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ELECTRIKE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2708,7 +2708,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MANECTRIC] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -2716,7 +2716,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_NUMEL] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0xb, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2724,7 +2724,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CAMERUPT] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2732,7 +2732,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SPHEAL] = {
         { 0xe, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2740,7 +2740,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEALEO] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2748,7 +2748,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WALREIN] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2756,7 +2756,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CACNEA] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2764,7 +2764,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CACTURNE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2772,7 +2772,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SNORUNT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2780,7 +2780,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GLALIE] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2788,7 +2788,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LUNATONE] = {
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -2796,7 +2796,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SOLROCK] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2804,7 +2804,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AZURILL] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
@@ -2812,7 +2812,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SPOINK] = {
         { 0x1e, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2820,7 +2820,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GRUMPIG] = {
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2828,7 +2828,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_PLUSLE] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2836,7 +2836,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MINUN] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2844,7 +2844,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MAWILE] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2852,7 +2852,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEDITITE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -2860,7 +2860,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_MEDICHAM] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -2868,7 +2868,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SWABLU] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2876,7 +2876,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ALTARIA] = {
         { 0x6, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2884,7 +2884,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WYNAUT] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2892,7 +2892,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DUSKULL] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x26, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2900,7 +2900,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DUSCLOPS] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2908,7 +2908,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ROSELIA] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -2916,7 +2916,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLAKOTH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2924,7 +2924,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VIGOROTH] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -2932,7 +2932,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SLAKING] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2940,7 +2940,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GULPIN] = {
         { 0x24, 0x0, 0x0, 0x0, 0x0},
         { 0xf, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2948,7 +2948,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SWALOT] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2956,7 +2956,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_TROPIUS] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -2964,7 +2964,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_WHISMUR] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2972,7 +2972,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LOUDRED] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2980,7 +2980,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_EXPLOUD] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2988,7 +2988,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CLAMPERL] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x32, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -2996,7 +2996,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_HUNTAIL] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3004,7 +3004,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GOREBYSS] = {
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x2c, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3012,7 +3012,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ABSOL] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3020,7 +3020,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHUPPET] = {
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3028,7 +3028,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BANETTE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3036,7 +3036,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SEVIPER] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -3044,7 +3044,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ZANGOOSE] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3052,7 +3052,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RELICANTH] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -3060,7 +3060,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARON] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1d, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3068,7 +3068,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LAIRON] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3076,7 +3076,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_AGGRON] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3084,7 +3084,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CASTFORM] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x1a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3092,7 +3092,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_VOLBEAT] = {
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3100,7 +3100,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ILLUMISE] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x27, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3108,7 +3108,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LILEEP] = {
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3116,7 +3116,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CRADILY] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3124,7 +3124,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ANORITH] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3132,7 +3132,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_ARMALDO] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3140,7 +3140,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RALTS] = {
         { 0x7, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3148,7 +3148,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KIRLIA] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -3156,7 +3156,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GARDEVOIR] = {
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -3164,7 +3164,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BAGON] = {
         { 0x5, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3172,7 +3172,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SHELGON] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3180,7 +3180,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_SALAMENCE] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
@@ -3188,7 +3188,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_BELDUM] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3196,7 +3196,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_METANG] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3204,7 +3204,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_METAGROSS] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3212,7 +3212,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_REGIROCK] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
@@ -3220,7 +3220,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_REGICE] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x12, 0x0, 0x0, 0x0, 0x0},
@@ -3228,7 +3228,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_REGISTEEL] = {
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0xe, 0x0, 0x0, 0x0, 0x0},
@@ -3236,7 +3236,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_KYOGRE] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
         { 0x30, 0x0, 0x0, 0x0, 0x0},
@@ -3244,7 +3244,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_GROUDON] = {
         { 0x21, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x33, 0x0, 0x0, 0x0, 0x0},
@@ -3252,7 +3252,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_RAYQUAZA] = {
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x3, 0x0, 0x0, 0x0, 0x0},
         { 0x2a, 0x0, 0x0, 0x0, 0x0},
@@ -3260,7 +3260,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LATIAS] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x0, 0x0, 0x0, 0x0, 0x0},
@@ -3268,7 +3268,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_LATIOS] = {
         { 0x0, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
@@ -3276,7 +3276,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_JIRACHI] = {
         { 0x30, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0xc, 0x0, 0x0, 0x0, 0x0},
@@ -3284,7 +3284,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_DEOXYS] = {
         { 0xc, 0x0, 0x0, 0x0, 0x0},
         { 0x1b, 0x0, 0x0, 0x0, 0x0},
         { 0x11, 0x0, 0x0, 0x0, 0x0},
@@ -3292,7 +3292,7 @@ const struct BardSound gBardSounds_Pokemon[][6] = {
         NULL_BARD_SOUND,
         NULL_BARD_SOUND
     },
-    {
+    [SPECIES_CHIMECHO] = {
         { 0x12, 0x0, 0x0, 0x0, 0x0},
         { 0x9, 0x0, 0x0, 0x0, 0x0},
         { 0x18, 0x0, 0x0, 0x0, 0x0},
diff --git a/src/data/bard_music/word_pitch.h b/src/data/bard_music/word_pitch.h
index 54a87acc9..35527017c 100644
--- a/src/data/bard_music/word_pitch.h
+++ b/src/data/bard_music/word_pitch.h
@@ -1,182 +1,186 @@
 #ifndef GUARD_WORD_PITCH_H
 #define GUARD_WORD_PITCH_H
 
-const s16 gUnknown_0860A1C0[] = {
-    -0x300, 0x1800
+#define PITCH_END 0x1800
+
+static const s16 sPitch1_0[] = {
+    -0x300, PITCH_END
 };
 
-const s16 gUnknown_0860A1C4[] = {
-    0x0900, 0x1800
+static const s16 sPitch1_1[] = {
+    0x0900, PITCH_END
 };
 
-const s16 gUnknown_0860A1C8[] = {
-    0x0100, 0x1800
+static const s16 sPitch1_2[] = {
+    0x0100, PITCH_END
 };
 
-const s16 gUnknown_0860A1CC[] = {
-    0x0400, 0x1800
+static const s16 sPitch1_3[] = {
+    0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A1D0[] = {
-    0x0b00, 0x1800
+static const s16 sPitch1_4[] = {
+    0x0b00, PITCH_END
 };
 
-const s16 gUnknown_0860A1D4[] = {
-    -0x300, -0x100, 0x1800
+static const s16 sPitch2_0[] = {
+    -0x300, -0x100, PITCH_END
 };
 
-const s16 gUnknown_0860A1DA[] = {
-    -0x300, 0x0200, 0x1800
+static const s16 sPitch2_1[] = {
+    -0x300, 0x0200, PITCH_END
 };
 
-const s16 gUnknown_0860A1E0[] = {
-    0x0200, 0x0400, 0x1800
+static const s16 sPitch2_2[] = {
+    0x0200, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A1E6[] = {
-    0x0600, 0x0800, 0x1800
+static const s16 sPitch2_3[] = {
+    0x0600, 0x0800, PITCH_END
 };
 
-const s16 gUnknown_0860A1EC[] = {
-    0x0900, 0x0800, 0x1800
+static const s16 sPitch2_4[] = {
+    0x0900, 0x0800, PITCH_END
 };
 
-const s16 gUnknown_0860A1F2[] = {
-    -0x300, -0x100, -0x300, 0x1800
+static const s16 sPitch3_0[] = {
+    -0x300, -0x100, -0x300, PITCH_END
 };
 
-const s16 gUnknown_0860A1FA[] = {
-    0x0400, -0x300, 0x0400, 0x1800
+static const s16 sPitch3_1[] = {
+    0x0400, -0x300, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A202[] = {
-    0x0900, 0x0800, 0x0600, 0x1800
+static const s16 sPitch3_2[] = {
+    0x0900, 0x0800, 0x0600, PITCH_END
 };
 
-const s16 gUnknown_0860A20A[] = {
-    0x0100, 0x0200, 0x0400, 0x1800
+static const s16 sPitch3_3[] = {
+    0x0100, 0x0200, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A212[] = {
-    0x0600, 0x1000, 0x0d00, 0x1800
+static const s16 sPitch3_4[] = {
+    0x0600, 0x1000, 0x0d00, PITCH_END
 };
 
-const s16 gUnknown_0860A21A[] = {
-    0x0400, 0x0900, 0x0400, 0x0900, 0x1800
+static const s16 sPitch4_0[] = {
+    0x0400, 0x0900, 0x0400, 0x0900, PITCH_END
 };
 
-const s16 gUnknown_0860A224[] = {
-    0x0900, 0x0400, 0x0d00, 0x0400, 0x1800
+static const s16 sPitch4_1[] = {
+    0x0900, 0x0400, 0x0d00, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A22E[] = {
-    0x0100, 0x0200, 0x0400, 0x0600, 0x1800
+static const s16 sPitch4_2[] = {
+    0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
 };
 
-const s16 gUnknown_0860A238[] = {
-    0x0800, 0x0600, 0x0400, 0x0200, 0x1800
+static const s16 sPitch4_3[] = {
+    0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
 };
 
-const s16 gUnknown_0860A242[] = {
-    0x0f00, 0x0d00, 0x0b00, 0x0a00, 0x1800
+static const s16 sPitch4_4[] = {
+    0x0f00, 0x0d00, 0x0b00, 0x0a00, PITCH_END
 };
 
-const s16 gUnknown_0860A24C[] = {
-    -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x1800
+static const s16 sPitch5_0[] = {
+    -0x300, -0x100, 0x0100, 0x0200, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A258[] = {
-    0x0900, 0x0800, 0x0600, 0x0400, 0x0200, 0x1800
+static const s16 sPitch5_1[] = {
+    0x0900, 0x0800, 0x0600, 0x0400, 0x0200, PITCH_END
 };
 
-const s16 gUnknown_0860A264[] = {
-    0x0100, 0x0400, 0x0900, 0x0400, 0x0100, 0x1800
+static const s16 sPitch5_2[] = {
+    0x0100, 0x0400, 0x0900, 0x0400, 0x0100, PITCH_END
 };
 
-const s16 gUnknown_0860A270[] = {
-    0x0900, 0x0400, 0x0900, 0x0400, -0x300, 0x1800
+static const s16 sPitch5_3[] = {
+    0x0900, 0x0400, 0x0900, 0x0400, -0x300, PITCH_END
 };
 
-const s16 gUnknown_0860A27C[] = {
-    0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, 0x1800
+static const s16 sPitch5_4[] = {
+    0x0b00, 0x0800, 0x0400, 0x0400, 0x0600, PITCH_END
 };
 
-const s16 gUnknown_0860A288[] = {
-    -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, 0x1800
+static const s16 sPitch6_0[] = {
+    -0x300, -0x100, 0x0100, 0x0200, 0x0400, 0x0600, PITCH_END
 };
 
-const s16 gUnknown_0860A296[] = {
-    0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, 0x1800
+static const s16 sPitch6_1[] = {
+    0x0800, 0x0600, 0x0400, 0x0200, 0x0100, -0x100, PITCH_END
 };
 
-const s16 gUnknown_0860A2A4[] = {
-    0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, 0x1800
+static const s16 sPitch6_2[] = {
+    0x0100, 0x0200, 0x0400, 0x0100, 0x0200, 0x1000, PITCH_END
 };
 
-const s16 gUnknown_0860A2B2[] = {
-    0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, 0x1800
+static const s16 sPitch6_3[] = {
+    0x0400, -0x300, 0x0900, 0x0400, 0x0900, 0x0400, PITCH_END
 };
 
-const s16 gUnknown_0860A2C0[] = {
-    0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, 0x1800
+static const s16 sPitch6_4[] = {
+    0x0800, 0x0900, 0x0800, 0x0900, 0x0800, 0x0900, PITCH_END
 };
 
-const s16 gUnknown_0860A2CE[] = {
-    0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, 0x1800
+static const s16 sPitch7_0[] = {
+    0x0200, 0x0100, 0x0200, 0x0100, 0x0200, 0x0400, 0x0200, PITCH_END
 };
 
-const s16 gUnknown_0860A2DE[] = {
-    0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, 0x1800
+static const s16 sPitch7_1[] = {
+    0x0100, 0x0100, -0x100, -0x100, -0x300, 0x0400, -0x300, PITCH_END
 };
 
-const s16 gUnknown_0860A2EE[] = {
-    0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, 0x1800
+static const s16 sPitch7_2[] = {
+    0x0800, 0x0900, 0x0b00, 0x0d00, 0x0e00, 0x0d00, 0x0b00, PITCH_END
 };
 
-const s16 gUnknown_0860A2FE[] = {
-    0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, 0x1800
+static const s16 sPitch7_3[] = {
+    0x0800, 0x0600, 0x0400, 0x0200, 0x0d00, 0x0b00, 0x0900, PITCH_END
 };
 
-const s16 gUnknown_0860A30E[] = {
-    0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, 0x1800
+static const s16 sPitch7_4[] = {
+    0x0300, 0x0400, 0x0600, 0x0800, 0x0700, 0x0800, 0x0400, PITCH_END
 };
 
-const s16 *const gBardSoundPitchTables[] = {
-    gUnknown_0860A1C0,
-    gUnknown_0860A1C4,
-    gUnknown_0860A1C8,
-    gUnknown_0860A1CC,
-    gUnknown_0860A1D0,
-    gUnknown_0860A1D4,
-    gUnknown_0860A1DA,
-    gUnknown_0860A1E0,
-    gUnknown_0860A1E6,
-    gUnknown_0860A1EC,
-    gUnknown_0860A1F2,
-    gUnknown_0860A1FA,
-    gUnknown_0860A202,
-    gUnknown_0860A20A,
-    gUnknown_0860A212,
-    gUnknown_0860A21A,
-    gUnknown_0860A224,
-    gUnknown_0860A22E,
-    gUnknown_0860A238,
-    gUnknown_0860A242,
-    gUnknown_0860A24C,
-    gUnknown_0860A258,
-    gUnknown_0860A264,
-    gUnknown_0860A270,
-    gUnknown_0860A27C,
-    gUnknown_0860A288,
-    gUnknown_0860A296,
-    gUnknown_0860A2A4,
-    gUnknown_0860A2B2,
-    gUnknown_0860A2C0,
-    gUnknown_0860A2CE,
-    gUnknown_0860A2DE,
-    gUnknown_0860A2EE,
-    gUnknown_0860A2FE,
-    gUnknown_0860A30E
+// Only sPitch7_# are used below
+// This table is always indexed with (x + 30), where x is some value 0 - 4
+static const s16 *const sBardSoundPitchTables[] = {
+    sPitch1_0,
+    sPitch1_1,
+    sPitch1_2,
+    sPitch1_3,
+    sPitch1_4,
+    sPitch2_0,
+    sPitch2_1,
+    sPitch2_2,
+    sPitch2_3,
+    sPitch2_4,
+    sPitch3_0,
+    sPitch3_1,
+    sPitch3_2,
+    sPitch3_3,
+    sPitch3_4,
+    sPitch4_0,
+    sPitch4_1,
+    sPitch4_2,
+    sPitch4_3,
+    sPitch4_4,
+    sPitch5_0,
+    sPitch5_1,
+    sPitch5_2,
+    sPitch5_3,
+    sPitch5_4,
+    sPitch6_0,
+    sPitch6_1,
+    sPitch6_2,
+    sPitch6_3,
+    sPitch6_4,
+    sPitch7_0,
+    sPitch7_1,
+    sPitch7_2,
+    sPitch7_3,
+    sPitch7_4
 };
 
 
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 6bb77bc84..fa3d4472a 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -4876,7 +4876,7 @@ bool8 sub_811EAA4(u16 easyChatWord)
     }
 }
 
-bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
+bool8 IsBardWordInvalid(u16 easyChatWord)
 {
     int numWordsInGroup;
     u8 groupId = EC_GROUP(easyChatWord);
@@ -4888,11 +4888,11 @@ bool8 ECWord_CheckIfOutsideOfValidRange(u16 easyChatWord)
     {
     case EC_GROUP_POKEMON:
     case EC_GROUP_POKEMON_2:
-        numWordsInGroup = gNumSpeciesNames;
+        numWordsInGroup = gNumBardWords_Species;
         break;
     case EC_GROUP_MOVE_1:
     case EC_GROUP_MOVE_2:
-        numWordsInGroup = gUnknown_085FA1D4;
+        numWordsInGroup = gNumBardWords_Moves;
         break;
     default:
         numWordsInGroup = gEasyChatGroups[groupId].numWords;