Fix event object include guards and constant filenames

11 files changed, 11 insertions, 11 deletions

diff --git a/src/berry.c b/src/berry.c
index b76fc34c4..f1bdb5235 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -11,7 +11,7 @@
 #include "random.h"
 #include "task.h"
 #include "text.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/items.h"
 
 #ifdef ENGLISH
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index c6ce76195..7cffdcbc0 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -15,7 +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_object_movement.h"
 #include "constants/event_objects.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index d5bdab053..bca856e9e 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -24,7 +24,7 @@
 #include "trainer_see.h"
 #include "constants/vars.h"
 #include "wild_encounter.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/map_types.h"
 
 struct Coords32
diff --git a/src/field_effect.c b/src/field_effect.c
index 5c26b647c..a85b32049 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -24,7 +24,7 @@
 #include "text.h"
 #include "trig.h"
 #include "util.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 #include "constants/songs.h"
 
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index d0773cead..a87c32dbe 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -19,7 +19,7 @@
 #include "sound.h"
 #include "start_menu.h"
 #include "task.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/songs.h"
 
 void sub_8080B9C(u8);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 4657593e6..324dab9c8 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -20,7 +20,7 @@
 #include "task.h"
 #include "tv.h"
 #include "wild_encounter.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
 #include "constants/moves.h"
diff --git a/src/field_specials.c b/src/field_specials.c
index 491578369..972b63a0d 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -33,7 +33,7 @@
 #include "pokemon_summary_screen.h"
 #include "random.h"
 #include "constants/abilities.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/metatile_labels.h"
 #include "constants/moves.h"
 #include "constants/species.h"
diff --git a/src/item_use.c b/src/item_use.c
index 17a17327d..6659bd6d2 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -34,7 +34,7 @@
 #include "string_util.h"
 #include "strings.h"
 #include "task.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/map_types.h"
 #include "constants/species.h"
 #include "constants/vars.h"
diff --git a/src/rom6.c b/src/rom6.c
index c81e7d1bc..af823ae9c 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -11,7 +11,7 @@
 #include "sound.h"
 #include "sprite.h"
 #include "task.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/event_objects.h"
 #include "constants/field_effects.h"
 #include "constants/map_types.h"
diff --git a/src/secret_base.c b/src/secret_base.c
index 795696a13..097d95cfe 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -29,7 +29,7 @@
 #include "strings.h"
 #include "task.h"
 #include "text.h"
-#include "constants/bg_event_constants.h"
+#include "constants/event_bg.h"
 #include "constants/decorations.h"
 #include "constants/items.h"
 #include "constants/map_types.h"
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 109bc612c..5fc0a346d 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -8,7 +8,7 @@
 #include "sprite.h"
 #include "task.h"
 #include "util.h"
-#include "constants/event_object_movement_constants.h"
+#include "constants/event_object_movement.h"
 #include "constants/field_effects.h"
 
 static bool8 CheckTrainer(u8);