From 253c09949b421ec09a688af2945eb3df1fc00777 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Fri, 15 Dec 2017 12:38:59 -0500
Subject: [PATCH] Move data/audio/ back into audio/ Keep trainer data together

---
 audio/engine.asm                                | 4 ++--
 {data/audio => audio}/notes.asm                 | 0
 {data/audio => audio}/wave_samples.asm          | 0
 constants/audio_constants.asm                   | 2 +-
 constants/trainer_constants.asm                 | 1 +
 {text => data/trainers}/trainer_class_names.asm | 2 ++
 main.asm                                        | 3 +--
 7 files changed, 7 insertions(+), 5 deletions(-)
 rename {data/audio => audio}/notes.asm (100%)
 rename {data/audio => audio}/wave_samples.asm (100%)
 rename {text => data/trainers}/trainer_class_names.asm (90%)

diff --git a/audio/engine.asm b/audio/engine.asm
index 4fd618940..da90e19ec 100644
--- a/audio/engine.asm
+++ b/audio/engine.asm
@@ -2882,9 +2882,9 @@ LoadMusicByte:: ; e8d76
 ; e8d80
 
 
-INCLUDE "data/audio/notes.asm"
+INCLUDE "audio/notes.asm"
 
-INCLUDE "data/audio/wave_samples.asm"
+INCLUDE "audio/wave_samples.asm"
 
 INCLUDE "audio/drumkits.asm"
 
diff --git a/data/audio/notes.asm b/audio/notes.asm
similarity index 100%
rename from data/audio/notes.asm
rename to audio/notes.asm
diff --git a/data/audio/wave_samples.asm b/audio/wave_samples.asm
similarity index 100%
rename from data/audio/wave_samples.asm
rename to audio/wave_samples.asm
diff --git a/constants/audio_constants.asm b/constants/audio_constants.asm
index dd39df20f..e2c62c389 100755
--- a/constants/audio_constants.asm
+++ b/constants/audio_constants.asm
@@ -1,5 +1,5 @@
 ; pitch
-; FrequencyTable indexes (see data/audio/notes.asm)
+; FrequencyTable indexes (see audio/notes.asm)
 	const_def
 	const __ ; 0
 	const C_ ; 1
diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index d6e543611..f2fb72714 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -7,6 +7,7 @@ ENDM
 ; `trainerclass` indexes are for:
 ; - TrainerClassAttributes (see data/trainers/trainer_attributes.asm)
 ; - TrainerClassDVs (see data/trainers/trainer_dvs.asm)
+; - TrainerClassNames (see data/trainers/trainer_class_names.asm)
 ; - TrainerEncounterMusic (see data/trainers/encounter_music.asm)
 ; - TrainerGroups (see data/trainers/party_pointers.asm)
 ; - BTTrainerClassGenders (see data/trainers/gendered_trainers.asm)
diff --git a/text/trainer_class_names.asm b/data/trainers/trainer_class_names.asm
similarity index 90%
rename from text/trainer_class_names.asm
rename to data/trainers/trainer_class_names.asm
index 555e6c652..48d81f910 100755
--- a/text/trainer_class_names.asm
+++ b/data/trainers/trainer_class_names.asm
@@ -1,3 +1,5 @@
+TrainerClassNames:: ; 2c1ef
+; entries correspond to trainer classes (see constants/trainer_constants.asm)
 	db "LEADER@"
 	db "LEADER@"
 	db "LEADER@"
diff --git a/main.asm b/main.asm
index 5049540d8..f46b579c5 100644
--- a/main.asm
+++ b/main.asm
@@ -1172,8 +1172,7 @@ SECTION "bankB", ROMX
 
 INCLUDE "battle/trainer_huds.asm"
 
-TrainerClassNames:: ; 2c1ef
-INCLUDE "text/trainer_class_names.asm"
+INCLUDE "data/trainers/trainer_class_names.asm"
 
 INCLUDE "battle/ai/redundant.asm"