Slight reorganization of data includes

3 files changed, 53 insertions, 52 deletions

diff --git a/include/data/bard_music/bard_sounds.h b/include/data/bard_music/bard_sounds.h
new file mode 100644
index 000000000..94923b099
--- /dev/null
+++ b/include/data/bard_music/bard_sounds.h
@@ -0,0 +1,52 @@
+#ifndef GUARD_BARD_SOUNDS_TABLE_H
+#define GUARD_BARD_SOUNDS_TABLE_H
+
+#define NULL_BARD_SOUND { 0xff }
+
+#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
+};
+
+#endif //GUARD_BARD_SOUNDS_TABLE_H
diff --git a/include/data/bard_music/bard_sounds_table.h b/include/data/bard_music/bard_sounds_table.h
deleted file mode 100644
index 7bf63b100..000000000
--- a/include/data/bard_music/bard_sounds_table.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef GUARD_BARD_SOUNDS_TABLE_H
-#define GUARD_BARD_SOUNDS_TABLE_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
-};
-
-#endif //GUARD_BARD_SOUNDS_TABLE_H
diff --git a/src/bard_music.c b/src/bard_music.c
index 335aecb2e..8a52d7257 100644
--- a/src/bard_music.c
+++ b/src/bard_music.c
@@ -4,29 +4,7 @@
 #include "bard_music.h"
 #include "easy_chat.h"
 
-#define NULL_BARD_SOUND {0xff, 0, 0, 0, 0}
-
-#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"
-#include "data/bard_music/bard_sounds_table.h"
+#include "data/bard_music/bard_sounds.h"
 #include "data/bard_music/word_pitch.h"
 #include "data/bard_music/default_sound.h"
 #include "data/bard_music/length_table.h"