Move movement constants into include/constants/event_object_movement_constants.h

8 files changed, 14 insertions, 6 deletions

diff --git a/src/berry.c b/src/berry.c
index 323cb39cf..6e7d4592c 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1,5 +1,4 @@
 #include "global.h"
-#include "constants/items.h"
 #include "berry.h"
 #include "field_control_avatar.h"
 #include "event_object_movement.h"
@@ -12,6 +11,8 @@
 #include "random.h"
 #include "task.h"
 #include "text.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/items.h"
 
 #ifdef ENGLISH
 #define NAME_CHERI_BERRY   _("CHERI")
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 5d498c1ff..c8685bb49 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -15,6 +15,7 @@
 #include "trainer_see.h"
 #include "constants/field_effects.h"
 #include "constants/maps.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
diff --git a/src/field_effect.c b/src/field_effect.c
index 90c11b8c3..cc5f9252a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -24,6 +24,7 @@
 #include "fieldmap.h"
 #include "util.h"
 #include "pokemon_storage_system.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index c52dc98c6..670d8c54b 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -16,10 +16,11 @@
 #include "palette.h"
 #include "overworld.h"
 #include "script.h"
-#include "constants/songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/songs.h"
 
 void sub_8080B9C(u8);
 void task_map_chg_seq_0807E20C(u8);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 9a4f5f6cd..47f43858b 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -22,6 +22,7 @@
 #include "tv.h"
 #include "wild_encounter.h"
 #include "constants/field_effects.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/event_objects.h"
 
 EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0};
diff --git a/src/field_specials.c b/src/field_specials.c
index e8c83b376..043945a2f 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -18,10 +18,6 @@
 #include "string_util.h"
 #include "strings.h"
 #include "pokeblock.h"
-#include "constants/species.h"
-#include "constants/abilities.h"
-#include "constants/moves.h"
-#include "constants/weather.h"
 #include "text.h"
 #include "wallclock.h"
 #include "tv.h"
@@ -36,6 +32,11 @@
 #include "field_weather.h"
 #include "pokemon_summary_screen.h"
 #include "random.h"
+#include "constants/abilities.h"
+#include "constants/event_object_movement_constants.h"
+#include "constants/moves.h"
+#include "constants/species.h"
+#include "constants/weather.h"
 
 #if ENGLISH
 #define CHAR_DECIMAL_SEPARATOR CHAR_PERIOD
diff --git a/src/rom6.c b/src/rom6.c
index be14f1731..556a81293 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -13,6 +13,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
 extern u16 gSpecialVar_LastTalked;
diff --git a/src/trainer_see.c b/src/trainer_see.c
index dfbab1e3a..ee4cb6e0f 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -8,6 +8,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "util.h"
+#include "constants/event_object_movement_constants.h"
 #include "constants/field_effects.h"
 
 static bool8 CheckTrainer(u8);