abilities, songs, species constants

17 files changed, 26 insertions, 26 deletions

diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index a3cd15042..69f168aff 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
 #include "battle_interface.h"
 #include "battle_setup.h"
@@ -17,9 +17,9 @@
 #include "rom3.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sprite.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c
index 263eb2be5..05fd89d24 100644
--- a/src/battle/battle_3.c
+++ b/src/battle/battle_3.c
@@ -1,11 +1,11 @@
 #include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
 #include "moves.h"
 #include "item.h"
 #include "items.h"
 #include "hold_effects.h"
-#include "species.h"
+#include "constants/species.h"
 #include "pokemon.h"
 #include "data2.h"
 #include "random.h"
diff --git a/src/battle/battle_4.c b/src/battle/battle_4.c
index 088f30669..ce9f55039 100644
--- a/src/battle/battle_4.c
+++ b/src/battle/battle_4.c
@@ -2,19 +2,19 @@
 #include "battle.h"
 #include "battle_move_effects.h"
 #include "moves.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "item.h"
 #include "items.h"
 #include "data2.h"
 #include "hold_effects.h"
 #include "random.h"
 #include "rom3.h"
-#include "species.h"
+#include "constants/species.h"
 #include "pokemon.h"
 #include "text.h"
 #include "palette.h"
 #include "main.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "task.h"
 #include "decompress.h"
diff --git a/src/battle/battle_7.c b/src/battle/battle_7.c
index 0728b4b71..5a30e012d 100644
--- a/src/battle/battle_7.c
+++ b/src/battle/battle_7.c
@@ -11,9 +11,9 @@
 #include "pokemon.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "species.h"
+#include "constants/species.h"
 #include "sprite.h"
 #include "task.h"
 #include "text.h"
diff --git a/src/battle/battle_ai.c b/src/battle/battle_ai.c
index 0348c3ccd..eab90376e 100644
--- a/src/battle/battle_ai.c
+++ b/src/battle/battle_ai.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "battle_ai.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
 #include "battle_move_effects.h"
 #include "data2.h"
@@ -9,7 +9,7 @@
 #include "pokemon.h"
 #include "random.h"
 #include "rom_8077ABC.h"
-#include "species.h"
+#include "constants/species.h"
 #include "util.h"
 #include "ewram.h"
 
diff --git a/src/battle/battle_controller_linkopponent.c b/src/battle/battle_controller_linkopponent.c
index 88043c60d..3259fc7ee 100644
--- a/src/battle/battle_controller_linkopponent.c
+++ b/src/battle/battle_controller_linkopponent.c
@@ -8,7 +8,7 @@
 #include "palette.h"
 #include "rom_8077ABC.h"
 #include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
diff --git a/src/battle/battle_controller_linkpartner.c b/src/battle/battle_controller_linkpartner.c
index 3e6ea4add..fc3fde661 100644
--- a/src/battle/battle_controller_linkpartner.c
+++ b/src/battle/battle_controller_linkpartner.c
@@ -13,7 +13,7 @@
 #include "rom3.h"
 #include "rom_8077ABC.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "task.h"
diff --git a/src/battle/battle_controller_opponent.c b/src/battle/battle_controller_opponent.c
index 4d4155419..a35687796 100644
--- a/src/battle/battle_controller_opponent.c
+++ b/src/battle/battle_controller_opponent.c
@@ -14,7 +14,7 @@
 #include "rom3.h"
 #include "rom_8077ABC.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sprite.h"
 #include "string_util.h"
 #include "task.h"
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 55fc45f95..956809814 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -13,7 +13,7 @@
 #include "palette.h"
 #include "pokemon.h"
 #include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "task.h"
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index f83eddc9f..3dcfca948 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -8,7 +8,7 @@
 #include "menu_cursor.h"
 #include "palette.h"
 #include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "text.h"
 #include "util.h"
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 77aa54873..0d698d9a5 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -9,7 +9,7 @@
 #include "palette.h"
 #include "pokemon.h"
 #include "rom3.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "item_use.h"
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c
index d35440246..ea393277e 100644
--- a/src/battle/battle_interface.c
+++ b/src/battle/battle_interface.c
@@ -7,7 +7,7 @@
 #include "pokemon.h"
 #include "rom_8077ABC.h"
 #include "safari_zone.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "string_util.h"
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 97e9dc0fc..237686099 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -12,7 +12,7 @@
 #include "pokemon_summary_screen.h"
 #include "rom_8077ABC.h"
 #include "rom_8094928.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
 #include "strings.h"
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 3d63a85c9..3587c008c 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -23,9 +23,9 @@
 #include "script.h"
 #include "script_pokemon_80C4.h"
 #include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
-#include "species.h"
+#include "constants/species.h"
 #include "starter_choose.h"
 #include "string_util.h"
 #include "strings.h"
diff --git a/src/battle/battle_transition.c b/src/battle/battle_transition.c
index f7c8073c5..985f43945 100644
--- a/src/battle/battle_transition.c
+++ b/src/battle/battle_transition.c
@@ -9,7 +9,7 @@
 #include "random.h"
 #include "sprite.h"
 #include "sound.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "trainer.h"
 #include "field_camera.h"
 #include "ewram.h"
diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c
index 42c26dee0..5f935f2be 100644
--- a/src/battle/calculate_base_damage.c
+++ b/src/battle/calculate_base_damage.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "abilities.h"
+#include "constants/abilities.h"
 #include "battle.h"
 #include "berry.h"
 #include "data2.h"
@@ -8,7 +8,7 @@
 #include "item.h"
 #include "items.h"
 #include "pokemon.h"
-#include "species.h"
+#include "constants/species.h"
 #include "moves.h"
 #include "battle_move_effects.h"
 #include "ewram.h"
diff --git a/src/battle/pokeball.c b/src/battle/pokeball.c
index 8271e53ac..12fd5e5d9 100644
--- a/src/battle/pokeball.c
+++ b/src/battle/pokeball.c
@@ -8,7 +8,7 @@
 #include "pokeball.h"
 #include "pokemon.h"
 #include "rom_8077ABC.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"