finish object event rename

16 files changed, 32 insertions, 36 deletions

diff --git a/src/battle_setup.c b/src/battle_setup.c
index 57797ba43..2faa70c15 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -13,7 +13,7 @@
 #include "strings.h"
 #include "string_util.h"
 #include "event_data.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
 #include "metatile_behavior.h"
 #include "event_scripts.h"
 #include "fldeff.h"
@@ -22,7 +22,7 @@
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
 #include "field_message_box.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "vs_seeker.h"
 #include "battle.h"
 #include "battle_setup.h"
diff --git a/src/map_obj_lock.c b/src/event_object_lock.c
index 385b5d470..e9de984f1 100644
--- a/src/map_obj_lock.c
+++ b/src/event_object_lock.c
@@ -1,12 +1,11 @@
 #include "global.h"
 #include "task.h"
 #include "field_player_avatar.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "script_movement.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
 #include "event_data.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
 
 bool8 walkrun_is_standing_still(void)
 {
diff --git a/src/fame_checker.c b/src/fame_checker.c
index 8c8f5b4ea..b8f2c0055 100644
--- a/src/fame_checker.c
+++ b/src/fame_checker.c
@@ -22,7 +22,7 @@
 #include "text.h"
 #include "window.h"
 #include "string_util.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "menu_indicators.h"
 #include "text_window.h"
 #include "fame_checker.h"
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 670e91d96..9c3173421 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -13,15 +13,14 @@
 #include "metatile_behavior.h"
 #include "quest_log.h"
 #include "link.h"
-#include "map_obj_80688E4.h"
+#include "event_object_80688E4.h"
 #include "sound.h"
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_screen_effect.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_specials.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
 #include "start_menu.h"
 #include "constants/songs.h"
 
diff --git a/src/field_specials.c b/src/field_specials.c
index 598ceea8e..d2100cb14 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -19,7 +19,7 @@
 #include "battle_tower.h"
 #include "field_camera.h"
 #include "field_effect.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "menu_indicators.h"
 #include "random.h"
 #include "mail_data.h"
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 704771865..a0c97e9e3 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -13,7 +13,7 @@
 #include "palette.h"
 #include "overworld.h"
 #include "wild_encounter.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "constants/songs.h"
 #include "constants/map_objects.h"
 #include "constants/map_types.h"
diff --git a/src/item_use.c b/src/item_use.c
index 71c67c540..83181e0be 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -7,7 +7,7 @@
 #include "event_data.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"
 #include "field_weather.h"
@@ -19,8 +19,8 @@
 #include "mail.h"
 #include "main.h"
 #include "malloc.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
 #include "metatile_behavior.h"
 #include "new_menu_helpers.h"
 #include "overworld.h"
diff --git a/src/itemfinder.c b/src/itemfinder.c
index 5ae30e6e4..370fce841 100644
--- a/src/itemfinder.c
+++ b/src/itemfinder.c
@@ -3,7 +3,7 @@
 #include "new_menu_helpers.h"
 #include "strings.h"
 #include "event_scripts.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
 #include "script.h"
 #include "sound.h"
 #include "event_data.h"
diff --git a/src/load_save.c b/src/load_save.c
index 8bfd0bc5e..3881646dd 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -178,7 +178,7 @@ void SaveObjectEvents(void)
 {
     int i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i++)
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
         gSaveBlock1Ptr->objectEvents[i] = gObjectEvents[i];
 }
 
@@ -186,7 +186,7 @@ void LoadObjectEvents(void)
 {
     int i;
 
-    for (i = 0; i < NUM_FIELD_OBJECTS; i++)
+    for (i = 0; i < OBJECT_EVENTS_COUNT; i++)
         gObjectEvents[i] = gSaveBlock1Ptr->objectEvents[i];
 }
 
diff --git a/src/quest_log.c b/src/quest_log.c
index d44eee96d..b6707a681 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -19,9 +19,9 @@
 #include "overworld.h"
 #include "field_fadetransition.h"
 #include "field_weather.h"
-#include "field_map_obj.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_movement.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
 #include "field_player_avatar.h"
 #include "field_control_avatar.h"
 #include "battle.h"
diff --git a/src/quest_log_8150454.c b/src/quest_log_8150454.c
index 93b3e6b61..64731f522 100644
--- a/src/quest_log_8150454.c
+++ b/src/quest_log_8150454.c
@@ -3,8 +3,7 @@
 #include "script.h"
 #include "task.h"
 #include "field_player_avatar.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
+#include "event_object_movement.h"
 #include "field_effect.h"
 #include "field_effect_helpers.h"
 #include "quest_log.h"
diff --git a/src/scrcmd.c b/src/scrcmd.c
index dadd3ecc7..6a5d61227 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -16,9 +16,8 @@
 #include "field_player_avatar.h"
 #include "sound.h"
 #include "script_movement.h"
-#include "field_map_obj.h"
-#include "field_map_obj_helpers.h"
-#include "map_obj_lock.h"
+#include "event_object_movement.h"
+#include "event_object_lock.h"
 #include "field_message_box.h"
 #include "new_menu_helpers.h"
 #include "window.h"
diff --git a/src/ss_anne.c b/src/ss_anne.c
index dcd85e359..853741886 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "task.h"
 #include "sound.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "script.h"
 #include "constants/songs.h"
 
diff --git a/src/start_menu.c b/src/start_menu.c
index 31bb3beb7..7394c8d52 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -23,8 +23,8 @@
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
 #include "new_menu_helpers.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_lock.h"
+#include "event_object_80688E4.h"
+#include "event_object_lock.h"
 #include "script.h"
 #include "sound.h"
 #include "quest_log.h"
diff --git a/src/teachy_tv.c b/src/teachy_tv.c
index 5f1316350..bd0198a64 100644
--- a/src/teachy_tv.c
+++ b/src/teachy_tv.c
@@ -15,7 +15,7 @@
 #include "item_menu.h"
 #include "item.h"
 #include "menu_indicators.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "random.h"
 #include "text.h"
 #include "constants/songs.h"
diff --git a/src/vs_seeker.c b/src/vs_seeker.c
index 23e1c5a59..ca74edcba 100644
--- a/src/vs_seeker.c
+++ b/src/vs_seeker.c
@@ -3,13 +3,13 @@
 #include "sound.h"
 #include "task.h"
 #include "malloc.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "new_menu_helpers.h"
 #include "item_use.h"
 #include "event_scripts.h"
 #include "event_data.h"
 #include "script.h"
-#include "map_obj_lock.h"
+#include "event_object_lock.h"
 #include "field_specials.h"
 #include "item_menu.h"
 #include "field_effect.h"
@@ -17,10 +17,10 @@
 #include "battle.h"
 #include "battle_setup.h"
 #include "random.h"
-#include "field_map_obj.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
-#include "map_obj_80688E4.h"
-#include "map_obj_8097404.h"
+#include "event_object_80688E4.h"
+#include "event_object_8097404.h"
 #include "unk_810c3a4.h"
 #include "vs_seeker.h"
 #include "constants/movement_commands.h"