1 files changed, 46 insertions, 4 deletions
diff --git a/src/bard_music.c b/src/bard_music.c
index 124a5e4a0..290dbdb54 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -2,7 +2,6 @@
 // Includes
 #include "global.h"
 #include "bard_music.h"
-#include "text.h"
 #include "easy_chat.h"
 
 // Static type declarations
@@ -13,9 +12,52 @@
 
 // .rodata
 
-extern const struct BardSound gBardSounds_Pokemon[][6];
-extern const struct BardSound gBardSounds_Moves[][6];
-extern const struct BardSound (*const gBardSoundsTable[])[6];
+#include "data/bard_music/pokemon.h"
+#include "data/bard_music/moves.h"
+#include "data/bard_music/trainer.h"
+#include "data/bard_music/status.h"
+#include "data/bard_music/battle.h"
+#include "data/bard_music/greetings.h"
+#include "data/bard_music/people.h"
+#include "data/bard_music/voices.h"
+#include "data/bard_music/speech.h"
+#include "data/bard_music/endings.h"
+#include "data/bard_music/feelings.h"
+#include "data/bard_music/conditions.h"
+#include "data/bard_music/actions.h"
+#include "data/bard_music/lifestyle.h"
+#include "data/bard_music/hobbies.h"
+#include "data/bard_music/time.h"
+#include "data/bard_music/misc.h"
+#include "data/bard_music/adjectives.h"
+#include "data/bard_music/events.h"
+#include "data/bard_music/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
+};
+
 extern const s16 *const gUnknown_0860A320[];
 extern const int gUnknown_0860A3DC[];
 extern const struct BardSound gBardSound_InvalidWord[6];