take your stupid fucking politically correct names since you dont care about authenticity

34 files changed, 39 insertions, 37 deletions

diff --git a/include/evobjmv.h b/include/event_object_movement.h
index 9f76a5856..495942656 100644
--- a/include/evobjmv.h
+++ b/include/event_object_movement.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_EVOBJMV_H
-#define GUARD_EVOBJMV_H
+#ifndef GUARD_EVENTOBJMV_H
+#define GUARD_EVENTOBJMV_H
 
 #include "sprite.h"
 
@@ -475,4 +475,4 @@ u8 ZCoordToPriority(u8);
 void FieldObjectUpdateZCoord(struct MapObject *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 
-#endif // GUARD_EVOBJMV_H
+#endif // GUARD_EVENTOBJMV_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 1003b026f..5aa9eb360 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_FIELDMAP2_H
 #define GUARD_FIELDMAP2_H
-#include "evobjmv.h"
+#include "event_object_movement.h"
 
 extern struct BackupMapData gUnknown_03004870;
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
diff --git a/ld_script.txt b/ld_script.txt
index 48e9783bf..bce737e09 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -84,7 +84,7 @@ SECTIONS {
         src/field/field_camera.o(.text);
         src/field/field_door.o(.text);
         src/field/field_player_avatar.o(.text);
-        src/field/evobjmv.o(.text);
+        src/field/event_object_movement.o(.text);
         src/field/field_message_box.o(.text);
         src/field/map_obj_lock.o(.text);
         src/engine/text_window.o(.text);
@@ -527,7 +527,7 @@ SECTIONS {
         src/field/metatile_behavior.o(.rodata);
         src/field/field_door.o(.rodata);
         src/field/field_player_avatar.o(.rodata);
-        src/field/evobjmv.o(.rodata);
+        src/field/event_object_movement.o(.rodata);
         src/engine/text_window.o(.rodata);
         src/engine/script.o(.rodata);
         src/field/scrcmd.o(.rodata);
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 481bc66c5..ed6a97ba2 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -5,7 +5,7 @@
 #include "decompress.h"
 #include "easy_chat.h"
 #include "event_data.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "graphics.h"
 #include "menu.h"
diff --git a/src/engine/naming_screen.c b/src/engine/naming_screen.c
index 5cb06d56f..59b9b4d84 100644
--- a/src/engine/naming_screen.c
+++ b/src/engine/naming_screen.c
@@ -3,7 +3,7 @@
 #include "data2.h"
 #include "graphics.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "main.h"
 #include "menu.h"
diff --git a/src/field/berry.c b/src/field/berry.c
index cdfeb57af..33effb4ce 100644
--- a/src/field/berry.c
+++ b/src/field/berry.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "berry.h"
 #include "field_control_avatar.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "fieldmap.h"
 #include "item.h"
 #include "item_menu.h"
diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index ea4a3df05..9fbfd0681 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -2,7 +2,7 @@
 #include "berry_tag_screen.h"
 #include "berry.h"
 #include "decompress.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "item_menu.h"
 #include "constants/items.h"
 #include "item_use.h"
diff --git a/src/field/bike.c b/src/field/bike.c
index a81aa395b..28439e6bb 100644
--- a/src/field/bike.c
+++ b/src/field/bike.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "bike.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "constants/flags.h"
diff --git a/src/field/evobjmv.c b/src/field/event_object_movement.c
index 6b38df2ad..1236cd9b6 100644
--- a/src/field/evobjmv.c
+++ b/src/field/event_object_movement.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "berry.h"
 #include "event_data.h"
 #include "field_camera.h"
@@ -16,6 +16,8 @@
 #include "constants/map_objects.h"
 #include "trainer_see.h"
 
+// this file was known as evobjmv.c in Game Freak's original source
+
 // rodata
 
 const u8 gUnknown_0830FD14[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
diff --git a/src/field/field_effect.c b/src/field/field_effect.c
index dff5c7e63..f85bc520e 100644
--- a/src/field/field_effect.c
+++ b/src/field/field_effect.c
@@ -15,7 +15,7 @@
 #include "constants/songs.h"
 #include "decoration.h"
 #include "field_player_avatar.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "metatile_behavior.h"
 #include "field_camera.h"
 #include "field_effect.h"
diff --git a/src/field/field_effect_helpers.c b/src/field/field_effect_helpers.c
index c760d9aae..bc4a1770e 100644
--- a/src/field/field_effect_helpers.c
+++ b/src/field/field_effect_helpers.c
@@ -4,7 +4,7 @@
 #include "metatile_behavior.h"
 #include "constants/songs.h"
 #include "sound.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_camera.h"
 #include "field_weather.h"
 #include "field_effect.h"
diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c
index 492c96fdd..35ea3952a 100644
--- a/src/field/field_fadetransition.c
+++ b/src/field/field_fadetransition.c
@@ -4,7 +4,7 @@
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "field_special_scene.h"
 #include "field_weather.h"
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c
index 41e999719..c4ba8902e 100644
--- a/src/field/field_player_avatar.c
+++ b/src/field/field_player_avatar.c
@@ -4,7 +4,7 @@
 #include "event_data.h"
 #include "field_effect.h"
 #include "field_effect_helpers.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "fieldmap.h"
 #include "main.h"
 #include "constants/map_objects.h"
diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c
index f81f2e2f6..2010ebcf4 100644
--- a/src/field/field_special_scene.c
+++ b/src/field/field_special_scene.c
@@ -3,7 +3,7 @@
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_fadetransition.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_specials.h"
 #include "fieldmap.h"
 #include "main.h"
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index 81514c221..715086f00 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -4,7 +4,7 @@
 #include "fieldmap.h"
 #include "event_data.h"
 #include "battle_tower.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "region_map.h"
 #include "field_region_map.h"
 #include "field_message_box.h"
diff --git a/src/field/field_weather.c b/src/field/field_weather.c
index 838df6508..3f500ba50 100644
--- a/src/field/field_weather.c
+++ b/src/field/field_weather.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "blend_palette.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_weather.h"
 #include "palette.h"
 #include "random.h"
diff --git a/src/field/field_weather_effects.c b/src/field/field_weather_effects.c
index 09d98b7b1..386925531 100644
--- a/src/field/field_weather_effects.c
+++ b/src/field/field_weather_effects.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_weather.h"
 #include "overworld.h"
 #include "random.h"
diff --git a/src/field/fldeff_berrytree.c b/src/field/fldeff_berrytree.c
index 43e29d7f0..6b03e9952 100644
--- a/src/field/fldeff_berrytree.c
+++ b/src/field/fldeff_berrytree.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "script.h"
 
diff --git a/src/field/fldeff_cut.c b/src/field/fldeff_cut.c
index 2043c5688..5bf2c5c43 100644
--- a/src/field/fldeff_cut.c
+++ b/src/field/fldeff_cut.c
@@ -2,7 +2,7 @@
 #include "fldeff_cut.h"
 #include "field_camera.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "map_obj_lock.h"
diff --git a/src/field/fldeff_decoration.c b/src/field/fldeff_decoration.c
index d6c5e6e8b..1859fc00b 100644
--- a/src/field/fldeff_decoration.c
+++ b/src/field/fldeff_decoration.c
@@ -2,7 +2,7 @@
 #include "event_data.h"
 #include "field_camera.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "script.h"
diff --git a/src/field/fldeff_recordmixing.c b/src/field/fldeff_recordmixing.c
index 8d5e7229d..716447f9c 100644
--- a/src/field/fldeff_recordmixing.c
+++ b/src/field/fldeff_recordmixing.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "fldeff_recordmixing.h"
 #include "sprite.h"
 
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index 7aaf650b2..774fdf4b2 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -4,7 +4,7 @@
 #include "data2.h"
 #include "decompress.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "graphics.h"
 #include "item.h"
diff --git a/src/field/map_obj_lock.c b/src/field/map_obj_lock.c
index ceda005c3..3bd25dbdf 100644
--- a/src/field/map_obj_lock.c
+++ b/src/field/map_obj_lock.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "map_obj_lock.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "script_movement.h"
 #include "task.h"
diff --git a/src/field/overworld.c b/src/field/overworld.c
index 397a28436..8ca8aeea9 100644
--- a/src/field/overworld.c
+++ b/src/field/overworld.c
@@ -9,7 +9,7 @@
 #include "field_control_avatar.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index 4804ffb0e..69f655a65 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "bike.h"
 #include "event_data.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "fieldmap.h"
 #include "constants/maps.h"
 #include "constants/songs.h"
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index 44863edb2..e5272bc9c 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -12,7 +12,7 @@
 #include "field_door.h"
 #include "field_effect.h"
 #include "field_fadetransition.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_message_box.h"
 #include "field_player_avatar.h"
 #include "field_screen_effect.h"
diff --git a/src/field/script_movement.c b/src/field/script_movement.c
index b509ee23c..653dffcbf 100644
--- a/src/field/script_movement.c
+++ b/src/field/script_movement.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "script_movement.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "task.h"
 #include "util.h"
 
diff --git a/src/field/shop.c b/src/field/shop.c
index a197ca13d..0f53eef17 100644
--- a/src/field/shop.c
+++ b/src/field/shop.c
@@ -16,7 +16,7 @@
 #include "task.h"
 #include "tv.h"
 #include "scanline_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
 #include "item.h"
diff --git a/src/field/trainer_see.c b/src/field/trainer_see.c
index 2ff1bd372..2913a0a5a 100644
--- a/src/field/trainer_see.c
+++ b/src/field/trainer_see.c
@@ -2,7 +2,7 @@
 #include "trainer_see.h"
 #include "battle_setup.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "script.h"
 #include "sprite.h"
diff --git a/src/field/tv.c b/src/field/tv.c
index 786320eba..ebf304a6e 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -21,7 +21,7 @@
 #include "battle.h"
 #include "link.h"
 #include "constants/easy_chat.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_specials.h"
 #include "item.h"
 #include "constants/items.h"
diff --git a/src/rom6.c b/src/rom6.c
index 09f6faac2..ffd01fdb9 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -4,7 +4,7 @@
 #include "rom6.h"
 #include "braille_puzzles.h"
 #include "field_effect.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "item_use.h"
 #include "pokemon_menu.h"
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c
index f52f4524d..57cb17c58 100644
--- a/src/scene/cable_car.c
+++ b/src/scene/cable_car.c
@@ -14,7 +14,7 @@
 #include "constants/songs.h"
 #include "decompress.h"
 #include "field_weather.h"
-#include "evobjmv.h"
+#include "event_object_movement.h"
 #include "scanline_effect.h"
 #include "event_data.h"
 #include "cable_car_util.h"
diff --git a/sym_bss.txt b/sym_bss.txt
index 10f83c3cf..6380330bb 100644
--- a/sym_bss.txt
+++ b/sym_bss.txt
@@ -10,7 +10,7 @@
 . = ALIGN(4); src/engine/play_time.o(.bss);
 . = ALIGN(4); src/field/overworld.o(.bss);
 . = ALIGN(4); src/field/field_camera.o(.bss);
-. = ALIGN(4); src/field/evobjmv.o(.bss);
+. = ALIGN(4); src/field/event_object_movement.o(.bss);
 . = ALIGN(4); src/field/field_message_box.o(.bss);
 . = ALIGN(4); src/engine/text_window.o(.bss);
 . = ALIGN(4); src/engine/script.o(.bss);
diff --git a/sym_common.txt b/sym_common.txt
index 0102071f4..aec64ebf0 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -186,7 +186,7 @@ SYMBOL(gUnknown_03004880, 24)
 SYMBOL(gUnknown_03004898, 4)
 SYMBOL(gUnknown_0300489C, 4)
 
-// evobjmv.c
+// event_object_movement.c
 SYMBOL(gMapObjects, 576)
 
 #if DEBUG