27 files changed, 22 insertions, 27 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s
index a0db27bf5..c37418e5c 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_2.s b/asm/battle_2.s
index b325276fc..c8f8eb0f4 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -1,5 +1,4 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_9.s b/asm/battle_9.s
index 8d59770f0..dce32d076 100644
--- a/asm/battle_9.s
+++ b/asm/battle_9.s
@@ -1,5 +1,4 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s
index e63f2882c..4bfda89ad 100644
--- a/asm/battle_anim_80CA710.s
+++ b/asm/battle_anim_80CA710.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s
index d59c2f1ca..30807efaf 100644
--- a/asm/battle_anim_81258BC.s
+++ b/asm/battle_anim_81258BC.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s
index ff6aeaa64..59c6fbf47 100644
--- a/asm/battle_anim_812C144.s
+++ b/asm/battle_anim_812C144.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s
index ef30b0458..0019aa7b0 100644
--- a/asm/battle_anim_813F0F4.s
+++ b/asm/battle_anim_813F0F4.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/cable_car.s b/asm/cable_car.s
index e1131c549..52bc2668b 100644
--- a/asm/cable_car.s
+++ b/asm/cable_car.s
@@ -1,5 +1,4 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s
index d02c5bb2e..279ce3091 100644
--- a/asm/cable_car_util.s
+++ b/asm/cable_car_util.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/contest.s b/asm/contest.s
index ad3b4fba9..f6193eb3b 100644
--- a/asm/contest.s
+++ b/asm/contest.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/contest_ai.s b/asm/contest_ai.s
index ae5d8c03e..d2061c84e 100644
--- a/asm/contest_ai.s
+++ b/asm/contest_ai.s
@@ -1,5 +1,4 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/contest_effect.s b/asm/contest_effect.s
index 63cae8c82..5eec3852d 100644
--- a/asm/contest_effect.s
+++ b/asm/contest_effect.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 0f69dcb51..17454b5f0 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/contest_link_80C857C.s b/asm/contest_link_80C857C.s
index 164b1ac03..69f75eb5a 100644
--- a/asm/contest_link_80C857C.s
+++ b/asm/contest_link_80C857C.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/cute_sketch.s b/asm/cute_sketch.s
index 14c28327d..bfa7eeabc 100644
--- a/asm/cute_sketch.s
+++ b/asm/cute_sketch.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/easy_chat.s b/asm/easy_chat.s
index d97fc58ad..49d780a93 100644
--- a/asm/easy_chat.s
+++ b/asm/easy_chat.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s
index 3c4f96e32..c9abfdb40 100755
--- a/asm/pc_screen_effect.s
+++ b/asm/pc_screen_effect.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index c8caf3628..af27982ea 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokedex_cry_screen.s b/asm/pokedex_cry_screen.s
index ecb215abb..0195da256 100644
--- a/asm/pokedex_cry_screen.s
+++ b/asm/pokedex_cry_screen.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokemon_item_effect.s b/asm/pokemon_item_effect.s
index dcd0cada5..f2867657c 100644
--- a/asm/pokemon_item_effect.s
+++ b/asm/pokemon_item_effect.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 447141b79..eaaefbbb0 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s
index dddc31fd8..c5ba567d7 100644
--- a/asm/pokemon_summary_screen.s
+++ b/asm/pokemon_summary_screen.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/pokenav.s b/asm/pokenav.s
index cbae6d0cc..43fca9d9e 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/roulette.s b/asm/roulette.s
index 2dc191630..59a42bfed 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/roulette_util.s b/asm/roulette_util.s
index 191c9592f..80b758b02 100644
--- a/asm/roulette_util.s
+++ b/asm/roulette_util.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index 1ae5b718d..62792245d 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -1,5 +1,4 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
 	.include "asm/macros.inc"
 
 	.syntax unified
diff --git a/asm/unk_text_8095904.s b/asm/unk_text_8095904.s
index 4c1b662b3..063008d0b 100755
--- a/asm/unk_text_8095904.s
+++ b/asm/unk_text_8095904.s
@@ -1,5 +1,5 @@
 	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
+
 	.include "asm/macros.inc"
 
 	.syntax unified