20 files changed, 18 insertions, 18 deletions
diff --git a/constants/ability_constants.s b/constants/ability_constants.inc
index 8ccc872f7..8ccc872f7 100644
--- a/constants/ability_constants.s
+++ b/constants/ability_constants.inc
diff --git a/constants/battle_frontier_constants.s b/constants/battle_frontier_constants.inc
index a6c069723..a6c069723 100644
--- a/constants/battle_frontier_constants.s
+++ b/constants/battle_frontier_constants.inc
diff --git a/constants/battle_move_constants.s b/constants/battle_move_constants.inc
index a05da3db3..a05da3db3 100644
--- a/constants/battle_move_constants.s
+++ b/constants/battle_move_constants.inc
diff --git a/constants/berry_constants.s b/constants/berry_constants.inc
index 2ecd7ac36..2ecd7ac36 100644
--- a/constants/berry_constants.s
+++ b/constants/berry_constants.inc
diff --git a/constants/constants.inc b/constants/constants.inc
new file mode 100644
index 000000000..650ba4703
--- /dev/null
+++ b/constants/constants.inc
@@ -0,0 +1,18 @@
+	.include "constants/gba_constants.inc"
+	.include "constants/misc_constants.inc"
+	.include "constants/species_constants.inc"
+	.include "constants/ability_constants.inc"
+	.include "constants/move_constants.inc"
+	.include "constants/item_constants.inc"
+	.include "constants/type_constants.inc"
+	.include "constants/contest_constants.inc"
+	.include "constants/pokemon_data_constants.inc"
+	.include "constants/item_data_constants.inc"
+	.include "constants/battle_move_constants.inc"
+	.include "constants/easy_chat_constants.inc"
+	.include "constants/trainer_constants.inc"
+	.include "constants/battle_frontier_constants.inc"
+	.include "constants/map_constants.inc"
+	.include "constants/berry_constants.inc"
+	.include "constants/field_object_constants.inc"
+	.include "constants/contest_move_effects.inc"
diff --git a/constants/constants.s b/constants/constants.s
deleted file mode 100644
index 30fd312e6..000000000
--- a/constants/constants.s
+++ /dev/null
@@ -1,18 +0,0 @@
-	.include "constants/gba_constants.s"
-	.include "constants/misc_constants.s"
-	.include "constants/species_constants.s"
-	.include "constants/ability_constants.s"
-	.include "constants/move_constants.s"
-	.include "constants/item_constants.s"
-	.include "constants/type_constants.s"
-	.include "constants/contest_constants.s"
-	.include "constants/pokemon_data_constants.s"
-	.include "constants/item_data_constants.s"
-	.include "constants/battle_move_constants.s"
-	.include "constants/easy_chat_constants.s"
-	.include "constants/trainer_constants.s"
-	.include "constants/battle_frontier_constants.s"
-	.include "constants/map_constants.s"
-	.include "constants/berry_constants.s"
-	.include "constants/field_object_constants.s"
-	.include "constants/contest_move_effects.s"
diff --git a/constants/contest_constants.s b/constants/contest_constants.inc
index e971764d6..e971764d6 100644
--- a/constants/contest_constants.s
+++ b/constants/contest_constants.inc
diff --git a/constants/contest_move_effects.s b/constants/contest_move_effects.inc
index b19e05004..b19e05004 100644
--- a/constants/contest_move_effects.s
+++ b/constants/contest_move_effects.inc
diff --git a/constants/easy_chat_constants.s b/constants/easy_chat_constants.inc
index 4d9aecec5..4d9aecec5 100644
--- a/constants/easy_chat_constants.s
+++ b/constants/easy_chat_constants.inc
diff --git a/constants/field_object_constants.s b/constants/field_object_constants.inc
index 50cdbd848..50cdbd848 100644
--- a/constants/field_object_constants.s
+++ b/constants/field_object_constants.inc
diff --git a/constants/gba_constants.s b/constants/gba_constants.inc
index 46dfdcc2f..46dfdcc2f 100644
--- a/constants/gba_constants.s
+++ b/constants/gba_constants.inc
diff --git a/constants/item_constants.s b/constants/item_constants.inc
index 934ebd798..934ebd798 100644
--- a/constants/item_constants.s
+++ b/constants/item_constants.inc
diff --git a/constants/item_data_constants.s b/constants/item_data_constants.inc
index 07ceb6e3b..07ceb6e3b 100644
--- a/constants/item_data_constants.s
+++ b/constants/item_data_constants.inc
diff --git a/constants/map_constants.s b/constants/map_constants.inc
index eabfe6e69..eabfe6e69 100644
--- a/constants/map_constants.s
+++ b/constants/map_constants.inc
diff --git a/constants/misc_constants.s b/constants/misc_constants.inc
index 5fa58cfe8..5fa58cfe8 100644
--- a/constants/misc_constants.s
+++ b/constants/misc_constants.inc
diff --git a/constants/move_constants.s b/constants/move_constants.inc
index b6c8edf98..b6c8edf98 100644
--- a/constants/move_constants.s
+++ b/constants/move_constants.inc
diff --git a/constants/pokemon_data_constants.s b/constants/pokemon_data_constants.inc
index cf5d4df41..cf5d4df41 100644
--- a/constants/pokemon_data_constants.s
+++ b/constants/pokemon_data_constants.inc
diff --git a/constants/species_constants.s b/constants/species_constants.inc
index 7ee94df61..7ee94df61 100644
--- a/constants/species_constants.s
+++ b/constants/species_constants.inc
diff --git a/constants/trainer_constants.s b/constants/trainer_constants.inc
index f761b721c..f761b721c 100644
--- a/constants/trainer_constants.s
+++ b/constants/trainer_constants.inc
diff --git a/constants/type_constants.s b/constants/type_constants.inc
index 86e3c9df3..86e3c9df3 100644
--- a/constants/type_constants.s
+++ b/constants/type_constants.inc