diff --git a/src/bard_music.c b/src/bard_music.c
index 6c2578071b..1a61c25ffc 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -25,8 +25,8 @@ const struct BardSound *GetWordSounds(u16 word)
     {
         return gBardSound_InvalidWord;
     }
-    category = word >> 9;
-    subword = word & 0x1ff;
+    category = EC_GROUP(word);
+    subword = EC_INDEX(word);
     switch (category)
     {
         case EC_GROUP_POKEMON:
diff --git a/src/data/bard_music/bard_sounds.h b/src/data/bard_music/bard_sounds.h
index 4a09117268..1ec1f0d978 100644
--- a/src/data/bard_music/bard_sounds.h
+++ b/src/data/bard_music/bard_sounds.h
@@ -24,29 +24,29 @@
 #include "events.h"
 #include "trendysaying.h"
 
-const struct BardSound (*const gBardSoundsTable[])[6] = {
-    NULL,
-    gBardSounds_Trainer,
-    gBardSounds_Status,
-    gBardSounds_Battle,
-    gBardSounds_Greetings,
-    gBardSounds_People,
-    gBardSounds_Voices,
-    gBardSounds_Speech,
-    gBardSounds_Endings,
-    gBardSounds_Feelings,
-    gBardSounds_Conditions,
-    gBardSounds_Actions,
-    gBardSounds_Lifestyle,
-    gBardSounds_Hobbies,
-    gBardSounds_Time,
-    gBardSounds_Misc,
-    gBardSounds_Adjectives,
-    gBardSounds_Events,
-    NULL,
-    NULL,
-    gBardSounds_TrendySaying,
-    NULL
+const struct BardSound (*const gBardSoundsTable[EC_NUM_GROUPS])[6] = {
+    [EC_GROUP_POKEMON]       = NULL, // Handled by gBardSounds_Pokemon
+    [EC_GROUP_TRAINER]       = gBardSounds_Trainer,
+    [EC_GROUP_STATUS]        = gBardSounds_Status,
+    [EC_GROUP_BATTLE]        = gBardSounds_Battle,
+    [EC_GROUP_GREETINGS]     = gBardSounds_Greetings,
+    [EC_GROUP_PEOPLE]        = gBardSounds_People,
+    [EC_GROUP_VOICES]        = gBardSounds_Voices,
+    [EC_GROUP_SPEECH]        = gBardSounds_Speech,
+    [EC_GROUP_ENDINGS]       = gBardSounds_Endings,
+    [EC_GROUP_FEELINGS]      = gBardSounds_Feelings,
+    [EC_GROUP_CONDITIONS]    = gBardSounds_Conditions,
+    [EC_GROUP_ACTIONS]       = gBardSounds_Actions,
+    [EC_GROUP_LIFESTYLE]     = gBardSounds_Lifestyle,
+    [EC_GROUP_HOBBIES]       = gBardSounds_Hobbies,
+    [EC_GROUP_TIME]          = gBardSounds_Time,
+    [EC_GROUP_MISC]          = gBardSounds_Misc,
+    [EC_GROUP_ADJECTIVES]    = gBardSounds_Adjectives,
+    [EC_GROUP_EVENTS]        = gBardSounds_Events,
+    [EC_GROUP_MOVE_1]        = NULL, // Handled by gBardSounds_Moves
+    [EC_GROUP_MOVE_2]        = NULL, // Handled by gBardSounds_Moves
+    [EC_GROUP_TRENDY_SAYING] = gBardSounds_TrendySaying,
+    [EC_GROUP_POKEMON_2]     = NULL // Handled by gBardSounds_Pokemon
 };
 
 #endif //GUARD_BARD_SOUNDS_TABLE_H