Merge pull request #618 from huderlem/objMovement

Document event object movement

1800 files changed, 20334 insertions, 19986 deletions

diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 0a2752e20..f8733305e 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -3,7 +3,7 @@
 #include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/opponents.h"
@@ -1044,8 +1044,8 @@ EventScript_19F8E5:
 	return
 
 Movement_19F8F0::
-	step_59
-	step_end
+	reveal_trainer
+	end_movement
 
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
@@ -1489,9 +1489,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
-	step_4f
-	step_12
-	step_end
+	nurse_joy_bow
+	delay_4
+	end_movement
 
 Std_ObtainItem: @ 819FDF7
 	giveitem VAR_SPECIAL_0, VAR_SPECIAL_1
@@ -1845,11 +1845,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
 	end
 
 RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1863,11 +1863,11 @@ Route119_EventScript_1A0172:: @ 81A0172
 	end
 
 LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
 LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1894,30 +1894,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE
 	.else
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE
 	.endif
 	return
 
 CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2
 	.else
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2
 	.endif
 	return
 
@@ -2234,14 +2234,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
 	return
 
 SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
-	slow_step_right
-	slow_step_right
-	slow_step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_slow_right
+	walk_slow_right
+	walk_slow_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
@@ -2276,8 +2276,8 @@ EventScript_1A0457: @ unreferenced?
 	return
 
 Movement_1A047A:
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
@@ -2502,28 +2502,28 @@ Route119_EventScript_1A065E:: @ 81A065E
 FortreeCity_Movement_1A0662:: @ 81A0662
 Route119_Movement_1A0662:: @ 81A0662
 Route120_Movement_1A0662:: @ 81A0662
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
-	step_end
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678
 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
@@ -2621,8 +2621,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
-	step_57
-	step_end
+	emote_question_mark
+	end_movement
 
 AquaHideout_B2F_Movement_1A0833:: @ 81A0833
 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833
@@ -2651,8 +2651,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833
 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833
 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833
 SootopolisCity_Movement_1A0833:: @ 81A0833
-	step_56
-	step_end
+	emote_exclamation_mark
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835
 LavaridgeTown_Movement_1A0835:: @ 81A0835
@@ -2678,10 +2678,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835
 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835
 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835
 SootopolisCity_Movement_1A0835:: @ 81A0835
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 AquaHideout_B2F_Movement_1A0839:: @ 81A0839
 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839
@@ -2713,12 +2713,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839
 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839
 SlateportCity_Movement_1A0839:: @ 81A0839
 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839
-	step_3e
-	step_end
+	face_player
+	end_movement
 
 @ 81A083B
-	step_3f
-	step_end
+	face_away_player
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D
 LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D
@@ -2749,8 +2749,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D
 SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D
 SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D
 VerdanturfTown_Movement_1A083D:: @ 81A083D
-	step_4e
-	step_end
+	face_original_direction
+	end_movement
 
 Movement_1A083F:: @ 81A083F
 DewfordTown_Hall_Movement_1A083F:: @ 81A083F
@@ -2783,8 +2783,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F
 SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F
 SootopolisCity_Movement_1A083F:: @ 81A083F
 VictoryRoad_1F_Movement_1A083F:: @ 81A083F
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 AquaHideout_B2F_Movement_1A0841:: @ 81A0841
 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841
@@ -2814,8 +2814,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841
 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841
 SlateportCity_Movement_1A0841:: @ 81A0841
 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841
-	step_26
-	step_end
+	walk_in_place_fastest_up
+	end_movement
 
 AquaHideout_B2F_Movement_1A0843:: @ 81A0843
 DewfordTown_Hall_Movement_1A0843:: @ 81A0843
@@ -2846,8 +2846,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843
 SootopolisCity_Movement_1A0843:: @ 81A0843
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 BattleTower_Outside_Movement_1A0845:: @ 81A0845
 DewfordTown_Hall_Movement_1A0845:: @ 81A0845
@@ -2878,38 +2878,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845
 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845
 SootopolisCity_Movement_1A0845:: @ 81A0845
 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 @ 81A0858
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 PictureBookShelfScript:: @ 81A085B
 	msgbox PictureBookShelfText, 3
@@ -3761,9 +3761,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	end
 
 SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 gUnknown_081A2E14:: @ 81A2E14
 	lockall
@@ -4907,8 +4907,8 @@ gUnknown_081C6BDE:: @ 81C6BDE
 	end
 
 GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
-	step_54
-	step_end
+	set_invisible
+	end_movement
 
 @ 81C6BF9
 	msgbox Text_1C6C2B, 2
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index 63240a9fb..ef06df21f 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21
 	end
 
 TreeCutMovement: @ 81B0E30
-	step_5b
-	step_end
+	cut_tree
+	end_movement
 
 CannotUseCut: @ 81B0E32
 	msgbox CannotUseCutText, 3
@@ -103,8 +103,8 @@ DoRockSmashMovement_Done: @ 81B0F3A
 	end
 
 RockSmashMovement: @ 81B0F3C
-	step_5a
-	step_end
+	rock_smash_break
+	end_movement
 
 CannotUseRockSmash: @ 81B0F3E
 	msgbox CannotUseRockSmashText, 3
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s
index 37d7585b2..1d29998ef 100644
--- a/data/debug_mystery_event_scripts.s
+++ b/data/debug_mystery_event_scripts.s
@@ -3,7 +3,7 @@
 #include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/opponents.h"
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 8a3672d7e..68e287939 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3,7 +3,7 @@
 #include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/opponents.h"
@@ -1038,8 +1038,8 @@ EventScript_19F8E5:
 	return
 
 Movement_19F8F0::
-	step_59
-	step_end
+	reveal_trainer
+	end_movement
 
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
@@ -1483,9 +1483,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
-	step_4f
-	step_12
-	step_end
+	nurse_joy_bow
+	delay_4
+	end_movement
 
 Std_ObtainItem: @ 819FDF7
 	giveitem VAR_SPECIAL_0, VAR_SPECIAL_1
@@ -1839,11 +1839,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
 	end
 
 RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1857,11 +1857,11 @@ Route119_EventScript_1A0172:: @ 81A0172
 	end
 
 LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
 LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1888,30 +1888,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE
 	.else
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE
 	.endif
 	return
 
 CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2
 	.else
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2
 	.endif
 	return
 
@@ -2228,14 +2228,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
 	return
 
 SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
-	slow_step_right
-	slow_step_right
-	slow_step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_slow_right
+	walk_slow_right
+	walk_slow_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
@@ -2270,8 +2270,8 @@ EventScript_1A0457: @ unreferenced?
 	return
 
 Movement_1A047A:
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
@@ -2496,28 +2496,28 @@ Route119_EventScript_1A065E:: @ 81A065E
 FortreeCity_Movement_1A0662:: @ 81A0662
 Route119_Movement_1A0662:: @ 81A0662
 Route120_Movement_1A0662:: @ 81A0662
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
-	step_end
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678
 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
@@ -2615,8 +2615,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
-	step_57
-	step_end
+	emote_question_mark
+	end_movement
 
 AquaHideout_B2F_Movement_1A0833:: @ 81A0833
 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833
@@ -2645,8 +2645,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833
 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833
 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833
 SootopolisCity_Movement_1A0833:: @ 81A0833
-	step_56
-	step_end
+	emote_exclamation_mark
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835
 LavaridgeTown_Movement_1A0835:: @ 81A0835
@@ -2672,10 +2672,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835
 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835
 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835
 SootopolisCity_Movement_1A0835:: @ 81A0835
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 AquaHideout_B2F_Movement_1A0839:: @ 81A0839
 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839
@@ -2707,12 +2707,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839
 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839
 SlateportCity_Movement_1A0839:: @ 81A0839
 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839
-	step_3e
-	step_end
+	face_player
+	end_movement
 
 @ 81A083B
-	step_3f
-	step_end
+	face_away_player
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D
 LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D
@@ -2743,8 +2743,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D
 SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D
 SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D
 VerdanturfTown_Movement_1A083D:: @ 81A083D
-	step_4e
-	step_end
+	face_original_direction
+	end_movement
 
 Movement_1A083F:: @ 81A083F
 DewfordTown_Hall_Movement_1A083F:: @ 81A083F
@@ -2777,8 +2777,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F
 SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F
 SootopolisCity_Movement_1A083F:: @ 81A083F
 VictoryRoad_1F_Movement_1A083F:: @ 81A083F
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 AquaHideout_B2F_Movement_1A0841:: @ 81A0841
 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841
@@ -2808,8 +2808,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841
 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841
 SlateportCity_Movement_1A0841:: @ 81A0841
 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841
-	step_26
-	step_end
+	walk_in_place_fastest_up
+	end_movement
 
 AquaHideout_B2F_Movement_1A0843:: @ 81A0843
 DewfordTown_Hall_Movement_1A0843:: @ 81A0843
@@ -2840,8 +2840,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843
 SootopolisCity_Movement_1A0843:: @ 81A0843
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 BattleTower_Outside_Movement_1A0845:: @ 81A0845
 DewfordTown_Hall_Movement_1A0845:: @ 81A0845
@@ -2872,38 +2872,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845
 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845
 SootopolisCity_Movement_1A0845:: @ 81A0845
 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 @ 81A0858
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 PictureBookShelfScript:: @ 81A085B
 	msgbox PictureBookShelfText, 3
@@ -3740,9 +3740,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	end
 
 SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 gUnknown_081A2E14:: @ 81A2E14
 	lockall
@@ -4875,8 +4875,8 @@ gUnknown_081C6BDE:: @ 81C6BDE
 	end
 
 GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
-	step_54
-	step_end
+	set_invisible
+	end_movement
 
 @ 81C6BF9
 	msgbox Text_1C6C2B, 2
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 45f8ce648..20d3770f9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -6,7 +6,7 @@
 
 	.align 2
 gFieldEffectScriptPointers:: @ 81D9B34
-	.4byte gFieldEffectScript_ExclamationMarkIcon1
+	.4byte gFieldEffectScript_ExclamationMarkIcon
 	.4byte gFieldEffectScript_UseCutOnGrass
 	.4byte gFieldEffectScript_UseCutOnTree
 	.4byte gFieldEffectScript_Shadow
@@ -39,7 +39,7 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_NPCFlyOut
 	.4byte gFieldEffectScript_UseFly
 	.4byte gFieldEffectScript_FlyIn
-	.4byte gFieldEffectScript_ExclamationMarkIcon2
+	.4byte gFieldEffectScript_QuestionMarkIcon
 	.4byte gFieldEffectScript_FeetInFlowingWater
 	.4byte gFieldEffectScript_BikeTireTracks
 	.4byte gFieldEffectScript_SandDisguise
@@ -71,8 +71,8 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_HallOfFameRecord
 	.4byte gFieldEffectScript_UseTeleport
 
-gFieldEffectScript_ExclamationMarkIcon1: @ 81D9C34
-	callnative FldEff_ExclamationMarkIcon1
+gFieldEffectScript_ExclamationMarkIcon: @ 81D9C34
+	callnative FldEff_ExclamationMarkIcon
 	end
 
 gFieldEffectScript_UseCutOnGrass: @ 81D9C3A
@@ -204,8 +204,8 @@ gFieldEffectScript_FlyIn: @ 81D9D3D
 	callnative FldEff_FlyIn
 	end
 
-gFieldEffectScript_ExclamationMarkIcon2: @ 81D9D43
-	callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon: @ 81D9D43
+	callnative FldEff_QuestionMarkIcon
 	end
 
 gFieldEffectScript_FeetInFlowingWater: @ 81D9D49
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index 5ce6c7fb9..5b474fdcf 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21
 	end
 
 TreeCutMovement: @ 81B0E30
-	step_5b
-	step_end
+	cut_tree
+	end_movement
 
 CannotUseCut: @ 81B0E32
 	msgbox CannotUseCutText, 3
@@ -100,8 +100,8 @@ DoRockSmashMovement_Done: @ 81B0F3A
 	end
 
 RockSmashMovement: @ 81B0F3C
-	step_5a
-	step_end
+	rock_smash_break
+	end_movement
 
 CannotUseRockSmash: @ 81B0F3E
 	msgbox CannotUseRockSmashText, 3
diff --git a/data/map_events.s b/data/map_events.s
index 1531ec30e..02050c401 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,6 +1,6 @@
 #include "constants/flags.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/secret_bases.h"
 #include "constants/vars.h"
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
index 72740dc29..d05af94d1 100644
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc
@@ -1,10 +1,10 @@
-AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0
+AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0
 
 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C
 	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
 	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
 
 AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C
-	map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc
index 661fbdb09..afc77d077 100644
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/events/AbandonedShip_Corridors_1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_1F_MapObjects:: @ 838E120
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 17, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0
+AbandonedShip_Corridors_1F_EventObjects:: @ 838E120
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0
 
 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150
 	warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
@@ -17,4 +17,4 @@ AbandonedShip_Corridors_1F_MapWarps:: @ 838E150
 	warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F
 
 AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0
-	map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc
index d889f1ade..3f2276194 100644
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238
-	object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 2, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0
+AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238
+	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0
 
 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268
 	warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
@@ -16,4 +16,4 @@ AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8
 	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3
 
 AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4
-	map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
+	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
index 998e4eeac..92138ba30 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
@@ -1,8 +1,8 @@
-AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0
+AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0
 
 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0
 	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
@@ -28,4 +28,4 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8
 	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
 
 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660
-	map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
+	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
index 22739c99f..373ffc99e 100644
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ b/data/maps/events/AbandonedShip_Room_B1F.inc
@@ -1,9 +1,9 @@
-AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0
+AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0
 
 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4
 	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 	warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4
-	map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
index d68dd776d..82ce974f1 100644
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc
@@ -1,7 +1,7 @@
-AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0
+AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0
 
 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430
 	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
@@ -9,4 +9,4 @@ AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430
 	warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F
 
 AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448
-	map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
index 8f21e82c4..a138dd35a 100644
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0
+AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0
 
 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354
 	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
@@ -9,4 +9,4 @@ AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354
 	warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374
-	map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
index 8eaae1853..072752022 100644
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0
+AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0
 
 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4
 	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
@@ -11,4 +11,4 @@ AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4
 	warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
 
 AbandonedShip_Rooms_1F_MapEvents:: @ 838E224
-	map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
index cb9ce260f..bab5f6593 100644
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc
@@ -1,6 +1,6 @@
-AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0
+AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0
 
 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8
 	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
@@ -8,4 +8,4 @@ AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8
 	warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F
 
 AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310
-	map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
+	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
index 0aa15569e..13b96c0ee 100644
--- a/data/maps/events/AncientTomb.inc
+++ b/data/maps/events/AncientTomb.inc
@@ -1,5 +1,5 @@
-AncientTomb_MapObjects:: @ 838E6DC
-	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0
+AncientTomb_EventObjects:: @ 838E6DC
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0
 
 AncientTomb_MapWarps:: @ 838E6F4
 	warp_def 8, 29, 3, 0, MAP_ROUTE120
@@ -12,4 +12,4 @@ AncientTomb_MapBGEvents:: @ 838E70C
 	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042
 
 AncientTomb_MapEvents:: @ 838E730
-	map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
+	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
index 551585bb6..16107f111 100644
--- a/data/maps/events/AquaHideout_1F.inc
+++ b/data/maps/events/AquaHideout_1F.inc
@@ -1,7 +1,7 @@
-AquaHideout_1F_MapObjects:: @ 838CD0C
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+AquaHideout_1F_EventObjects:: @ 838CD0C
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
 
 AquaHideout_1F_MapWarps:: @ 838CD54
 	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
@@ -9,4 +9,4 @@ AquaHideout_1F_MapWarps:: @ 838CD54
 	warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F
 
 AquaHideout_1F_MapEvents:: @ 838CD6C
-	map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
+	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
index c902b1765..c016b9f57 100644
--- a/data/maps/events/AquaHideout_B1F.inc
+++ b/data/maps/events/AquaHideout_B1F.inc
@@ -1,12 +1,12 @@
-AquaHideout_B1F_MapObjects:: @ 838CD80
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
+AquaHideout_B1F_EventObjects:: @ 838CD80
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 AquaHideout_B1F_MapWarps:: @ 838CE40
 	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
@@ -36,4 +36,4 @@ AquaHideout_B1F_MapWarps:: @ 838CE40
 	warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F
 
 AquaHideout_B1F_MapEvents:: @ 838CF08
-	map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
+	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
index e3dade2d0..f27039029 100644
--- a/data/maps/events/AquaHideout_B2F.inc
+++ b/data/maps/events/AquaHideout_B2F.inc
@@ -1,9 +1,9 @@
-AquaHideout_B2F_MapObjects:: @ 838CF1C
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+AquaHideout_B2F_EventObjects:: @ 838CF1C
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
 
 AquaHideout_B2F_MapWarps:: @ 838CF94
 	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
@@ -22,4 +22,4 @@ AquaHideout_B2F_MapCoordEvents:: @ 838CFE4
 	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD
 
 AquaHideout_B2F_MapEvents:: @ 838D004
-	map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
+	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc
index 02884109f..c872a3fd7 100644
--- a/data/maps/events/BattleTower_BattleRoom.inc
+++ b/data/maps/events/BattleTower_BattleRoom.inc
@@ -1,10 +1,10 @@
-BattleTower_BattleRoom_MapObjects:: @ 8391DAC
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleTower_BattleRoom_EventObjects:: @ 8391DAC
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleTower_BattleRoom_MapWarps:: @ 8391DDC
 	warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
 	warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
 
 BattleTower_BattleRoom_MapEvents:: @ 8391DEC
-	map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0
+	map_events BattleTower_BattleRoom_EventObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/events/BattleTower_Corridor.inc
index 33b5a779c..cc9b7d4a6 100644
--- a/data/maps/events/BattleTower_Corridor.inc
+++ b/data/maps/events/BattleTower_Corridor.inc
@@ -1,5 +1,5 @@
-BattleTower_Corridor_MapObjects:: @ 8391D80
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 9, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleTower_Corridor_EventObjects:: @ 8391D80
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleTower_Corridor_MapEvents:: @ 8391D98
-	map_events BattleTower_Corridor_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/events/BattleTower_Elevator.inc
index 7594028b6..de38d5102 100644
--- a/data/maps/events/BattleTower_Elevator.inc
+++ b/data/maps/events/BattleTower_Elevator.inc
@@ -1,5 +1,5 @@
-BattleTower_Elevator_MapObjects:: @ 8391D54
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+BattleTower_Elevator_EventObjects:: @ 8391D54
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 BattleTower_Elevator_MapEvents:: @ 8391D6C
-	map_events BattleTower_Elevator_MapObjects, 0x0, 0x0, 0x0
+	map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc
index a4abdac87..d6e18e78e 100644
--- a/data/maps/events/BattleTower_Lobby.inc
+++ b/data/maps/events/BattleTower_Lobby.inc
@@ -1,10 +1,10 @@
-BattleTower_Lobby_MapObjects:: @ 8391C8C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0
+BattleTower_Lobby_EventObjects:: @ 8391C8C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0
 
 BattleTower_Lobby_MapWarps:: @ 8391D1C
 	warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
@@ -15,4 +15,4 @@ BattleTower_Lobby_MapBGEvents:: @ 8391D34
 	bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727
 
 BattleTower_Lobby_MapEvents:: @ 8391D40
-	map_events BattleTower_Lobby_MapObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents
+	map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents
diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc
index 902a779f1..9a68375c3 100644
--- a/data/maps/events/BattleTower_Outside.inc
+++ b/data/maps/events/BattleTower_Outside.inc
@@ -1,9 +1,9 @@
-BattleTower_Outside_MapObjects:: @ 8391BEC
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 18, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160263, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 11, 0, 14, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_16026C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160275, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SS_TIDAL, 0, 19, 0, 26, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0
+BattleTower_Outside_EventObjects:: @ 8391BEC
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160263, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 0, 14, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_16026C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160275, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 0, 26, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0
 
 BattleTower_Outside_MapWarps:: @ 8391C64
 	warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY
@@ -12,4 +12,4 @@ BattleTower_Outside_MapBGEvents:: @ 8391C6C
 	bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A
 
 BattleTower_Outside_MapEvents:: @ 8391C78
-	map_events BattleTower_Outside_MapObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents
+	map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents
diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc
index 6f9544aa2..81fae0378 100644
--- a/data/maps/events/CaveOfOrigin_B3F.inc
+++ b/data/maps/events/CaveOfOrigin_B3F.inc
@@ -1,5 +1,5 @@
-CaveOfOrigin_B3F_MapObjects:: @ 838D814
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0
+CaveOfOrigin_B3F_EventObjects:: @ 838D814
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0
 
 CaveOfOrigin_B3F_MapWarps:: @ 838D82C
 	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F
@@ -11,4 +11,4 @@ CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C
 	coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB
 
 CaveOfOrigin_B3F_MapEvents:: @ 838D86C
-	map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0
+	map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0
diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc
index ad2217b46..6993230c9 100644
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ b/data/maps/events/CaveOfOrigin_B4F.inc
@@ -1,5 +1,5 @@
-CaveOfOrigin_B4F_MapObjects:: @ 838D880
-	object_event 1, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0
+CaveOfOrigin_B4F_EventObjects:: @ 838D880
+	object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0
 
 CaveOfOrigin_B4F_MapWarps:: @ 838D898
 	warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F
@@ -10,4 +10,4 @@ CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0
 	coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
 
 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0
-	map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0
+	map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
index ada0e0be5..bb2423b61 100644
--- a/data/maps/events/DesertRuins.inc
+++ b/data/maps/events/DesertRuins.inc
@@ -1,5 +1,5 @@
-DesertRuins_MapObjects:: @ 838BEBC
-	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0
+DesertRuins_EventObjects:: @ 838BEBC
+	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0
 
 DesertRuins_MapWarps:: @ 838BED4
 	warp_def 8, 29, 3, 1, MAP_ROUTE111
@@ -12,4 +12,4 @@ DesertRuins_MapBGEvents:: @ 838BEEC
 	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77
 
 DesertRuins_MapEvents:: @ 838BF10
-	map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
+	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
index 8ca6fa7a1..352092f19 100644
--- a/data/maps/events/DewfordTown.inc
+++ b/data/maps/events/DewfordTown.inc
@@ -1,9 +1,9 @@
-DewfordTown_MapObjects:: @ 8380B88
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0
+DewfordTown_EventObjects:: @ 8380B88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0
 
 DewfordTown_MapWarps:: @ 8380C00
 	warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL
@@ -20,4 +20,4 @@ DewfordTown_MapBGEvents:: @ 8380C28
 	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD
 
 DewfordTown_MapEvents:: @ 8380C64
-	map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
+	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc
index 10a5f8499..9ddf697c2 100644
--- a/data/maps/events/DewfordTown_Gym.inc
+++ b/data/maps/events/DewfordTown_Gym.inc
@@ -1,9 +1,9 @@
-DewfordTown_Gym_MapObjects:: @ 8385FBC
-	object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 17, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531D9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 1, 0, 10, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531FB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 24, 0, 3, 7, 0, 0, 1, 0, 2, 0, DewfordTown_Gym_EventScript_15321D, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0
+DewfordTown_Gym_EventObjects:: @ 8385FBC
+	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 0, 17, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531D9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 0, 10, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531FB, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 0, 24, 0, 3, 7, 0, 0, 1, 0, 2, 0, DewfordTown_Gym_EventScript_15321D, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0
 
 DewfordTown_Gym_MapWarps:: @ 8386034
 	warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN
@@ -16,4 +16,4 @@ DewfordTown_Gym_MapBGEvents:: @ 8386044
 	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E
 
 DewfordTown_Gym_MapEvents:: @ 8386074
-	map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
+	map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
index 56f7feb18..2944726a9 100644
--- a/data/maps/events/DewfordTown_Hall.inc
+++ b/data/maps/events/DewfordTown_Hall.inc
@@ -1,13 +1,13 @@
-DewfordTown_Hall_MapObjects:: @ 8386088
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 4, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 1, 0, 5, 0, 0, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0
+DewfordTown_Hall_EventObjects:: @ 8386088
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 0, 5, 0, 0, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0
 
 DewfordTown_Hall_MapWarps:: @ 8386160
 	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
@@ -18,4 +18,4 @@ DewfordTown_Hall_MapBGEvents:: @ 8386170
 	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363
 
 DewfordTown_Hall_MapEvents:: @ 8386188
-	map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
+	map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc
index daedf3d19..8d2c57b1b 100644
--- a/data/maps/events/DewfordTown_House1.inc
+++ b/data/maps/events/DewfordTown_House1.inc
@@ -1,11 +1,11 @@
-DewfordTown_House1_MapObjects:: @ 8385E58
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0
+DewfordTown_House1_EventObjects:: @ 8385E58
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0
 
 DewfordTown_House1_MapWarps:: @ 8385EA0
 	warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN
 	warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN
 
 DewfordTown_House1_MapEvents:: @ 8385EB0
-	map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
+	map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc
index 0553bc23a..35c5ca369 100644
--- a/data/maps/events/DewfordTown_House2.inc
+++ b/data/maps/events/DewfordTown_House2.inc
@@ -1,10 +1,10 @@
-DewfordTown_House2_MapObjects:: @ 838619C
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0
+DewfordTown_House2_EventObjects:: @ 838619C
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0
 
 DewfordTown_House2_MapWarps:: @ 83861CC
 	warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN
 	warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN
 
 DewfordTown_House2_MapEvents:: @ 83861DC
-	map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
+	map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
index b1a13dd8a..e6e3a095d 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0
+DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0
 
 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C
 	warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN
@@ -9,4 +9,4 @@ DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C
 	warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F
 
 DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24
-	map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
index 00e066e2f..b4dba9e8b 100644
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0
+DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0
 
 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80
 	warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8
-	map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
index 2be82cbb4..a6783e800 100644
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
@@ -1,11 +1,11 @@
-EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0
-	object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0
+EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0
 
 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C
 	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4
 	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
 
 EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C
-	map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc
index e7ac276aa..989c9e562 100644
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc
@@ -1,9 +1,9 @@
-EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8
-	object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0
+EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8
+	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0
 
 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310
 	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3
 	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4
 
 EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320
-	map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
index f6c6ce97e..8095e957e 100644
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
@@ -1,9 +1,9 @@
-EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC
-	object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0
+EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC
+	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0
 
 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4
 	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2
 	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3
 
 EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4
-	map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc
index 9290c4530..a1e6532ff 100644
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/events/EverGrandeCity_HallOfFame.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_HallOfFame_MapObjects:: @ 838B528
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+EverGrandeCity_HallOfFame_EventObjects:: @ 838B528
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540
 	warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
 
 EverGrandeCity_HallOfFame_MapEvents:: @ 838B548
-	map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
index a2de097b8..2957be55c 100644
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
@@ -1,9 +1,9 @@
-EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280
-	object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0
+EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280
+	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0
 
 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298
 	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1
 	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2
 
 EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8
-	map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
index f0709710d..514c809ca 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0
+EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0
 
 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4
 	warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
@@ -9,4 +9,4 @@ EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4
 	warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F
 
 EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC
-	map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
index e7502055a..1f53d8a95 100644
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0
+EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0
 
 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618
 	warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640
-	map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc
index 77247e665..d45503bde 100644
--- a/data/maps/events/EverGrandeCity_PokemonLeague.inc
+++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc
@@ -1,8 +1,8 @@
-EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
+EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
 
 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4
 	warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
@@ -11,4 +11,4 @@ EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4
 	warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5
 
 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514
-	map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_PokemonLeague_EventObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc
index c2a7ce10d..edd9b2194 100644
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc
@@ -1,9 +1,9 @@
-EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244
-	object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0
+EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244
+	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0
 
 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C
 	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5
 	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1
 
 EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C
-	map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
+	map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
index 025843194..b268b663c 100644
--- a/data/maps/events/FallarborTown.inc
+++ b/data/maps/events/FallarborTown.inc
@@ -1,8 +1,8 @@
-FallarborTown_MapObjects:: @ 8380E04
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0
+FallarborTown_EventObjects:: @ 8380E04
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0
 
 FallarborTown_MapWarps:: @ 8380E64
 	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
@@ -22,4 +22,4 @@ FallarborTown_MapBGEvents:: @ 8380E8C
 	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C
 
 FallarborTown_MapEvents:: @ 8380EEC
-	map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc
index 30b602e60..2b0bd883f 100644
--- a/data/maps/events/FallarborTown_ContestHall.inc
+++ b/data/maps/events/FallarborTown_ContestHall.inc
@@ -1,7 +1,7 @@
-FallarborTown_ContestHall_MapObjects:: @ 83867DC
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 19, 0, 8, 0, 0, 2, 34, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 7, 0, 0, 2, 50, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0
+FallarborTown_ContestHall_EventObjects:: @ 83867DC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 0, 8, 0, 0, 2, 34, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 0, 7, 0, 0, 2, 50, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0
 
 FallarborTown_ContestHall_MapWarps:: @ 8386824
 	warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
@@ -12,4 +12,4 @@ FallarborTown_ContestHall_MapBGEvents:: @ 8386834
 	bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA
 
 FallarborTown_ContestHall_MapEvents:: @ 838684C
-	map_events FallarborTown_ContestHall_MapObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents
+	map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents
diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc
index 811461c02..4827e1ac1 100644
--- a/data/maps/events/FallarborTown_ContestLobby.inc
+++ b/data/maps/events/FallarborTown_ContestLobby.inc
@@ -1,10 +1,10 @@
-FallarborTown_ContestLobby_MapObjects:: @ 83866F0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0
-	object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0
+FallarborTown_ContestLobby_EventObjects:: @ 83866F0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0
 
 FallarborTown_ContestLobby_MapWarps:: @ 8386780
 	warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN
@@ -18,4 +18,4 @@ FallarborTown_ContestLobby_MapBGEvents:: @ 8386798
 	bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2
 
 FallarborTown_ContestLobby_MapEvents:: @ 83867C8
-	map_events FallarborTown_ContestLobby_MapObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents
+	map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
index e3104fb1d..5687810c3 100644
--- a/data/maps/events/FallarborTown_House1.inc
+++ b/data/maps/events/FallarborTown_House1.inc
@@ -1,10 +1,10 @@
-FallarborTown_House1_MapObjects:: @ 8386970
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0
+FallarborTown_House1_EventObjects:: @ 8386970
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0
 
 FallarborTown_House1_MapWarps:: @ 83869A0
 	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
 	warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN
 
 FallarborTown_House1_MapEvents:: @ 83869B0
-	map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
+	map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc
index e24fef7a9..79d198e63 100644
--- a/data/maps/events/FallarborTown_House2.inc
+++ b/data/maps/events/FallarborTown_House2.inc
@@ -1,9 +1,9 @@
-FallarborTown_House2_MapObjects:: @ 83869C4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0
+FallarborTown_House2_EventObjects:: @ 83869C4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0
 
 FallarborTown_House2_MapWarps:: @ 83869DC
 	warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN
 	warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN
 
 FallarborTown_House2_MapEvents:: @ 83869EC
-	map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
+	map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc
index c343e017e..157af947c 100644
--- a/data/maps/events/FallarborTown_Mart.inc
+++ b/data/maps/events/FallarborTown_Mart.inc
@@ -1,12 +1,12 @@
-FallarborTown_Mart_MapObjects:: @ 838666C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_15399C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0
+FallarborTown_Mart_EventObjects:: @ 838666C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_15399C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0
 
 FallarborTown_Mart_MapWarps:: @ 83866CC
 	warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN
 	warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN
 
 FallarborTown_Mart_MapEvents:: @ 83866DC
-	map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
+	map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
index ff2278e29..ce7b4e721 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0
+FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0
 
 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
 	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
@@ -10,4 +10,4 @@ FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
 	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
 
 FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8
-	map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
index 1ae7bba2a..7fffd6150 100644
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0
+FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0
 
 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934
 	warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C
-	map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
index 575f92bd5..11e3bd004 100644
--- a/data/maps/events/FieryPath.inc
+++ b/data/maps/events/FieryPath.inc
@@ -1,16 +1,16 @@
-FieryPath_MapObjects:: @ 838C718
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0
+FieryPath_EventObjects:: @ 838C718
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0
 
 FieryPath_MapWarps:: @ 838C7D8
 	warp_def 26, 36, 3, 4, MAP_ROUTE112
 	warp_def 26, 4, 3, 5, MAP_ROUTE112
 
 FieryPath_MapEvents:: @ 838C7E8
-	map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
index 4c80997f9..964edc288 100644
--- a/data/maps/events/FortreeCity.inc
+++ b/data/maps/events/FortreeCity.inc
@@ -1,11 +1,11 @@
-FortreeCity_MapObjects:: @ 8380020
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 31, 0, 3, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 32, 0, 16, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C97D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 32, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C95E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0
+FortreeCity_EventObjects:: @ 8380020
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 0, 3, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 0, 16, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C97D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C95E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0
 
 FortreeCity_MapWarps:: @ 83800C8
 	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
@@ -27,4 +27,4 @@ FortreeCity_MapBGEvents:: @ 8380110
 	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1
 
 FortreeCity_MapEvents:: @ 8380158
-	map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
+	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc
index 930a73b55..547a1669f 100644
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ b/data/maps/events/FortreeCity_DecorationShop.inc
@@ -1,12 +1,12 @@
-FortreeCity_DecorationShop_MapObjects:: @ 83893E0
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0
+FortreeCity_DecorationShop_EventObjects:: @ 83893E0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0
 
 FortreeCity_DecorationShop_MapWarps:: @ 8389440
 	warp_def 3, 5, 0, 8, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 8, MAP_FORTREE_CITY
 
 FortreeCity_DecorationShop_MapEvents:: @ 8389450
-	map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
+	map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc
index 523dd3fdc..170c8d941 100644
--- a/data/maps/events/FortreeCity_Gym.inc
+++ b/data/maps/events/FortreeCity_Gym.inc
@@ -1,10 +1,10 @@
-FortreeCity_Gym_MapObjects:: @ 8389018
-	object_event 1, MAP_OBJ_GFX_WINONA, 0, 4, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 22, 0, 3, 7, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F62, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 9, 0, 9, 0, 3, 8, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F90, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 18, 0, 19, 0, 3, 9, 0, 0, 1, 0, 4, 0, FortreeCity_Gym_EventScript_157FA7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 18, 0, 1, 0, 3, 8, 0, 0, 1, 0, 1, 0, FortreeCity_Gym_EventScript_157F79, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0
+FortreeCity_Gym_EventObjects:: @ 8389018
+	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 0, 22, 0, 3, 7, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F62, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 0, 9, 0, 3, 8, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F90, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 0, 19, 0, 3, 9, 0, 0, 1, 0, 4, 0, FortreeCity_Gym_EventScript_157FA7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 0, 1, 0, 3, 8, 0, 0, 1, 0, 1, 0, FortreeCity_Gym_EventScript_157F79, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0
 
 FortreeCity_Gym_MapWarps:: @ 83890A8
 	warp_def 2, 24, 0, 2, MAP_FORTREE_CITY
@@ -15,4 +15,4 @@ FortreeCity_Gym_MapBGEvents:: @ 83890B8
 	bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED
 
 FortreeCity_Gym_MapEvents:: @ 83890D0
-	map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
+	map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc
index 23cd52fdc..8f25008eb 100644
--- a/data/maps/events/FortreeCity_House1.inc
+++ b/data/maps/events/FortreeCity_House1.inc
@@ -1,11 +1,11 @@
-FortreeCity_House1_MapObjects:: @ 8388FAC
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 2, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0
+FortreeCity_House1_EventObjects:: @ 8388FAC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0
 
 FortreeCity_House1_MapWarps:: @ 8388FF4
 	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 1, MAP_FORTREE_CITY
 
 FortreeCity_House1_MapEvents:: @ 8389004
-	map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc
index 1c7246100..8ec2431cc 100644
--- a/data/maps/events/FortreeCity_House2.inc
+++ b/data/maps/events/FortreeCity_House2.inc
@@ -1,9 +1,9 @@
-FortreeCity_House2_MapObjects:: @ 8389278
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0
+FortreeCity_House2_EventObjects:: @ 8389278
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0
 
 FortreeCity_House2_MapWarps:: @ 8389290
 	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 4, MAP_FORTREE_CITY
 
 FortreeCity_House2_MapEvents:: @ 83892A0
-	map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc
index 359953246..18d0e8d8f 100644
--- a/data/maps/events/FortreeCity_House3.inc
+++ b/data/maps/events/FortreeCity_House3.inc
@@ -1,10 +1,10 @@
-FortreeCity_House3_MapObjects:: @ 83892B4
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0
+FortreeCity_House3_EventObjects:: @ 83892B4
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0
 
 FortreeCity_House3_MapWarps:: @ 83892E4
 	warp_def 3, 5, 0, 5, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 5, MAP_FORTREE_CITY
 
 FortreeCity_House3_MapEvents:: @ 83892F4
-	map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
index 0a5f81b6c..0b2f3aa38 100644
--- a/data/maps/events/FortreeCity_House4.inc
+++ b/data/maps/events/FortreeCity_House4.inc
@@ -1,11 +1,11 @@
-FortreeCity_House4_MapObjects:: @ 8389308
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0
+FortreeCity_House4_EventObjects:: @ 8389308
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0
 
 FortreeCity_House4_MapWarps:: @ 8389350
 	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 6, MAP_FORTREE_CITY
 
 FortreeCity_House4_MapEvents:: @ 8389360
-	map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc
index 94ff0ebb1..e28864204 100644
--- a/data/maps/events/FortreeCity_House5.inc
+++ b/data/maps/events/FortreeCity_House5.inc
@@ -1,11 +1,11 @@
-FortreeCity_House5_MapObjects:: @ 8389374
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 0, 3, 20, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0
+FortreeCity_House5_EventObjects:: @ 8389374
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 0, 3, 20, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0
 
 FortreeCity_House5_MapWarps:: @ 83893BC
 	warp_def 3, 5, 0, 7, MAP_FORTREE_CITY
 	warp_def 4, 5, 0, 7, MAP_FORTREE_CITY
 
 FortreeCity_House5_MapEvents:: @ 83893CC
-	map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
+	map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc
index 2353c3c1f..19377fe45 100644
--- a/data/maps/events/FortreeCity_Mart.inc
+++ b/data/maps/events/FortreeCity_Mart.inc
@@ -1,12 +1,12 @@
-FortreeCity_Mart_MapObjects:: @ 83891F4
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 8, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0
+FortreeCity_Mart_EventObjects:: @ 83891F4
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0
 
 FortreeCity_Mart_MapWarps:: @ 8389254
 	warp_def 3, 7, 0, 3, MAP_FORTREE_CITY
 	warp_def 4, 7, 0, 3, MAP_FORTREE_CITY
 
 FortreeCity_Mart_MapEvents:: @ 8389264
-	map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
+	map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
index bc06da7ca..55fc4523b 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0
+FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0
 
 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144
 	warp_def 7, 8, 3, 0, MAP_FORTREE_CITY
@@ -10,4 +10,4 @@ FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144
 	warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F
 
 FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C
-	map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
index f16c59cce..05e2f1ef8 100644
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0
+FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0
 
 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8
 	warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0
-	map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
index ade38322f..1854847ae 100644
--- a/data/maps/events/GraniteCave_1F.inc
+++ b/data/maps/events/GraniteCave_1F.inc
@@ -1,6 +1,6 @@
-GraniteCave_1F_MapObjects:: @ 838BF24
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0
+GraniteCave_1F_EventObjects:: @ 838BF24
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0
 
 GraniteCave_1F_MapWarps:: @ 838BF54
 	warp_def 37, 12, 3, 0, MAP_ROUTE106
@@ -9,4 +9,4 @@ GraniteCave_1F_MapWarps:: @ 838BF54
 	warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM
 
 GraniteCave_1F_MapEvents:: @ 838BF74
-	map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
+	map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
index e50fd09af..2d7ba4a8b 100644
--- a/data/maps/events/GraniteCave_B1F.inc
+++ b/data/maps/events/GraniteCave_B1F.inc
@@ -1,5 +1,5 @@
-GraniteCave_B1F_MapObjects:: @ 838BF88
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0
+GraniteCave_B1F_EventObjects:: @ 838BF88
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0
 
 GraniteCave_B1F_MapWarps:: @ 838BFA0
 	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
@@ -11,4 +11,4 @@ GraniteCave_B1F_MapWarps:: @ 838BFA0
 	warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F
 
 GraniteCave_B1F_MapEvents:: @ 838BFD8
-	map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
+	map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
index e251b3bef..4c7e4b253 100644
--- a/data/maps/events/GraniteCave_B2F.inc
+++ b/data/maps/events/GraniteCave_B2F.inc
@@ -1,13 +1,13 @@
-GraniteCave_B2F_MapObjects:: @ 838BFEC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0
+GraniteCave_B2F_EventObjects:: @ 838BFEC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0
 
 GraniteCave_B2F_MapWarps:: @ 838C0C4
 	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
@@ -21,4 +21,4 @@ GraniteCave_B2F_MapBGEvents:: @ 838C0EC
 	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31
 
 GraniteCave_B2F_MapEvents:: @ 838C104
-	map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
+	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
index efab4fa71..1c8131424 100644
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ b/data/maps/events/GraniteCave_StevensRoom.inc
@@ -1,8 +1,8 @@
-GraniteCave_StevensRoom_MapObjects:: @ 838C118
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0
+GraniteCave_StevensRoom_EventObjects:: @ 838C118
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0
 
 GraniteCave_StevensRoom_MapWarps:: @ 838C130
 	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
 
 GraniteCave_StevensRoom_MapEvents:: @ 838C138
-	map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
+	map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
index d89f267e3..866bcf082 100644
--- a/data/maps/events/InsideOfTruck.inc
+++ b/data/maps/events/InsideOfTruck.inc
@@ -1,7 +1,7 @@
-InsideOfTruck_MapObjects:: @ 8391618
-	object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
+InsideOfTruck_EventObjects:: @ 8391618
+	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
 
 InsideOfTruck_MapWarps:: @ 8391660
 	warp_def 4, 1, 0, 127, MAP_NONE
@@ -21,4 +21,4 @@ InsideOfTruck_MapBGEvents:: @ 83916A8
 	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
 
 InsideOfTruck_MapEvents:: @ 83916E4
-	map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
+	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
index 94fbce914..b19b0aae4 100644
--- a/data/maps/events/IslandCave.inc
+++ b/data/maps/events/IslandCave.inc
@@ -1,5 +1,5 @@
-IslandCave_MapObjects:: @ 838E674
-	object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0
+IslandCave_EventObjects:: @ 838E674
+	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0
 
 IslandCave_MapWarps:: @ 838E68C
 	warp_def 8, 29, 3, 0, MAP_ROUTE105
@@ -12,4 +12,4 @@ IslandCave_MapBGEvents:: @ 838E6A4
 	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C
 
 IslandCave_MapEvents:: @ 838E6C8
-	map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
+	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
index e1103c816..9f5841ed9 100644
--- a/data/maps/events/JaggedPass.inc
+++ b/data/maps/events/JaggedPass.inc
@@ -1,8 +1,8 @@
-JaggedPass_MapObjects:: @ 838C61C
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0
+JaggedPass_EventObjects:: @ 838C61C
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0
 
 JaggedPass_MapWarps:: @ 838C67C
 	warp_def 14, 40, 3, 2, MAP_ROUTE112
@@ -22,4 +22,4 @@ JaggedPass_MapBGEvents:: @ 838C6EC
 	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C
 
 JaggedPass_MapEvents:: @ 838C704
-	map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
+	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
index 27acd168f..d4cdc03fc 100644
--- a/data/maps/events/LavaridgeTown.inc
+++ b/data/maps/events/LavaridgeTown.inc
@@ -1,13 +1,13 @@
-LavaridgeTown_MapObjects:: @ 8380C78
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0
+LavaridgeTown_EventObjects:: @ 8380C78
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0
 
 LavaridgeTown_MapWarps:: @ 8380D50
 	warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP
@@ -31,4 +31,4 @@ LavaridgeTown_MapBGEvents:: @ 8380D90
 	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0
 
 LavaridgeTown_MapEvents:: @ 8380DF0
-	map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
+	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc
index 0df412932..ad1e462f9 100644
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/events/LavaridgeTown_Gym_1F.inc
@@ -1,11 +1,11 @@
-LavaridgeTown_Gym_1F_MapObjects:: @ 838625C
-	object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 19, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537CB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 17, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_15383E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 4, 0, 12, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537ED, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153823, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 6, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0
+LavaridgeTown_Gym_1F_EventObjects:: @ 838625C
+	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 0, 19, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537CB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 17, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_15383E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 0, 12, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537ED, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153823, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0
 
 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304
 	warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN
@@ -36,4 +36,4 @@ LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4
 	bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888
 
 LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC
-	map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
+	map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc
index 8223a30c3..b80743404 100644
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ b/data/maps/events/LavaridgeTown_HerbShop.inc
@@ -1,11 +1,11 @@
-LavaridgeTown_HerbShop_MapObjects:: @ 83861F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 7, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0
+LavaridgeTown_HerbShop_EventObjects:: @ 83861F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0
 
 LavaridgeTown_HerbShop_MapWarps:: @ 8386238
 	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN
 
 LavaridgeTown_HerbShop_MapEvents:: @ 8386248
-	map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc
index 771b9669b..97bafa5e1 100644
--- a/data/maps/events/LavaridgeTown_House.inc
+++ b/data/maps/events/LavaridgeTown_House.inc
@@ -1,10 +1,10 @@
-LavaridgeTown_House_MapObjects:: @ 8386494
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0
+LavaridgeTown_House_EventObjects:: @ 8386494
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0
 
 LavaridgeTown_House_MapWarps:: @ 83864C4
 	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN
 
 LavaridgeTown_House_MapEvents:: @ 83864D4
-	map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc
index ff184b78e..f8fd38f18 100644
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ b/data/maps/events/LavaridgeTown_Mart.inc
@@ -1,11 +1,11 @@
-LavaridgeTown_Mart_MapObjects:: @ 83864E8
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0
+LavaridgeTown_Mart_EventObjects:: @ 83864E8
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0
 
 LavaridgeTown_Mart_MapWarps:: @ 8386530
 	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
 	warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN
 
 LavaridgeTown_Mart_MapEvents:: @ 8386540
-	map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
index 5e529bb1e..86d7f462f 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 0, 9, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0
+LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 0, 9, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0
 
 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4
 	warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN
@@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4
 	warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN
 
 LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4
-	map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
index 39035ba87..cac368263 100644
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0
+LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0
 
 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630
 	warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658
-	map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
index 4f6acdcb2..0154c04df 100644
--- a/data/maps/events/LilycoveCity.inc
+++ b/data/maps/events/LilycoveCity.inc
@@ -1,21 +1,21 @@
-LilycoveCity_MapObjects:: @ 838016C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 32, 0, 20, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBEF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 15, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBC7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 28, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 21, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBE6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 16, 0, 9, 0, 5, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 35, 0, 27, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC0E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0
+LilycoveCity_EventObjects:: @ 838016C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 0, 20, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBEF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBC7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBE6, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 0, 9, 0, 5, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 0, 27, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC0E, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
+	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0
 
 LilycoveCity_MapWarps:: @ 8380304
 	warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
@@ -50,4 +50,4 @@ LilycoveCity_MapBGEvents:: @ 838037C
 	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B
 
 LilycoveCity_MapEvents:: @ 8380418
-	map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
+	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc
index 307f23974..c937b924e 100644
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ b/data/maps/events/LilycoveCity_ContestHall.inc
@@ -1,36 +1,36 @@
-LilycoveCity_ContestHall_MapObjects:: @ 8389A18
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 30, 0, 30, 0, 3, 2, 68, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 11, 0, 7, 0, 3, 2, 51, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 40, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 12, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 15, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 10, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 16, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 24, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 24, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 27, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 22, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 26, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 28, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 20, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 30, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMPER, 0, 13, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 36, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 39, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_2, 0, 34, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 36, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BOY_3, 0, 38, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 40, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 32, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_MAN_1, 0, 37, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0
+LilycoveCity_ContestHall_EventObjects:: @ 8389A18
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 0, 30, 0, 3, 2, 68, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 0, 7, 0, 3, 2, 51, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 24, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0
 
 LilycoveCity_ContestHall_MapWarps:: @ 8389D18
 	warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
@@ -47,4 +47,4 @@ LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38
 	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315
 
 LilycoveCity_ContestHall_MapEvents:: @ 8389D80
-	map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
+	map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
index ccbc645b2..e89c95e9f 100644
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ b/data/maps/events/LilycoveCity_ContestLobby.inc
@@ -1,18 +1,18 @@
-LilycoveCity_ContestLobby_MapObjects:: @ 838984C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0
-	object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0
+LilycoveCity_ContestLobby_EventObjects:: @ 838984C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0
+	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0
 
 LilycoveCity_ContestLobby_MapWarps:: @ 838999C
 	warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY
@@ -29,4 +29,4 @@ LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC
 	bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D
 
 LilycoveCity_ContestLobby_MapEvents:: @ 8389A04
-	map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
+	map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
index 63e3ff3be..a17018a8d 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
@@ -1,5 +1,5 @@
-LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0
+LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0
 
 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C
 	warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY
@@ -10,4 +10,4 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494
 	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D
 
 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4
-	map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
+	map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
index 32c1181de..588e460e0 100644
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
@@ -1,13 +1,13 @@
-LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
 
 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548
 	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
 
 LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550
-	map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
index eea28d624..d03549c1c 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0
+LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0
 
 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C
 	warp_def 1, 5, 3, 127, MAP_NONE
 	warp_def 2, 5, 3, 127, MAP_NONE
 
 LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C
-	map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
index c5f094b3f..bc0b08b7e 100644
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
@@ -1,7 +1,7 @@
-LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0
+LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0
 
 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0
 	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
@@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8
 	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD
 
 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610
-	map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
+	map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
index b9104a1ee..a6be96a02 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
@@ -1,10 +1,10 @@
-LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0
+LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0
 
 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8
 	warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY
@@ -16,4 +16,4 @@ LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8
 	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05
 
 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4
-	map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
+	map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
index 441c43a4c..e3bad14af 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8
-	object_event 1, MAP_OBJ_GFX_COOK, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0
+LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8
+	object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0
 
 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360
 	warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
@@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360
 	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378
-	map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
index 920327ab8..4c949b446 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C
-	object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0
+LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C
+	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0
 
 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404
 	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
@@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404
 	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C
-	map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
index a387cfbf2..c50e36efc 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
@@ -1,9 +1,9 @@
-LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0
+LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0
 
 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8
 	warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
@@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8
 	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
 
 LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0
-	map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
index e794452b9..7762f61bf 100644
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
@@ -1,11 +1,11 @@
-LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 15, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 17, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0
+LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0
 
 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C
 	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
@@ -13,4 +13,4 @@ LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C
 	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
 
 LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594
-	map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
index 3f7c592d1..5746ba69c 100644
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ b/data/maps/events/LilycoveCity_Harbor.inc
@@ -1,8 +1,8 @@
-LilycoveCity_Harbor_MapObjects:: @ 8389F94
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0
+LilycoveCity_Harbor_EventObjects:: @ 8389F94
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0
 
 LilycoveCity_Harbor_MapWarps:: @ 8389FF4
 	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
@@ -11,4 +11,4 @@ LilycoveCity_Harbor_MapWarps:: @ 8389FF4
 	warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP
 
 LilycoveCity_Harbor_MapEvents:: @ 838A014
-	map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc
index 8d6e6b8ce..7ed489819 100644
--- a/data/maps/events/LilycoveCity_House1.inc
+++ b/data/maps/events/LilycoveCity_House1.inc
@@ -1,10 +1,10 @@
-LilycoveCity_House1_MapObjects:: @ 838A080
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B86, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0
+LilycoveCity_House1_EventObjects:: @ 838A080
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B86, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0
 
 LilycoveCity_House1_MapWarps:: @ 838A0B0
 	warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY
 	warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY
 
 LilycoveCity_House1_MapEvents:: @ 838A0C0
-	map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc
index 8cb92dfa4..8ad99e8b4 100644
--- a/data/maps/events/LilycoveCity_House2.inc
+++ b/data/maps/events/LilycoveCity_House2.inc
@@ -1,9 +1,9 @@
-LilycoveCity_House2_MapObjects:: @ 838A0D4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0
+LilycoveCity_House2_EventObjects:: @ 838A0D4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0
 
 LilycoveCity_House2_MapWarps:: @ 838A0EC
 	warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY
 	warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY
 
 LilycoveCity_House2_MapEvents:: @ 838A0FC
-	map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc
index db7113ef1..45db8cb61 100644
--- a/data/maps/events/LilycoveCity_House3.inc
+++ b/data/maps/events/LilycoveCity_House3.inc
@@ -1,14 +1,14 @@
-LilycoveCity_House3_MapObjects:: @ 838A110
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_5, 0, 1, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C49, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0
+LilycoveCity_House3_EventObjects:: @ 838A110
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C49, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0
 
 LilycoveCity_House3_MapWarps:: @ 838A1A0
 	warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY
 	warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY
 
 LilycoveCity_House3_MapEvents:: @ 838A1B0
-	map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc
index 376afb431..30aed0188 100644
--- a/data/maps/events/LilycoveCity_House4.inc
+++ b/data/maps/events/LilycoveCity_House4.inc
@@ -1,10 +1,10 @@
-LilycoveCity_House4_MapObjects:: @ 838A1C4
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D42, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0
+LilycoveCity_House4_EventObjects:: @ 838A1C4
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D42, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0
 
 LilycoveCity_House4_MapWarps:: @ 838A1F4
 	warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY
 	warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY
 
 LilycoveCity_House4_MapEvents:: @ 838A204
-	map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
index 1ee241c5c..d4d82a9f7 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
@@ -1,14 +1,14 @@
-LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0
-	object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0
-	object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
-	object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0
+LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0
 
 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654
 	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
@@ -34,4 +34,4 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C
 	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
 
 LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C
-	map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
+	map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
index 83077f069..6c7671641 100644
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
@@ -1,8 +1,8 @@
-LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
+LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
 
 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0
 	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
@@ -22,4 +22,4 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8
 	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D
 
 LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838
-	map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
+	map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
index d4969c39e..ac4ce16b0 100644
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
@@ -1,9 +1,9 @@
-LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0
+LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0
 
 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C
 	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
 	warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY
 
 LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C
-	map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
index c0f27f6c7..c768e3e45 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0
+LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0
 
 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC
 	warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
@@ -9,4 +9,4 @@ LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC
 	warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F
 
 LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4
-	map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
index e1723d489..b0ff8f07f 100644
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0
+LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0
 
 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50
 	warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78
-	map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
index 59e8e03a3..73680e5fd 100644
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
@@ -1,16 +1,16 @@
-LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 3, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0
+LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0
 
 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70
 	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
 	warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY
 
 LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80
-	map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
+	map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
index 1c0ac9368..85736e0c8 100644
--- a/data/maps/events/LinkContestRoom1.inc
+++ b/data/maps/events/LinkContestRoom1.inc
@@ -1,18 +1,18 @@
-LinkContestRoom1_MapObjects:: @ 839149C
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_5, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_3, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+LinkContestRoom1_EventObjects:: @ 839149C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 LinkContestRoom1_MapEvents:: @ 8391604
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
index c2842c68e..2fc209077 100644
--- a/data/maps/events/LittlerootTown.inc
+++ b/data/maps/events/LittlerootTown.inc
@@ -1,10 +1,10 @@
-LittlerootTown_MapObjects:: @ 83808FC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0
-	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0
+LittlerootTown_EventObjects:: @ 83808FC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0
 
 LittlerootTown_MapWarps:: @ 838098C
 	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
@@ -29,4 +29,4 @@ LittlerootTown_MapBGEvents:: @ 8380A34
 	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834
 
 LittlerootTown_MapEvents:: @ 8380A64
-	map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
+	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
index 58c8f8993..287818d15 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
@@ -1,9 +1,9 @@
-LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
+LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
 	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
@@ -14,4 +14,4 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704
 	coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789
 
 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714
-	map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
+	map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
index 102da33a2..5d4ae676f 100644
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
@@ -1,18 +1,18 @@
-LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
+LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
 
 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878
 	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
@@ -24,4 +24,4 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880
 	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870
 
 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0
-	map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
+	map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
index cbeccb348..5fed0bdf6 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
@@ -1,9 +1,9 @@
-LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
+LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
 
 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
 	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
@@ -14,4 +14,4 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954
 	coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35
 
 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964
-	map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
+	map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
index b00a8d57d..e803d3335 100644
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
@@ -1,19 +1,19 @@
-LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978
-	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0
+LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978
+	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0
 
 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0
 	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
@@ -25,4 +25,4 @@ LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8
 	bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39
 
 LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18
-	map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
+	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
index 41acfb14e..507dcec85 100644
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
@@ -1,7 +1,7 @@
-LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0
+LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0
 
 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74
 	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
@@ -25,4 +25,4 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84
 	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
 
 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38
-	map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
+	map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
index 3601ce8b2..a6f2b1670 100644
--- a/data/maps/events/MagmaHideout_1F.inc
+++ b/data/maps/events/MagmaHideout_1F.inc
@@ -1,11 +1,11 @@
-MagmaHideout_1F_MapObjects:: @ 838E9BC
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0
+MagmaHideout_1F_EventObjects:: @ 838E9BC
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0
 
 MagmaHideout_1F_MapWarps:: @ 838EA04
 	warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY
 	warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F
 
 MagmaHideout_1F_MapEvents:: @ 838EA14
-	map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc
index 01b1bdf63..577d7ad11 100644
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ b/data/maps/events/MagmaHideout_B1F.inc
@@ -1,12 +1,12 @@
-MagmaHideout_B1F_MapObjects:: @ 838EA28
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_2, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
+MagmaHideout_B1F_EventObjects:: @ 838EA28
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
 
 MagmaHideout_B1F_MapWarps:: @ 838EAE8
 	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F
@@ -40,4 +40,4 @@ MagmaHideout_B1F_MapWarps:: @ 838EAE8
 	warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F
 
 MagmaHideout_B1F_MapEvents:: @ 838EBD0
-	map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0
+	map_events MagmaHideout_B1F_EventObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc
index 58883c3a2..da6cfd6aa 100644
--- a/data/maps/events/MagmaHideout_B2F.inc
+++ b/data/maps/events/MagmaHideout_B2F.inc
@@ -1,9 +1,9 @@
-MagmaHideout_B2F_MapObjects:: @ 838EBE4
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0
+MagmaHideout_B2F_EventObjects:: @ 838EBE4
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0
 
 MagmaHideout_B2F_MapWarps:: @ 838EC5C
 	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F
@@ -22,4 +22,4 @@ MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C
 	coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
 
 MagmaHideout_B2F_MapEvents:: @ 838ECDC
-	map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0
+	map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
index fee44bb1e..12ed46d7b 100644
--- a/data/maps/events/MauvilleCity.inc
+++ b/data/maps/events/MauvilleCity.inc
@@ -1,13 +1,13 @@
-MauvilleCity_MapObjects:: @ 837FB90
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 29, 0, 16, 0, 3, 5, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C05A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 24, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C075, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0
-	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0
+MauvilleCity_EventObjects:: @ 837FB90
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 0, 16, 0, 3, 5, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C05A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C075, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0
 
 MauvilleCity_MapWarps:: @ 837FC68
 	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
@@ -29,4 +29,4 @@ MauvilleCity_MapBGEvents:: @ 837FCA0
 	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099
 
 MauvilleCity_MapEvents:: @ 837FD00
-	map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
+	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc
index c215f96b0..171bcbb2a 100644
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ b/data/maps/events/MauvilleCity_BikeShop.inc
@@ -1,6 +1,6 @@
-MauvilleCity_BikeShop_MapObjects:: @ 8388318
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0
+MauvilleCity_BikeShop_EventObjects:: @ 8388318
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0
 
 MauvilleCity_BikeShop_MapWarps:: @ 8388348
 	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
@@ -11,4 +11,4 @@ MauvilleCity_BikeShop_MapBGEvents:: @ 8388358
 	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988
 
 MauvilleCity_BikeShop_MapEvents:: @ 8388370
-	map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
+	map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc
index bd0b472a2..950bb6447 100644
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ b/data/maps/events/MauvilleCity_GameCorner.inc
@@ -1,16 +1,16 @@
-MauvilleCity_GameCorner_MapObjects:: @ 83883C0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 7, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_3, 0, 19, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 20, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_COOK, 0, 6, 0, 8, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_4, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MANIAC, 0, 9, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0
+MauvilleCity_GameCorner_EventObjects:: @ 83883C0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 0, 8, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0
 
 MauvilleCity_GameCorner_MapWarps:: @ 83884E0
 	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
@@ -43,4 +43,4 @@ MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0
 	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
 
 MauvilleCity_GameCorner_MapEvents:: @ 8388610
-	map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
+	map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
index a9bd2a057..648a5e90b 100644
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ b/data/maps/events/MauvilleCity_Gym.inc
@@ -1,10 +1,10 @@
-MauvilleCity_Gym_MapObjects:: @ 838821C
-	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 2, 0, 15, 0, 3, 8, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0
+MauvilleCity_Gym_EventObjects:: @ 838821C
+	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 0, 15, 0, 3, 8, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566E6, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0
 
 MauvilleCity_Gym_MapWarps:: @ 83882AC
 	warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY
@@ -20,4 +20,4 @@ MauvilleCity_Gym_MapBGEvents:: @ 83882EC
 	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771
 
 MauvilleCity_Gym_MapEvents:: @ 8388304
-	map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
+	map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc
index 86b07e3dd..e908629e0 100644
--- a/data/maps/events/MauvilleCity_House1.inc
+++ b/data/maps/events/MauvilleCity_House1.inc
@@ -1,9 +1,9 @@
-MauvilleCity_House1_MapObjects:: @ 8388384
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0
+MauvilleCity_House1_EventObjects:: @ 8388384
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0
 
 MauvilleCity_House1_MapWarps:: @ 838839C
 	warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY
 	warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY
 
 MauvilleCity_House1_MapEvents:: @ 83883AC
-	map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc
index 2e5a39157..4834554ee 100644
--- a/data/maps/events/MauvilleCity_House2.inc
+++ b/data/maps/events/MauvilleCity_House2.inc
@@ -1,9 +1,9 @@
-MauvilleCity_House2_MapObjects:: @ 8388624
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0
+MauvilleCity_House2_EventObjects:: @ 8388624
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0
 
 MauvilleCity_House2_MapWarps:: @ 838863C
 	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
 	warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY
 
 MauvilleCity_House2_MapEvents:: @ 838864C
-	map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc
index 3453c6fce..c638da45d 100644
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ b/data/maps/events/MauvilleCity_Mart.inc
@@ -1,11 +1,11 @@
-MauvilleCity_Mart_MapObjects:: @ 83887A0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0
+MauvilleCity_Mart_EventObjects:: @ 83887A0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0
 
 MauvilleCity_Mart_MapWarps:: @ 83887E8
 	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
 	warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY
 
 MauvilleCity_Mart_MapEvents:: @ 83887F8
-	map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
index e949ee3d0..d656daf43 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0
+MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0
 
 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8
 	warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY
@@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8
 	warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F
 
 MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0
-	map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
index 501c40012..5a418e9aa 100644
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0
+MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0
 
 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764
 	warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
@@ -12,4 +12,4 @@ MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C
-	map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
index 17efa037a..781dde604 100644
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ b/data/maps/events/MeteorFalls_1F_1R.inc
@@ -1,14 +1,14 @@
-MeteorFalls_1F_1R_MapObjects:: @ 838BACC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0
+MeteorFalls_1F_1R_EventObjects:: @ 838BACC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0
 
 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC
 	warp_def 27, 18, 4, 0, MAP_ROUTE114
@@ -25,4 +25,4 @@ MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4
 	bg_event 9, 58, 0, 0, 0, 0x0
 
 MeteorFalls_1F_1R_MapEvents:: @ 838BC0C
-	map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
+	map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc
index 060f9a84d..72763e029 100644
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ b/data/maps/events/MeteorFalls_1F_2R.inc
@@ -1,7 +1,7 @@
-MeteorFalls_1F_2R_MapObjects:: @ 838BC20
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 13, 0, 2, 0, 3, 8, 0, 0, 1, 0, 1, 0, MeteorFalls_1F_2R_EventScript_15C679, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 6, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0
+MeteorFalls_1F_2R_EventObjects:: @ 838BC20
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 0, 2, 0, 3, 8, 0, 0, 1, 0, 1, 0, MeteorFalls_1F_2R_EventScript_15C679, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0
 
 MeteorFalls_1F_2R_MapWarps:: @ 838BC68
 	warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R
@@ -14,4 +14,4 @@ MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88
 	bg_event 9, 58, 0, 0, 0, 0x0
 
 MeteorFalls_1F_2R_MapEvents:: @ 838BCA0
-	map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
+	map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
index 13e39d682..13bafa5ee 100644
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ b/data/maps/events/MeteorFalls_B1F_2R.inc
@@ -1,8 +1,8 @@
-MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0
+MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0
 
 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10
 	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
 
 MeteorFalls_B1F_2R_MapEvents:: @ 838BD18
-	map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
+	map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
index 957d91d5a..b314a4b0b 100644
--- a/data/maps/events/MossdeepCity.inc
+++ b/data/maps/events/MossdeepCity.inc
@@ -1,13 +1,13 @@
-MossdeepCity_MapObjects:: @ 838042C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 42, 0, 24, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFB7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 50, 0, 34, 0, 5, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0
+MossdeepCity_EventObjects:: @ 838042C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 0, 24, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFB7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 0, 34, 0, 5, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0
 
 MossdeepCity_MapWarps:: @ 8380504
 	warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1
@@ -38,4 +38,4 @@ MossdeepCity_MapBGEvents:: @ 8380594
 	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4
 
 MossdeepCity_MapEvents:: @ 83805F4
-	map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
+	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc
index f525533b2..cbe87a4b6 100644
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc
@@ -1,5 +1,5 @@
-MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0
+MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0
 
 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84
 	warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY
@@ -10,4 +10,4 @@ MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C
 	bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C
 
 MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8
-	map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
+	map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
index dc88e208b..91e8af46e 100644
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
@@ -1,8 +1,8 @@
-MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4
 	warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
 
 MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC
-	map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc
index 21521df5f..6c90f3111 100644
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ b/data/maps/events/MossdeepCity_Gym.inc
@@ -1,13 +1,13 @@
-MossdeepCity_Gym_MapObjects:: @ 838A660
-	object_event 1, MAP_OBJ_GFX_TATE, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 2, 0, 24, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A74E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 17, 0, 18, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A77C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7C1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LASS, 0, 11, 0, 10, 0, 3, 8, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7AA, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 7, 0, 3, 10, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A765, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 4, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, MossdeepCity_Gym_EventScript_15A793, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_2, 0, 8, 0, 29, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
+MossdeepCity_Gym_EventObjects:: @ 838A660
+	object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 0, 24, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A74E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 0, 18, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A77C, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7C1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 0, 10, 0, 3, 8, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7AA, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 7, 0, 3, 10, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A765, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, MossdeepCity_Gym_EventScript_15A793, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 0, 29, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
 
 MossdeepCity_Gym_MapWarps:: @ 838A738
 	warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY
@@ -25,4 +25,4 @@ MossdeepCity_Gym_MapBGEvents:: @ 838A758
 	bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A
 
 MossdeepCity_Gym_MapEvents:: @ 838A7A0
-	map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
+	map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc
index ec7bbdc58..5205fac26 100644
--- a/data/maps/events/MossdeepCity_House1.inc
+++ b/data/maps/events/MossdeepCity_House1.inc
@@ -1,10 +1,10 @@
-MossdeepCity_House1_MapObjects:: @ 838A7B4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 3, 0, 3, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0
+MossdeepCity_House1_EventObjects:: @ 838A7B4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 0, 3, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0
 
 MossdeepCity_House1_MapWarps:: @ 838A7E4
 	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
 	warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY
 
 MossdeepCity_House1_MapEvents:: @ 838A7F4
-	map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
index 6752007d7..6ecd39bb0 100644
--- a/data/maps/events/MossdeepCity_House2.inc
+++ b/data/maps/events/MossdeepCity_House2.inc
@@ -1,11 +1,11 @@
-MossdeepCity_House2_MapObjects:: @ 838A808
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0
+MossdeepCity_House2_EventObjects:: @ 838A808
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0
 
 MossdeepCity_House2_MapWarps:: @ 838A850
 	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
 	warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY
 
 MossdeepCity_House2_MapEvents:: @ 838A860
-	map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc
index 37c96933c..3c0e78f65 100644
--- a/data/maps/events/MossdeepCity_House3.inc
+++ b/data/maps/events/MossdeepCity_House3.inc
@@ -1,9 +1,9 @@
-MossdeepCity_House3_MapObjects:: @ 838AA08
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0
+MossdeepCity_House3_EventObjects:: @ 838AA08
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0
 
 MossdeepCity_House3_MapWarps:: @ 838AA20
 	warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY
 	warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY
 
 MossdeepCity_House3_MapEvents:: @ 838AA30
-	map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc
index 6c07d0101..0aacb14ff 100644
--- a/data/maps/events/MossdeepCity_House4.inc
+++ b/data/maps/events/MossdeepCity_House4.inc
@@ -1,11 +1,11 @@
-MossdeepCity_House4_MapObjects:: @ 838AAF8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0
+MossdeepCity_House4_EventObjects:: @ 838AAF8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0
 
 MossdeepCity_House4_MapWarps:: @ 838AB40
 	warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY
 	warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY
 
 MossdeepCity_House4_MapEvents:: @ 838AB50
-	map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc
index 74141c0cc..667e38fea 100644
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ b/data/maps/events/MossdeepCity_Mart.inc
@@ -1,12 +1,12 @@
-MossdeepCity_Mart_MapObjects:: @ 838A984
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 8, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0
+MossdeepCity_Mart_EventObjects:: @ 838A984
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0
 
 MossdeepCity_Mart_MapWarps:: @ 838A9E4
 	warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
 	warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
 
 MossdeepCity_Mart_MapEvents:: @ 838A9F4
-	map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
index a9555d59b..007b8aa7e 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 8, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0
+MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0
 
 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC
 	warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY
@@ -9,4 +9,4 @@ MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC
 	warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F
 
 MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4
-	map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
index 3f3d05e5a..5d1d78ec1 100644
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
@@ -1,8 +1,8 @@
-MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0
+MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0
 
 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948
 	warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
@@ -12,4 +12,4 @@ MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970
-	map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
index ab9872c2f..2d40cd6cf 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
@@ -1,9 +1,9 @@
-MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 7, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0
+MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0
 
 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC
 	warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY
@@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC
 	warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F
 
 MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4
-	map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
index bcef30b09..3a182b547 100644
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
@@ -1,10 +1,10 @@
-MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 6, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0
+MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0
 
 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50
 	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
 
 MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58
-	map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
+	map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
index 1428a7d8a..0c110c354 100644
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ b/data/maps/events/MossdeepCity_StevensHouse.inc
@@ -1,8 +1,8 @@
-MossdeepCity_StevensHouse_MapObjects:: @ 838AA44
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0
+MossdeepCity_StevensHouse_EventObjects:: @ 838AA44
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0
 
 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4
 	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
@@ -15,4 +15,4 @@ MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4
 	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
 
 MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4
-	map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
+	map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
index e685159c0..be4492ef6 100644
--- a/data/maps/events/MtChimney.inc
+++ b/data/maps/events/MtChimney.inc
@@ -1,32 +1,32 @@
-MtChimney_MapObjects:: @ 838C330
-	object_event 1, MAP_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 16, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 17, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 22, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+MtChimney_EventObjects:: @ 838C330
+	object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
+	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
 
 MtChimney_MapWarps:: @ 838C5D0
 	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
@@ -39,4 +39,4 @@ MtChimney_MapBGEvents:: @ 838C5F0
 	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA
 
 MtChimney_MapEvents:: @ 838C608
-	map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
+	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc
index 971dcda65..bb1505cbe 100644
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ b/data/maps/events/MtChimney_CableCarStation.inc
@@ -1,10 +1,10 @@
-MtChimney_CableCarStation_MapObjects:: @ 838B828
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+MtChimney_CableCarStation_EventObjects:: @ 838B828
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 MtChimney_CableCarStation_MapWarps:: @ 838B858
 	warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY
 	warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY
 
 MtChimney_CableCarStation_MapEvents:: @ 838B868
-	map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
+	map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc
index 480bcdbe9..e06d20bb8 100644
--- a/data/maps/events/MtPyre_1F.inc
+++ b/data/maps/events/MtPyre_1F.inc
@@ -1,7 +1,7 @@
-MtPyre_1F_MapObjects:: @ 838C7FC
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 21, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D323, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 17, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D35C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0
+MtPyre_1F_EventObjects:: @ 838C7FC
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D323, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D35C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0
 
 MtPyre_1F_MapWarps:: @ 838C844
 	warp_def 17, 18, 3, 0, MAP_ROUTE122
@@ -12,4 +12,4 @@ MtPyre_1F_MapWarps:: @ 838C844
 	warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F
 
 MtPyre_1F_MapEvents:: @ 838C874
-	map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0
+	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
index 16e1d98b0..1f7a0ec7b 100644
--- a/data/maps/events/MtPyre_2F.inc
+++ b/data/maps/events/MtPyre_2F.inc
@@ -1,10 +1,10 @@
-MtPyre_2F_MapObjects:: @ 838C888
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0
+MtPyre_2F_EventObjects:: @ 838C888
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0
 
 MtPyre_2F_MapWarps:: @ 838C918
 	warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
@@ -14,4 +14,4 @@ MtPyre_2F_MapWarps:: @ 838C918
 	warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F
 
 MtPyre_2F_MapEvents:: @ 838C940
-	map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0
+	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
index 818d61533..860583271 100644
--- a/data/maps/events/MtPyre_3F.inc
+++ b/data/maps/events/MtPyre_3F.inc
@@ -1,7 +1,7 @@
-MtPyre_3F_MapObjects:: @ 838C954
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0
+MtPyre_3F_EventObjects:: @ 838C954
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0
 
 MtPyre_3F_MapWarps:: @ 838C99C
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
@@ -12,4 +12,4 @@ MtPyre_3F_MapWarps:: @ 838C99C
 	warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
 
 MtPyre_3F_MapEvents:: @ 838C9CC
-	map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0
+	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
index 4b954a45e..d6719889e 100644
--- a/data/maps/events/MtPyre_4F.inc
+++ b/data/maps/events/MtPyre_4F.inc
@@ -1,6 +1,6 @@
-MtPyre_4F_MapObjects:: @ 838C9E0
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0
+MtPyre_4F_EventObjects:: @ 838C9E0
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0
 
 MtPyre_4F_MapWarps:: @ 838CA10
 	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
@@ -11,4 +11,4 @@ MtPyre_4F_MapWarps:: @ 838CA10
 	warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
 
 MtPyre_4F_MapEvents:: @ 838CA40
-	map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0
+	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
index 9043c95de..9a36a1d98 100644
--- a/data/maps/events/MtPyre_5F.inc
+++ b/data/maps/events/MtPyre_5F.inc
@@ -1,6 +1,6 @@
-MtPyre_5F_MapObjects:: @ 838CA54
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0
+MtPyre_5F_EventObjects:: @ 838CA54
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0
 
 MtPyre_5F_MapWarps:: @ 838CA84
 	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
@@ -10,4 +10,4 @@ MtPyre_5F_MapWarps:: @ 838CA84
 	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
 
 MtPyre_5F_MapEvents:: @ 838CAAC
-	map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0
+	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
index 67597ff58..5fe737f4e 100644
--- a/data/maps/events/MtPyre_6F.inc
+++ b/data/maps/events/MtPyre_6F.inc
@@ -1,10 +1,10 @@
-MtPyre_6F_MapObjects:: @ 838CAC0
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0
+MtPyre_6F_EventObjects:: @ 838CAC0
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0
 
 MtPyre_6F_MapWarps:: @ 838CAF0
 	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
 	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
 
 MtPyre_6F_MapEvents:: @ 838CB00
-	map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0
+	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
index 77668758d..8203afe6c 100644
--- a/data/maps/events/MtPyre_Exterior.inc
+++ b/data/maps/events/MtPyre_Exterior.inc
@@ -1,6 +1,6 @@
-MtPyre_Exterior_MapObjects:: @ 838CB14
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0
+MtPyre_Exterior_EventObjects:: @ 838CB14
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0
 
 MtPyre_Exterior_MapWarps:: @ 838CB44
 	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
@@ -19,4 +19,4 @@ MtPyre_Exterior_MapBGEvents:: @ 838CBAC
 	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E
 
 MtPyre_Exterior_MapEvents:: @ 838CBC4
-	map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
+	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
index 64399add8..7def980b1 100644
--- a/data/maps/events/MtPyre_Summit.inc
+++ b/data/maps/events/MtPyre_Summit.inc
@@ -1,10 +1,10 @@
-MtPyre_Summit_MapObjects:: @ 838CBD8
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
+MtPyre_Summit_EventObjects:: @ 838CBD8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
 
 MtPyre_Summit_MapWarps:: @ 838CC68
 	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
@@ -24,4 +24,4 @@ MtPyre_Summit_MapBGEvents:: @ 838CCE0
 	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50
 
 MtPyre_Summit_MapEvents:: @ 838CCF8
-	map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
+	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
index c88c554c6..d1c5bd06a 100644
--- a/data/maps/events/NewMauville_Inside.inc
+++ b/data/maps/events/NewMauville_Inside.inc
@@ -1,12 +1,12 @@
-NewMauville_Inside_MapObjects:: @ 838DF08
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0
+NewMauville_Inside_EventObjects:: @ 838DF08
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0
 
 NewMauville_Inside_MapWarps:: @ 838DFC8
 	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
@@ -34,4 +34,4 @@ NewMauville_Inside_MapBGEvents:: @ 838E070
 	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0
 
 NewMauville_Inside_MapEvents:: @ 838E0D0
-	map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
+	map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
index cad717a21..28bbf82d4 100644
--- a/data/maps/events/OldaleTown.inc
+++ b/data/maps/events/OldaleTown.inc
@@ -1,8 +1,8 @@
-OldaleTown_MapObjects:: @ 8380A78
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0
+OldaleTown_EventObjects:: @ 8380A78
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0
 
 OldaleTown_MapWarps:: @ 8380AD8
 	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
@@ -24,4 +24,4 @@ OldaleTown_MapBGEvents:: @ 8380B38
 	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1
 
 OldaleTown_MapEvents:: @ 8380B74
-	map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
+	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc
index 1c2eb5bce..ca5388d3e 100644
--- a/data/maps/events/OldaleTown_House1.inc
+++ b/data/maps/events/OldaleTown_House1.inc
@@ -1,9 +1,9 @@
-OldaleTown_House1_MapObjects:: @ 8385C4C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0
+OldaleTown_House1_EventObjects:: @ 8385C4C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0
 
 OldaleTown_House1_MapWarps:: @ 8385C64
 	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
 	warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN
 
 OldaleTown_House1_MapEvents:: @ 8385C74
-	map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
+	map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc
index 458ca9420..0b73af8b4 100644
--- a/data/maps/events/OldaleTown_House2.inc
+++ b/data/maps/events/OldaleTown_House2.inc
@@ -1,10 +1,10 @@
-OldaleTown_House2_MapObjects:: @ 8385C88
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0
+OldaleTown_House2_EventObjects:: @ 8385C88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0
 
 OldaleTown_House2_MapWarps:: @ 8385CB8
 	warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN
 	warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN
 
 OldaleTown_House2_MapEvents:: @ 8385CC8
-	map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
+	map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc
index 839ec3b49..b0bd7691a 100644
--- a/data/maps/events/OldaleTown_Mart.inc
+++ b/data/maps/events/OldaleTown_Mart.inc
@@ -1,11 +1,11 @@
-OldaleTown_Mart_MapObjects:: @ 8385DEC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0
+OldaleTown_Mart_EventObjects:: @ 8385DEC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0
 
 OldaleTown_Mart_MapWarps:: @ 8385E34
 	warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN
 	warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN
 
 OldaleTown_Mart_MapEvents:: @ 8385E44
-	map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
+	map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
index 0c9bdfe8c..639396d28 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0
+OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0
 
 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C
 	warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN
@@ -10,4 +10,4 @@ OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C
 	warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F
 
 OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54
-	map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
index e94d29970..6062482e1 100644
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0
+OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0
 
 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0
 	warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8
-	map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc
index 2161172a5..b9a8cba7a 100644
--- a/data/maps/events/PacifidlogTown.inc
+++ b/data/maps/events/PacifidlogTown.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_MapObjects:: @ 838100C
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 10, 0, 23, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 11, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0
+PacifidlogTown_EventObjects:: @ 838100C
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 0, 23, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0
 
 PacifidlogTown_MapWarps:: @ 8381054
 	warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
@@ -17,4 +17,4 @@ PacifidlogTown_MapBGEvents:: @ 8381084
 	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA
 
 PacifidlogTown_MapEvents:: @ 83810A8
-	map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
+	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc
index 3e0e7dc23..773afb1c1 100644
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ b/data/maps/events/PacifidlogTown_House1.inc
@@ -1,10 +1,10 @@
-PacifidlogTown_House1_MapObjects:: @ 8386F40
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 3, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0
+PacifidlogTown_House1_EventObjects:: @ 8386F40
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0
 
 PacifidlogTown_House1_MapWarps:: @ 8386F70
 	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN
 
 PacifidlogTown_House1_MapEvents:: @ 8386F80
-	map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc
index 7c4de826c..a7fc9f156 100644
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ b/data/maps/events/PacifidlogTown_House2.inc
@@ -1,11 +1,11 @@
-PacifidlogTown_House2_MapObjects:: @ 8386F94
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154168, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154267, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0
+PacifidlogTown_House2_EventObjects:: @ 8386F94
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154168, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154267, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0
 
 PacifidlogTown_House2_MapWarps:: @ 8386FDC
 	warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN
 
 PacifidlogTown_House2_MapEvents:: @ 8386FEC
-	map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc
index 642613434..e36778e3c 100644
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ b/data/maps/events/PacifidlogTown_House3.inc
@@ -1,10 +1,10 @@
-PacifidlogTown_House3_MapObjects:: @ 8387000
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 5, 0, 3, 18, 0, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0
+PacifidlogTown_House3_EventObjects:: @ 8387000
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 0, 5, 0, 3, 18, 0, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0
 
 PacifidlogTown_House3_MapWarps:: @ 8387030
 	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN
 
 PacifidlogTown_House3_MapEvents:: @ 8387040
-	map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc
index bf010eaf3..9f65252b2 100644
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ b/data/maps/events/PacifidlogTown_House4.inc
@@ -1,11 +1,11 @@
-PacifidlogTown_House4_MapObjects:: @ 8387054
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0
+PacifidlogTown_House4_EventObjects:: @ 8387054
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0
 
 PacifidlogTown_House4_MapWarps:: @ 838709C
 	warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN
 
 PacifidlogTown_House4_MapEvents:: @ 83870AC
-	map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc
index cd7c5dae0..5f9c8d065 100644
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ b/data/maps/events/PacifidlogTown_House5.inc
@@ -1,10 +1,10 @@
-PacifidlogTown_House5_MapObjects:: @ 83870C0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0
+PacifidlogTown_House5_EventObjects:: @ 83870C0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0
 
 PacifidlogTown_House5_MapWarps:: @ 83870F0
 	warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN
 	warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN
 
 PacifidlogTown_House5_MapEvents:: @ 8387100
-	map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
index e0990b224..b14439efa 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0
+PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0
 
 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90
 	warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN
@@ -10,4 +10,4 @@ PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90
 	warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F
 
 PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8
-	map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
index fb594733e..210b1ccaa 100644
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0
+PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0
 
 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04
 	warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04
 	warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C
-	map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
index 3b22cca9b..081f60a88 100644
--- a/data/maps/events/PetalburgCity.inc
+++ b/data/maps/events/PetalburgCity.inc
@@ -1,13 +1,13 @@
-PetalburgCity_MapObjects:: @ 837F5F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0
+PetalburgCity_EventObjects:: @ 837F5F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0
 
 PetalburgCity_MapWarps:: @ 837F6C8
 	warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
@@ -34,4 +34,4 @@ PetalburgCity_MapBGEvents:: @ 837F738
 	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F
 
 PetalburgCity_MapEvents:: @ 837F798
-	map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
+	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
index 781de130d..a2088175a 100644
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ b/data/maps/events/PetalburgCity_Gym.inc
@@ -1,14 +1,14 @@
-PetalburgCity_Gym_MapObjects:: @ 8387168
-	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 55, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F22, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0
-	object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0
+PetalburgCity_Gym_EventObjects:: @ 8387168
+	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 55, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F22, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0
 
 PetalburgCity_Gym_MapWarps:: @ 8387258
 	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
@@ -67,4 +67,4 @@ PetalburgCity_Gym_MapBGEvents:: @ 8387388
 	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA
 
 PetalburgCity_Gym_MapEvents:: @ 8387430
-	map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
+	map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc
index 9faa2873a..88be35a38 100644
--- a/data/maps/events/PetalburgCity_House1.inc
+++ b/data/maps/events/PetalburgCity_House1.inc
@@ -1,10 +1,10 @@
-PetalburgCity_House1_MapObjects:: @ 8387444
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 4, 0, 3, 2, 34, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0
+PetalburgCity_House1_EventObjects:: @ 8387444
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 0, 4, 0, 3, 2, 34, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0
 
 PetalburgCity_House1_MapWarps:: @ 8387474
 	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
 	warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY
 
 PetalburgCity_House1_MapEvents:: @ 8387484
-	map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc
index 29a2226d1..862eb9b76 100644
--- a/data/maps/events/PetalburgCity_House2.inc
+++ b/data/maps/events/PetalburgCity_House2.inc
@@ -1,10 +1,10 @@
-PetalburgCity_House2_MapObjects:: @ 8387498
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0
+PetalburgCity_House2_EventObjects:: @ 8387498
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0
 
 PetalburgCity_House2_MapWarps:: @ 83874C8
 	warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY
 	warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY
 
 PetalburgCity_House2_MapEvents:: @ 83874D8
-	map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc
index 358618d7e..b12e03f93 100644
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ b/data/maps/events/PetalburgCity_Mart.inc
@@ -1,12 +1,12 @@
-PetalburgCity_Mart_MapObjects:: @ 8387614
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0
+PetalburgCity_Mart_EventObjects:: @ 8387614
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0
 
 PetalburgCity_Mart_MapWarps:: @ 8387674
 	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
 	warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY
 
 PetalburgCity_Mart_MapEvents:: @ 8387684
-	map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
index 8bdc1e1bf..8c8c34382 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
@@ -1,9 +1,9 @@
-PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0
+PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0
 
 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564
 	warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY
@@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564
 	warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F
 
 PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C
-	map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
index cdbefe565..ee99539a1 100644
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0
+PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0
 
 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8
 	warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600
-	map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc
index 4485f518d..2f63d397d 100644
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ b/data/maps/events/PetalburgCity_WallysHouse.inc
@@ -1,10 +1,10 @@
-PetalburgCity_WallysHouse_MapObjects:: @ 8387114
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0
+PetalburgCity_WallysHouse_EventObjects:: @ 8387114
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0
 
 PetalburgCity_WallysHouse_MapWarps:: @ 8387144
 	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
 	warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY
 
 PetalburgCity_WallysHouse_MapEvents:: @ 8387154
-	map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
+	map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
index 91e59d6c5..b17ff069d 100644
--- a/data/maps/events/PetalburgWoods.inc
+++ b/data/maps/events/PetalburgWoods.inc
@@ -1,17 +1,17 @@
-PetalburgWoods_MapObjects:: @ 838C14C
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0
-	object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0
+PetalburgWoods_EventObjects:: @ 838C14C
+	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0
+	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0
 
 PetalburgWoods_MapWarps:: @ 838C284
 	warp_def 14, 5, 0, 2, MAP_ROUTE104
@@ -34,4 +34,4 @@ PetalburgWoods_MapBGEvents:: @ 838C2D4
 	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E
 
 PetalburgWoods_MapEvents:: @ 838C31C
-	map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
+	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
index d46c252be..df13c8c51 100644
--- a/data/maps/events/RecordCorner.inc
+++ b/data/maps/events/RecordCorner.inc
@@ -1,5 +1,5 @@
-RecordCorner_MapObjects:: @ 839139C
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0
+RecordCorner_EventObjects:: @ 839139C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0
 
 RecordCorner_MapWarps:: @ 83913B4
 	warp_def 8, 9, 3, 127, MAP_NONE
@@ -14,4 +14,4 @@ RecordCorner_MapCoordEvents:: @ 83913D4
 	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457
 
 RecordCorner_MapEvents:: @ 8391414
-	map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
+	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
index b19dc1cf0..150972393 100644
--- a/data/maps/events/Route101.inc
+++ b/data/maps/events/Route101.inc
@@ -1,10 +1,10 @@
-Route101_MapObjects:: @ 83810BC
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
-	object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0
-	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
+Route101_EventObjects:: @ 83810BC
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
+	object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
 
 Route101_MapCoordEvents:: @ 838114C
 	coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
@@ -21,4 +21,4 @@ Route101_MapBGEvents:: @ 83811DC
 	bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76
 
 Route101_MapEvents:: @ 83811E8
-	map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
+	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
index 2736c7a61..69b31d3f6 100644
--- a/data/maps/events/Route102.inc
+++ b/data/maps/events/Route102.inc
@@ -1,17 +1,17 @@
-Route102_MapObjects:: @ 83811FC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 18, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route102_EventScript_14EADA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 14, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EAFE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
+Route102_EventObjects:: @ 83811FC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route102_EventScript_14EADA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 0, 14, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EAFE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
 
 Route102_MapBGEvents:: @ 83812D4
 	bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC
 	bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3
 
 Route102_MapEvents:: @ 83812EC
-	map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents
+	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
index abe48ad20..14d9793ae 100644
--- a/data/maps/events/Route103.inc
+++ b/data/maps/events/Route103.inc
@@ -1,22 +1,22 @@
-Route103_MapObjects:: @ 8381300
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+Route103_EventObjects:: @ 8381300
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 
 Route103_MapBGEvents:: @ 8381468
 	bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
 
 Route103_MapEvents:: @ 8381474
-	map_events Route103_MapObjects, 0x0, 0x0, Route103_MapBGEvents
+	map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
index dfbd27da2..ed2464a79 100644
--- a/data/maps/events/Route104.inc
+++ b/data/maps/events/Route104.inc
@@ -1,36 +1,36 @@
-Route104_MapObjects:: @ 8381488
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 15, 0, 60, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 25, 0, 49, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF42, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 31, 0, 24, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route104_EventScript_14F1A0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0
-	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0
-	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0
-	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0
-	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
+Route104_EventObjects:: @ 8381488
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 0, 60, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 0, 49, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF42, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 0, 24, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route104_EventScript_14F1A0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0
+	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0
+	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0
+	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0
+	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0
+	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
 
 Route104_MapWarps:: @ 8381788
 	warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
@@ -55,4 +55,4 @@ Route104_MapBGEvents:: @ 83817C8
 	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58
 
 Route104_MapEvents:: @ 8381840
-	map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents
+	map_events Route104_EventObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
index d77b2977a..d05078627 100644
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ b/data/maps/events/Route104_MrBrineysHouse.inc
@@ -1,10 +1,10 @@
-Route104_MrBrineysHouse_MapObjects:: @ 838B654
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0
+Route104_MrBrineysHouse_EventObjects:: @ 838B654
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0
 
 Route104_MrBrineysHouse_MapWarps:: @ 838B684
 	warp_def 5, 8, 0, 0, MAP_ROUTE104
 	warp_def 6, 8, 0, 0, MAP_ROUTE104
 
 Route104_MrBrineysHouse_MapEvents:: @ 838B694
-	map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
+	map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
index c02950add..b9143ccea 100644
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
@@ -1,11 +1,11 @@
-Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0
+Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0
 
 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0
 	warp_def 2, 8, 0, 1, MAP_ROUTE104
 	warp_def 3, 8, 0, 1, MAP_ROUTE104
 
 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700
-	map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
+	map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc
index 80dcf5108..af0e79f4e 100644
--- a/data/maps/events/Route104_Prototype.inc
+++ b/data/maps/events/Route104_Prototype.inc
@@ -1,16 +1,16 @@
-Route104_Prototype_MapObjects:: @ 8391F2C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 27, 0, 9, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D2E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 9, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 10, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 25, 0, 21, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D7B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 30, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D92, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 34, 0, 2, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route104_Prototype_EventScript_160DA9, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_1, 0, 17, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0
+Route104_Prototype_EventObjects:: @ 8391F2C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 0, 9, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D2E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 9, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 10, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 0, 21, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D7B, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 0, 30, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D92, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 0, 2, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route104_Prototype_EventScript_160DA9, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0
 
 Route104_Prototype_MapWarps:: @ 839204C
 	warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP
@@ -20,4 +20,4 @@ Route104_Prototype_MapBGEvents:: @ 8392054
 	bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25
 
 Route104_Prototype_MapEvents:: @ 839206C
-	map_events Route104_Prototype_MapObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents
+	map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
index 4ec99895c..dfa37cf93 100644
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
@@ -1,9 +1,9 @@
-Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0
+Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0
 
 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098
 	warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
 	warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
 
 Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8
-	map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0
+	map_events Route104_PrototypePrettyPetalFlowerShop_EventObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
index 5707106bd..dd360d1ef 100644
--- a/data/maps/events/Route105.inc
+++ b/data/maps/events/Route105.inc
@@ -1,10 +1,10 @@
-Route105_MapObjects:: @ 8381854
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 60, 0, 1, 10, 0, 0, 1, 0, 6, 0, Route105_EventScript_14F2D2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0
+Route105_EventObjects:: @ 8381854
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 0, 60, 0, 1, 10, 0, 0, 1, 0, 6, 0, Route105_EventScript_14F2D2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0
 
 Route105_MapWarps:: @ 83818E4
 	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
@@ -13,4 +13,4 @@ Route105_MapBGEvents:: @ 83818EC
 	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59
 
 Route105_MapEvents:: @ 83818F8
-	map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
+	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
index 7c326ceea..067d514c9 100644
--- a/data/maps/events/Route106.inc
+++ b/data/maps/events/Route106.inc
@@ -1,9 +1,9 @@
-Route106_MapObjects:: @ 838190C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 29, 0, 11, 0, 1, 27, 4, 0, 1, 0, 3, 0, Route106_EventScript_14F338, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0
+Route106_EventObjects:: @ 838190C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 0, 11, 0, 1, 27, 4, 0, 1, 0, 3, 0, Route106_EventScript_14F338, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0
 
 Route106_MapWarps:: @ 8381984
 	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
@@ -15,4 +15,4 @@ Route106_MapBGEvents:: @ 838198C
 	bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F
 
 Route106_MapEvents:: @ 83819BC
-	map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
+	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
index 363414c2f..70d3a3ba1 100644
--- a/data/maps/events/Route107.inc
+++ b/data/maps/events/Route107.inc
@@ -1,10 +1,10 @@
-Route107_MapObjects:: @ 83819D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 27, 0, 10, 0, 1, 24, 17, 0, 1, 0, 3, 0, Route107_EventScript_14F3BC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 38, 0, 11, 0, 1, 52, 38, 0, 1, 0, 2, 0, Route107_EventScript_14F3D3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 50, 0, 6, 0, 1, 14, 0, 0, 1, 0, 3, 0, Route107_EventScript_14F411, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 16, 0, 11, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route107_EventScript_14F428, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F43F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F45A, 0, 0, 0
+Route107_EventObjects:: @ 83819D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 0, 10, 0, 1, 24, 17, 0, 1, 0, 3, 0, Route107_EventScript_14F3BC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 0, 11, 0, 1, 52, 38, 0, 1, 0, 2, 0, Route107_EventScript_14F3D3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 0, 6, 0, 1, 14, 0, 0, 1, 0, 3, 0, Route107_EventScript_14F411, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 0, 11, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route107_EventScript_14F428, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F43F, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F45A, 0, 0, 0
 
 Route107_MapEvents:: @ 8381A60
-	map_events Route107_MapObjects, 0x0, 0x0, 0x0
+	map_events Route107_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
index 7b6471080..6f21cd23e 100644
--- a/data/maps/events/Route108.inc
+++ b/data/maps/events/Route108.inc
@@ -1,8 +1,8 @@
-Route108_MapObjects:: @ 8381A74
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 13, 0, 1, 45, 51, 0, 1, 0, 3, 0, Route108_EventScript_14F476, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 8, 0, 6, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route108_EventScript_14F4A4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 50, 0, 10, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route108_EventScript_14F48D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0
+Route108_EventObjects:: @ 8381A74
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 0, 13, 0, 1, 45, 51, 0, 1, 0, 3, 0, Route108_EventScript_14F476, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 0, 6, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route108_EventScript_14F4A4, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 0, 10, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route108_EventScript_14F48D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0
 
 Route108_MapWarps:: @ 8381AD4
 	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
@@ -11,4 +11,4 @@ Route108_MapBGEvents:: @ 8381ADC
 	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56
 
 Route108_MapEvents:: @ 8381AE8
-	map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
+	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
index 95a635a6e..836ed7690 100644
--- a/data/maps/events/Route109.inc
+++ b/data/maps/events/Route109.inc
@@ -1,24 +1,24 @@
-Route109_MapObjects:: @ 8381AFC
-	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 14, 0, 11, 0, 4, 8, 0, 0, 1, 0, 1, 0, Route109_EventScript_14F7F2, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0
-	object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 24, 0, 17, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F70E, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 25, 0, 17, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F725, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 30, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F776, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8E5, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_5, 0, 9, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8CA, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F77F, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0
+Route109_EventObjects:: @ 8381AFC
+	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 0, 11, 0, 4, 8, 0, 0, 1, 0, 1, 0, Route109_EventScript_14F7F2, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0
+	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 0, 17, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F70E, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 0, 17, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F725, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F776, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8E5, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8CA, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F77F, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0
 
 Route109_MapWarps:: @ 8381CDC
 	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
@@ -34,4 +34,4 @@ Route109_MapBGEvents:: @ 8381CE4
 	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B
 
 Route109_MapEvents:: @ 8381D44
-	map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
+	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc
index abaf7abcc..a63f97429 100644
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ b/data/maps/events/Route109_SeashoreHouse.inc
@@ -1,12 +1,12 @@
-Route109_SeashoreHouse_MapObjects:: @ 83920BC
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EB8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 14, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EEE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0
+Route109_SeashoreHouse_EventObjects:: @ 83920BC
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EB8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EEE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0
 
 Route109_SeashoreHouse_MapWarps:: @ 839211C
 	warp_def 6, 9, 0, 0, MAP_ROUTE109
 	warp_def 7, 9, 0, 0, MAP_ROUTE109
 
 Route109_SeashoreHouse_MapEvents:: @ 839212C
-	map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
+	map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
index 436b44e56..f1551d3c7 100644
--- a/data/maps/events/Route110.inc
+++ b/data/maps/events/Route110.inc
@@ -1,35 +1,35 @@
-Route110_MapObjects:: @ 8381D58
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 17, 0, 90, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 0, 79, 0, 4, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 14, 0, 69, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route110_EventScript_14F9C2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 0, 57, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 0, 24, 0, 4, 2, 49, 0, 0, 0, 0, 0, Route110_EventScript_14F9A7, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_3, 0, 15, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F99E, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 0, 73, 0, 4, 49, 226, 0, 1, 0, 3, 0, Route110_EventScript_14FB7D, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 31, 0, 4, 51, 26, 0, 1, 0, 3, 0, Route110_EventScript_14FB28, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 0, 31, 0, 4, 9, 17, 0, 1, 0, 4, 0, Route110_EventScript_14FB94, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 0, 55, 0, 4, 45, 68, 0, 1, 0, 3, 0, Route110_EventScript_14FB3F, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 5, 0, 39, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FA8E, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0
-	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 23, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 24, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 25, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 26, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0
-	object_event 29, MAP_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0
-	object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0
+Route110_EventObjects:: @ 8381D58
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 0, 90, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 0, 79, 0, 4, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 0, 69, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route110_EventScript_14F9C2, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 0, 57, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 0, 24, 0, 4, 2, 49, 0, 0, 0, 0, 0, Route110_EventScript_14F9A7, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F99E, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 0, 73, 0, 4, 49, 226, 0, 1, 0, 3, 0, Route110_EventScript_14FB7D, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 31, 0, 4, 51, 26, 0, 1, 0, 3, 0, Route110_EventScript_14FB28, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 0, 31, 0, 4, 9, 17, 0, 1, 0, 4, 0, Route110_EventScript_14FB94, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 0, 55, 0, 4, 45, 68, 0, 1, 0, 3, 0, Route110_EventScript_14FB3F, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 0, 39, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FA8E, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0
+	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
+	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0
+	object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0
+	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0
 
 Route110_MapWarps:: @ 8382040
 	warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
@@ -66,4 +66,4 @@ Route110_MapBGEvents:: @ 83820C0
 	bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6
 
 Route110_MapEvents:: @ 838218C
-	map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
+	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
index 4be4faaf3..86bbbe54f 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -1,5 +1,5 @@
-Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0
+Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0
 
 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4
 	warp_def 1, 5, 0, 2, MAP_ROUTE110
@@ -12,4 +12,4 @@ Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4
 	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A
 
 Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04
-	map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0
+	map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
index 68d3e1f4c..743f5a749 100644
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -1,5 +1,5 @@
-Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0
+Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0
 
 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58
 	warp_def 1, 5, 0, 4, MAP_ROUTE110
@@ -12,4 +12,4 @@ Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78
 	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD
 
 Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98
-	map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0
+	map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
index ee4e5952e..02aa4e7d8 100644
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ b/data/maps/events/Route110_TrickHouseEnd.inc
@@ -1,5 +1,5 @@
-Route110_TrickHouseEnd_MapObjects:: @ 83921D0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0
+Route110_TrickHouseEnd_EventObjects:: @ 83921D0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0
 
 Route110_TrickHouseEnd_MapWarps:: @ 83921E8
 	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
@@ -12,4 +12,4 @@ Route110_TrickHouseEnd_MapBGEvents:: @ 8392208
 	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1
 
 Route110_TrickHouseEnd_MapEvents:: @ 8392214
-	map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
+	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
index 903d893c3..e6a259fa0 100644
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ b/data/maps/events/Route110_TrickHouseEntrance.inc
@@ -1,5 +1,5 @@
-Route110_TrickHouseEntrance_MapObjects:: @ 8392140
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0
+Route110_TrickHouseEntrance_EventObjects:: @ 8392140
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0
 
 Route110_TrickHouseEntrance_MapWarps:: @ 8392158
 	warp_def 5, 7, 3, 1, MAP_ROUTE110
@@ -16,4 +16,4 @@ Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0
 	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A
 
 Route110_TrickHouseEntrance_MapEvents:: @ 83921BC
-	map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
+	map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
index 61ae942ee..14da678f7 100644
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle1.inc
@@ -1,23 +1,23 @@
-Route110_TrickHousePuzzle1_MapObjects:: @ 839225C
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0
-	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0
-	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0
+Route110_TrickHousePuzzle1_EventObjects:: @ 839225C
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0
+	object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0
+	object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0
 
 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -28,4 +28,4 @@ Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C
 	bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14
 
 Route110_TrickHousePuzzle1_MapEvents:: @ 8392448
-	map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
+	map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
index 7adf7b9d2..9f3aa4a9d 100644
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle2.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle2_MapObjects:: @ 839245C
-	object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0
+Route110_TrickHousePuzzle2_EventObjects:: @ 839245C
+	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0
 
 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -20,4 +20,4 @@ Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C
 	bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3
 
 Route110_TrickHousePuzzle2_MapEvents:: @ 8392538
-	map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
+	map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
index 25381fba6..4e9daf8f0 100644
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle3.inc
@@ -1,15 +1,15 @@
-Route110_TrickHousePuzzle3_MapObjects:: @ 839254C
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+Route110_TrickHousePuzzle3_EventObjects:: @ 839254C
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
 
 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -29,4 +29,4 @@ Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC
 	bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB
 
 Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8
-	map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
+	map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
index 6c630a082..b5e522344 100644
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle4.inc
@@ -1,19 +1,19 @@
-Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
-	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
+Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
+	object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
 
 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -24,4 +24,4 @@ Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C
 	bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E
 
 Route110_TrickHousePuzzle4_MapEvents:: @ 8392888
-	map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
+	map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc
index 3c628eabf..6812ed8f8 100644
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle5.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle5_MapObjects:: @ 839289C
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0
+Route110_TrickHousePuzzle5_EventObjects:: @ 839289C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0
 
 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -30,4 +30,4 @@ Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C
 	bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5
 
 Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18
-	map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
+	map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
index f01d5783d..78fa808ce 100644
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle6.inc
@@ -1,8 +1,8 @@
-Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0
+Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0
 
 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -13,4 +13,4 @@ Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4
 	bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA
 
 Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0
-	map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
+	map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
index 9468d51bd..7a527f8b7 100644
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle7.inc
@@ -1,8 +1,8 @@
-Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0
+Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0
 
 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -21,4 +21,4 @@ Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C
 	bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375
 
 Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94
-	map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
+	map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
index 2df410599..49da61b03 100644
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/events/Route110_TrickHousePuzzle8.inc
@@ -1,8 +1,8 @@
-Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0
+Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0
 
 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08
 	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
@@ -13,4 +13,4 @@ Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20
 	bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C
 
 Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C
-	map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
+	map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
index ef205af37..c4cd6e3df 100644
--- a/data/maps/events/Route111.inc
+++ b/data/maps/events/Route111.inc
@@ -1,40 +1,40 @@
-Route111_MapObjects:: @ 83821A0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0
-	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
-	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0
-	object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0
-	object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0
-	object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0
+Route111_EventObjects:: @ 83821A0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0
+	object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0
+	object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0
+	object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0
 
 Route111_MapWarps:: @ 8382500
 	warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE
@@ -97,4 +97,4 @@ Route111_MapBGEvents:: @ 8382738
 	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39
 
 Route111_MapEvents:: @ 8382804
-	map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
+	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc
index fbd9b7ab1..235fe9f3c 100644
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ b/data/maps/events/Route111_OldLadysRestStop.inc
@@ -1,9 +1,9 @@
-Route111_OldLadysRestStop_MapObjects:: @ 838B798
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0
+Route111_OldLadysRestStop_EventObjects:: @ 838B798
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0
 
 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0
 	warp_def 3, 7, 0, 2, MAP_ROUTE111
 	warp_def 4, 7, 0, 2, MAP_ROUTE111
 
 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0
-	map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
+	map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc
index ef2286c97..895077e0a 100644
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc
@@ -1,12 +1,12 @@
-Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 1, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0
+Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 1, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0
 
 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774
 	warp_def 3, 7, 0, 0, MAP_ROUTE111
 	warp_def 4, 7, 0, 0, MAP_ROUTE111
 
 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784
-	map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
+	map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
index 2169e4d34..8fa72c854 100644
--- a/data/maps/events/Route112.inc
+++ b/data/maps/events/Route112.inc
@@ -1,16 +1,16 @@
-Route112_MapObjects:: @ 8382818
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0
+Route112_EventObjects:: @ 8382818
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0
 
 Route112_MapWarps:: @ 8382938
 	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
@@ -26,4 +26,4 @@ Route112_MapBGEvents:: @ 8382968
 	bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537
 
 Route112_MapEvents:: @ 838298C
-	map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
+	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc
index cc2dfa38a..37d9736f7 100644
--- a/data/maps/events/Route112_CableCarStation.inc
+++ b/data/maps/events/Route112_CableCarStation.inc
@@ -1,10 +1,10 @@
-Route112_CableCarStation_MapObjects:: @ 838B7D4
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+Route112_CableCarStation_EventObjects:: @ 838B7D4
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 Route112_CableCarStation_MapWarps:: @ 838B804
 	warp_def 6, 11, 0, 0, MAP_ROUTE112
 	warp_def 7, 11, 0, 1, MAP_ROUTE112
 
 Route112_CableCarStation_MapEvents:: @ 838B814
-	map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
+	map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
index 1b895d571..12d506346 100644
--- a/data/maps/events/Route113.inc
+++ b/data/maps/events/Route113.inc
@@ -1,15 +1,15 @@
-Route113_MapObjects:: @ 83829A0
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route113_EventScript_15060E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 36, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route113_EventScript_150605, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0
+Route113_EventObjects:: @ 83829A0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route113_EventScript_15060E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route113_EventScript_150605, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0
 
 Route113_MapWarps:: @ 8382AA8
 	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
@@ -45,4 +45,4 @@ Route113_MapBGEvents:: @ 8382BE0
 	bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E
 
 Route113_MapEvents:: @ 8382C34
-	map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
+	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc
index 74953c4da..6bf6ebfcb 100644
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ b/data/maps/events/Route113_GlassWorkshop.inc
@@ -1,10 +1,10 @@
-Route113_GlassWorkshop_MapObjects:: @ 8392D18
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0
+Route113_GlassWorkshop_EventObjects:: @ 8392D18
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0
 
 Route113_GlassWorkshop_MapWarps:: @ 8392D48
 	warp_def 3, 8, 0, 0, MAP_ROUTE113
 	warp_def 4, 8, 0, 0, MAP_ROUTE113
 
 Route113_GlassWorkshop_MapEvents:: @ 8392D58
-	map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
+	map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
index 0687dc0e9..d5fed2373 100644
--- a/data/maps/events/Route114.inc
+++ b/data/maps/events/Route114.inc
@@ -1,27 +1,27 @@
-Route114_MapObjects:: @ 8382C48
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
+Route114_EventObjects:: @ 8382C48
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
 
 Route114_MapWarps:: @ 8382E70
 	warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R
@@ -43,4 +43,4 @@ Route114_MapBGEvents:: @ 8382E88
 	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A
 
 Route114_MapEvents:: @ 8382F18
-	map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
+	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc
index 01fc6106f..0ff682a0b 100644
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ b/data/maps/events/Route114_FossilManiacsHouse.inc
@@ -1,5 +1,5 @@
-Route114_FossilManiacsHouse_MapObjects:: @ 838B87C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0
+Route114_FossilManiacsHouse_EventObjects:: @ 838B87C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0
 
 Route114_FossilManiacsHouse_MapWarps:: @ 838B894
 	warp_def 4, 7, 0, 1, MAP_ROUTE114
@@ -13,4 +13,4 @@ Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC
 	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205
 
 Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC
-	map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
+	map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc
index 259445d43..4df9b62a9 100644
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/events/Route114_FossilManiacsTunnel.inc
@@ -1,9 +1,9 @@
-Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0
+Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0
 
 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908
 	warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
 	warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
 
 Route114_FossilManiacsTunnel_MapEvents:: @ 838B918
-	map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0
+	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
index 3c14720a6..bdf111faf 100644
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ b/data/maps/events/Route114_LanettesHouse.inc
@@ -1,5 +1,5 @@
-Route114_LanettesHouse_MapObjects:: @ 838B92C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0
+Route114_LanettesHouse_EventObjects:: @ 838B92C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0
 
 Route114_LanettesHouse_MapWarps:: @ 838B944
 	warp_def 5, 7, 0, 2, MAP_ROUTE114
@@ -11,4 +11,4 @@ Route114_LanettesHouse_MapBGEvents:: @ 838B954
 	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5
 
 Route114_LanettesHouse_MapEvents:: @ 838B978
-	map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
+	map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
index 157dd82eb..a93da1cdb 100644
--- a/data/maps/events/Route115.inc
+++ b/data/maps/events/Route115.inc
@@ -1,20 +1,20 @@
-Route115_MapObjects:: @ 8382F2C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0
+Route115_EventObjects:: @ 8382F2C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0
 
 Route115_MapWarps:: @ 83830AC
 	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
@@ -36,4 +36,4 @@ Route115_MapBGEvents:: @ 83830B4
 	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61
 
 Route115_MapEvents:: @ 838315C
-	map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
+	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
index ff5ad2643..e3ee5f9d0 100644
--- a/data/maps/events/Route116.inc
+++ b/data/maps/events/Route116.inc
@@ -1,26 +1,26 @@
-Route116_MapObjects:: @ 8383170
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0
-	object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0
+Route116_EventObjects:: @ 8383170
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0
+	object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0
 
 Route116_MapWarps:: @ 8383380
 	warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL
@@ -44,4 +44,4 @@ Route116_MapBGEvents:: @ 83833A8
 	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES
 
 Route116_MapEvents:: @ 838342C
-	map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
+	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc
index 2676d7a68..c0ef4d054 100644
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ b/data/maps/events/Route116_TunnelersRestHouse.inc
@@ -1,11 +1,11 @@
-Route116_TunnelersRestHouse_MapObjects:: @ 838B98C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0
+Route116_TunnelersRestHouse_EventObjects:: @ 838B98C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0
 
 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4
 	warp_def 4, 8, 0, 1, MAP_ROUTE116
 	warp_def 5, 8, 0, 1, MAP_ROUTE116
 
 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4
-	map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
+	map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
index ff5c81ead..d13b30d75 100644
--- a/data/maps/events/Route117.inc
+++ b/data/maps/events/Route117.inc
@@ -1,25 +1,25 @@
-Route117_MapObjects:: @ 8383440
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 13, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_150D57, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 26, 0, 13, 0, 3, 33, 34, 0, 0, 0, 0, 0, Route117_EventScript_150D60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 47, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B222D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON, 0, 33, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 39, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 42, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 49, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 45, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150E9C, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0
+Route117_EventObjects:: @ 8383440
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_150D57, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 0, 13, 0, 3, 33, 34, 0, 0, 0, 0, 0, Route117_EventScript_150D60, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B222D, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150E9C, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0
 
 Route117_MapWarps:: @ 8383638
 	warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE
@@ -31,4 +31,4 @@ Route117_MapBGEvents:: @ 8383640
 	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48
 
 Route117_MapEvents:: @ 8383670
-	map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
+	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc
index b1df05d06..6d322f446 100644
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ b/data/maps/events/Route117_PokemonDayCare.inc
@@ -1,9 +1,9 @@
-Route117_PokemonDayCare_MapObjects:: @ 838B9F8
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0
+Route117_PokemonDayCare_EventObjects:: @ 838B9F8
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0
 
 Route117_PokemonDayCare_MapWarps:: @ 838BA10
 	warp_def 2, 8, 0, 0, MAP_ROUTE117
 	warp_def 3, 8, 0, 0, MAP_ROUTE117
 
 Route117_PokemonDayCare_MapEvents:: @ 838BA20
-	map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
+	map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
index 4d4e3ea9a..71a4797ce 100644
--- a/data/maps/events/Route118.inc
+++ b/data/maps/events/Route118.inc
@@ -1,24 +1,24 @@
-Route118_MapObjects:: @ 8383684
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0
+Route118_EventObjects:: @ 8383684
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0
 
 Route118_MapCoordEvents:: @ 8383864
 	coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE
@@ -37,4 +37,4 @@ Route118_MapBGEvents:: @ 8383894
 	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42
 
 Route118_MapEvents:: @ 8383900
-	map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents
+	map_events Route118_EventObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
index 2abacdf27..518c540c7 100644
--- a/data/maps/events/Route119.inc
+++ b/data/maps/events/Route119.inc
@@ -1,41 +1,41 @@
-Route119_MapObjects:: @ 8383914
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_CAMPER, 0, 7, 0, 74, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route119_EventScript_1514BF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 116, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151435, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 35, 0, 83, 0, 4, 8, 0, 0, 1, 0, 2, 0, Route119_EventScript_1514FD, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 34, 0, 122, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_15147A, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 17, 0, 128, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_1514A8, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 28, 0, 16, 0, 3, 57, 0, 0, 1, 0, 2, 0, Route119_EventScript_151569, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0
-	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0
-	object_event 23, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 24, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 25, MAP_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0
-	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0
-	object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0
+Route119_EventObjects:: @ 8383914
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 0, 74, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route119_EventScript_1514BF, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 0, 116, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151435, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 0, 83, 0, 4, 8, 0, 0, 1, 0, 2, 0, Route119_EventScript_1514FD, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 0, 122, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_15147A, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 0, 128, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_1514A8, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 0, 16, 0, 3, 57, 0, 0, 1, 0, 2, 0, Route119_EventScript_151569, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0
+	object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0
+	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0
+	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0
 
 Route119_MapWarps:: @ 8383C8C
 	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
@@ -91,4 +91,4 @@ Route119_MapBGEvents:: @ 8383E2C
 	bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605
 
 Route119_MapEvents:: @ 8383F1C
-	map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
+	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc
index 255913651..12c19d557 100644
--- a/data/maps/events/Route119_House.inc
+++ b/data/maps/events/Route119_House.inc
@@ -1,15 +1,15 @@
-Route119_House_MapObjects:: @ 8392F40
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 1, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 0, 3, 2, 19, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WINGULL, 0, 8, 0, 5, 0, 3, 2, 35, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+Route119_House_EventObjects:: @ 8392F40
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 0, 3, 2, 19, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 0, 5, 0, 3, 2, 35, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
 
 Route119_House_MapWarps:: @ 8392FE8
 	warp_def 3, 8, 0, 1, MAP_ROUTE119
 	warp_def 4, 8, 0, 1, MAP_ROUTE119
 
 Route119_House_MapEvents:: @ 8392FF8
-	map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0
+	map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
index e9933edef..0bacbf151 100644
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_1F.inc
@@ -1,9 +1,9 @@
-Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0
+Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0
 
 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38
 	warp_def 9, 12, 0, 0, MAP_ROUTE119
@@ -17,4 +17,4 @@ Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50
 	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
 
 Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80
-	map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
+	map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
index 2ec794f7f..4af3b5100 100644
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/events/Route119_WeatherInstitute_2F.inc
@@ -1,13 +1,13 @@
-Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
+Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
 
 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24
 	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
 
 Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C
-	map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
+	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
index ac0e527c7..fb40c9aaf 100644
--- a/data/maps/events/Route120.inc
+++ b/data/maps/events/Route120.inc
@@ -1,45 +1,45 @@
-Route120_MapObjects:: @ 8383F30
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0
-	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
-	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
-	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0
-	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0
-	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0
-	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0
-	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0
-	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0
-	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0
-	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0
+Route120_EventObjects:: @ 8383F30
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0
 
 Route120_MapWarps:: @ 8384308
 	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
@@ -83,4 +83,4 @@ Route120_MapBGEvents:: @ 8384448
 	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
 
 Route120_MapEvents:: @ 83844F0
-	map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
+	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
index e799115e5..0921711b0 100644
--- a/data/maps/events/Route121.inc
+++ b/data/maps/events/Route121.inc
@@ -1,26 +1,26 @@
-Route121_MapObjects:: @ 8384504
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+Route121_EventObjects:: @ 8384504
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
 
 Route121_MapWarps:: @ 8384714
 	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
@@ -43,4 +43,4 @@ Route121_MapBGEvents:: @ 838475C
 	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49
 
 Route121_MapEvents:: @ 83847C8
-	map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
+	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc
index 59b0a37d9..79d8762ba 100644
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ b/data/maps/events/Route121_SafariZoneEntrance.inc
@@ -1,7 +1,7 @@
-Route121_SafariZoneEntrance_MapObjects:: @ 838BA34
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 17, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+Route121_SafariZoneEntrance_EventObjects:: @ 838BA34
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C
 	warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST
@@ -16,4 +16,4 @@ Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC
 	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487
 
 Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8
-	map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
+	map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
index 3c50254cb..9adacca40 100644
--- a/data/maps/events/Route123.inc
+++ b/data/maps/events/Route123.inc
@@ -1,38 +1,38 @@
-Route123_MapObjects:: @ 83847F8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0
-	object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0
+Route123_EventObjects:: @ 83847F8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0
+	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
+	object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0
+	object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0
+	object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0
+	object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0
+	object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0
+	object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0
 
 Route123_MapWarps:: @ 8384B28
 	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
@@ -73,4 +73,4 @@ Route123_MapBGEvents:: @ 8384C90
 	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A
 
 Route123_MapEvents:: @ 8384CFC
-	map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
+	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc
index a17a04e19..9a1f7be68 100644
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ b/data/maps/events/Route123_BerryMastersHouse.inc
@@ -1,10 +1,10 @@
-Route123_BerryMastersHouse_MapObjects:: @ 8392D6C
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0
+Route123_BerryMastersHouse_EventObjects:: @ 8392D6C
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0
 
 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C
 	warp_def 3, 7, 0, 0, MAP_ROUTE123
 	warp_def 4, 7, 0, 0, MAP_ROUTE123
 
 Route123_BerryMastersHouse_MapEvents:: @ 8392DAC
-	map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
+	map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
index eb92f81a4..336d84d6b 100644
--- a/data/maps/events/Route124.inc
+++ b/data/maps/events/Route124.inc
@@ -1,14 +1,14 @@
-Route124_MapObjects:: @ 8384D10
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 58, 0, 59, 0, 1, 1, 5, 0, 1, 0, 3, 0, Route124_EventScript_151DF8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 25, 0, 1, 52, 53, 0, 1, 0, 3, 0, Route124_EventScript_151E0F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0
+Route124_EventObjects:: @ 8384D10
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 0, 59, 0, 1, 1, 5, 0, 1, 0, 3, 0, Route124_EventScript_151DF8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 0, 25, 0, 1, 52, 53, 0, 1, 0, 3, 0, Route124_EventScript_151E0F, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0
 
 Route124_MapWarps:: @ 8384E00
 	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
@@ -17,4 +17,4 @@ Route124_MapBGEvents:: @ 8384E08
 	bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF
 
 Route124_MapEvents:: @ 8384E14
-	map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
+	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
index 17ec713de..5f67d09e3 100644
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
@@ -1,5 +1,5 @@
-Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0
+Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0
 
 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024
 	warp_def 3, 8, 0, 0, MAP_ROUTE124
@@ -9,4 +9,4 @@ Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034
 	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335
 
 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040
-	map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
+	map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
index 82767393d..348275707 100644
--- a/data/maps/events/Route125.inc
+++ b/data/maps/events/Route125.inc
@@ -1,11 +1,11 @@
-Route125_MapObjects:: @ 8384E28
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 46, 0, 9, 0, 1, 23, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F2E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 9, 0, 32, 0, 1, 10, 82, 0, 1, 0, 2, 0, Route125_EventScript_151F45, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 31, 0, 33, 0, 1, 28, 6, 0, 1, 0, 3, 0, Route125_EventScript_151F5C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 39, 0, 20, 0, 1, 52, 153, 0, 1, 0, 3, 0, Route125_EventScript_151F73, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 28, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F8A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 20, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FC8, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0
+Route125_EventObjects:: @ 8384E28
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 0, 9, 0, 1, 23, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F2E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 0, 32, 0, 1, 10, 82, 0, 1, 0, 2, 0, Route125_EventScript_151F45, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 0, 33, 0, 1, 28, 6, 0, 1, 0, 3, 0, Route125_EventScript_151F5C, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 0, 20, 0, 1, 52, 153, 0, 1, 0, 3, 0, Route125_EventScript_151F73, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 0, 28, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F8A, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FC8, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0
 
 Route125_MapWarps:: @ 8384ED0
 	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
@@ -17,4 +17,4 @@ Route125_MapBGEvents:: @ 8384ED8
 	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
 
 Route125_MapEvents:: @ 8384F08
-	map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
+	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
index a8855c41f..fafbb0b5f 100644
--- a/data/maps/events/Route126.inc
+++ b/data/maps/events/Route126.inc
@@ -1,9 +1,9 @@
-Route126_MapObjects:: @ 8384F1C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 55, 0, 22, 0, 1, 51, 58, 0, 1, 0, 3, 0, Route126_EventScript_15200E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0
+Route126_EventObjects:: @ 8384F1C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 0, 22, 0, 1, 51, 58, 0, 1, 0, 3, 0, Route126_EventScript_15200E, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0
 
 Route126_MapEvents:: @ 8384F94
-	map_events Route126_MapObjects, 0x0, 0x0, 0x0
+	map_events Route126_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
index 6b3d396c9..352336fb1 100644
--- a/data/maps/events/Route127.inc
+++ b/data/maps/events/Route127.inc
@@ -1,13 +1,13 @@
-Route127_MapObjects:: @ 8384FA8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 18, 0, 3, 24, 17, 0, 1, 0, 2, 0, Route127_EventScript_152104, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0
+Route127_EventObjects:: @ 8384FA8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 0, 18, 0, 3, 24, 17, 0, 1, 0, 2, 0, Route127_EventScript_152104, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0
 
 Route127_MapBGEvents:: @ 8385080
 	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
@@ -17,4 +17,4 @@ Route127_MapBGEvents:: @ 8385080
 	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
 
 Route127_MapEvents:: @ 83850BC
-	map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents
+	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
index 2bef2e3ed..4da9598fa 100644
--- a/data/maps/events/Route128.inc
+++ b/data/maps/events/Route128.inc
@@ -1,12 +1,12 @@
-Route128_MapObjects:: @ 83850D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0
+Route128_EventObjects:: @ 83850D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0
 
 Route128_MapBGEvents:: @ 8385190
 	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C
@@ -14,4 +14,4 @@ Route128_MapBGEvents:: @ 8385190
 	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E
 
 Route128_MapEvents:: @ 83851B4
-	map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents
+	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
index 10716b557..c17118f50 100644
--- a/data/maps/events/Route129.inc
+++ b/data/maps/events/Route129.inc
@@ -1,8 +1,8 @@
-Route129_MapObjects:: @ 83851C8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 15, 0, 23, 0, 1, 50, 67, 0, 1, 0, 3, 0, Route129_EventScript_152366, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 9, 0, 1, 52, 37, 0, 1, 0, 2, 0, Route129_EventScript_15237D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 14, 0, 1, 1, 17, 0, 1, 0, 2, 0, Route129_EventScript_1523AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 28, 0, 16, 0, 1, 24, 17, 0, 1, 0, 2, 0, Route129_EventScript_152394, 0, 0, 0
+Route129_EventObjects:: @ 83851C8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 0, 23, 0, 1, 50, 67, 0, 1, 0, 3, 0, Route129_EventScript_152366, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 0, 9, 0, 1, 52, 37, 0, 1, 0, 2, 0, Route129_EventScript_15237D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 0, 14, 0, 1, 1, 17, 0, 1, 0, 2, 0, Route129_EventScript_1523AB, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 0, 16, 0, 1, 24, 17, 0, 1, 0, 2, 0, Route129_EventScript_152394, 0, 0, 0
 
 Route129_MapEvents:: @ 8385228
-	map_events Route129_MapObjects, 0x0, 0x0, 0x0
+	map_events Route129_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
index 027519c2d..734d99eea 100644
--- a/data/maps/events/Route130.inc
+++ b/data/maps/events/Route130.inc
@@ -1,7 +1,7 @@
-Route130_MapObjects:: @ 838523C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0
+Route130_EventObjects:: @ 838523C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0
 
 Route130_MapEvents:: @ 8385284
-	map_events Route130_MapObjects, 0x0, 0x0, 0x0
+	map_events Route130_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
index d387233d2..b33b43415 100644
--- a/data/maps/events/Route131.inc
+++ b/data/maps/events/Route131.inc
@@ -1,13 +1,13 @@
-Route131_MapObjects:: @ 8385298
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 25, 0, 1, 29, 117, 0, 1, 0, 3, 0, Route131_EventScript_152452, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 36, 0, 26, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route131_EventScript_152469, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 28, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route131_EventScript_152480, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 23, 0, 1, 47, 65, 0, 1, 0, 3, 0, Route131_EventScript_152497, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524AE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0
+Route131_EventObjects:: @ 8385298
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 0, 25, 0, 1, 29, 117, 0, 1, 0, 3, 0, Route131_EventScript_152452, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 0, 26, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route131_EventScript_152469, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 0, 28, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route131_EventScript_152480, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 0, 23, 0, 1, 47, 65, 0, 1, 0, 3, 0, Route131_EventScript_152497, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524AE, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0
 
 Route131_MapWarps:: @ 8385328
 	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
 
 Route131_MapEvents:: @ 8385330
-	map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0
+	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
index 97fc3d5db..592012ef1 100644
--- a/data/maps/events/Route132.inc
+++ b/data/maps/events/Route132.inc
@@ -1,9 +1,9 @@
-Route132_MapObjects:: @ 8385344
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0
+Route132_EventObjects:: @ 8385344
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0
 
 Route132_MapEvents:: @ 83853BC
-	map_events Route132_MapObjects, 0x0, 0x0, 0x0
+	map_events Route132_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
index 3d73ef1c9..78d6ff077 100644
--- a/data/maps/events/Route133.inc
+++ b/data/maps/events/Route133.inc
@@ -1,11 +1,11 @@
-Route133_MapObjects:: @ 83853D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0
+Route133_EventObjects:: @ 83853D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0
 
 Route133_MapEvents:: @ 8385478
-	map_events Route133_MapObjects, 0x0, 0x0, 0x0
+	map_events Route133_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
index a8d2eb030..f2465c521 100644
--- a/data/maps/events/Route134.inc
+++ b/data/maps/events/Route134.inc
@@ -1,9 +1,9 @@
-Route134_MapObjects:: @ 838548C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 52, 0, 9, 0, 1, 49, 83, 0, 1, 0, 2, 0, Route134_EventScript_1525C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 5, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route134_EventScript_1525DB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 41, 0, 23, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route134_EventScript_152609, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 65, 0, 14, 0, 3, 18, 0, 0, 1, 0, 2, 0, Route134_EventScript_1525F2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 56, 0, 16, 0, 3, 27, 10, 0, 1, 0, 3, 0, Route134_EventScript_152620, 0, 0, 0
+Route134_EventObjects:: @ 838548C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 0, 9, 0, 1, 49, 83, 0, 1, 0, 2, 0, Route134_EventScript_1525C4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 0, 5, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route134_EventScript_1525DB, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 0, 23, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route134_EventScript_152609, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 0, 14, 0, 3, 18, 0, 0, 1, 0, 2, 0, Route134_EventScript_1525F2, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 0, 16, 0, 3, 27, 10, 0, 1, 0, 3, 0, Route134_EventScript_152620, 0, 0, 0
 
 Route134_MapEvents:: @ 8385504
-	map_events Route134_MapObjects, 0x0, 0x0, 0x0
+	map_events Route134_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
index 64a1d1a66..dc53800a1 100644
--- a/data/maps/events/RustboroCity.inc
+++ b/data/maps/events/RustboroCity.inc
@@ -1,18 +1,18 @@
-RustboroCity_MapObjects:: @ 837FD14
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 22, 0, 34, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C386, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 25, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 0, 46, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3F8, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0
+RustboroCity_EventObjects:: @ 837FD14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 0, 34, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3B1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C386, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 0, 46, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3F8, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0
 
 RustboroCity_MapWarps:: @ 837FE64
 	warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
@@ -56,4 +56,4 @@ RustboroCity_MapBGEvents:: @ 837FF94
 	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440
 
 RustboroCity_MapEvents:: @ 838000C
-	map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
+	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc
index e26127f38..7b4728217 100644
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ b/data/maps/events/RustboroCity_CuttersHouse.inc
@@ -1,10 +1,10 @@
-RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0
+RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0
 
 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC
 	warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY
 	warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY
 
 RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC
-	map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
+	map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc
index 165089ee7..89bc65aa4 100644
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc
@@ -1,7 +1,7 @@
-RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_7, 0, 15, 0, 5, 0, 3, 2, 18, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0
+RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 0, 5, 0, 3, 2, 18, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0
 
 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854
 	warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY
@@ -9,4 +9,4 @@ RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854
 	warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F
 
 RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C
-	map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc
index 93335d22e..d521dc4b9 100644
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc
@@ -1,13 +1,13 @@
-RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 6, 0, 3, 15, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 5, 0, 3, 7, 160, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0
+RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 6, 0, 3, 15, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 5, 0, 3, 7, 160, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0
 
 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8
 	warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F
 	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F
 
 RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908
-	map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
index 41f37c7b1..d7db2db0a 100644
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc
@@ -1,7 +1,7 @@
-RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
+RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
 
 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964
 	warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F
@@ -11,4 +11,4 @@ RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C
 	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF
 
 RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984
-	map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
+	map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc
index d44df7638..b15ce76d1 100644
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ b/data/maps/events/RustboroCity_Flat1_1F.inc
@@ -1,6 +1,6 @@
-RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0
+RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0
 
 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8
 	warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY
@@ -8,4 +8,4 @@ RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8
 	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F
 
 RustboroCity_Flat1_1F_MapEvents:: @ 8388D00
-	map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc
index 91f1d2f20..e8077080a 100644
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ b/data/maps/events/RustboroCity_Flat1_2F.inc
@@ -1,8 +1,8 @@
-RustboroCity_Flat1_2F_MapObjects:: @ 8388D14
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0
+RustboroCity_Flat1_2F_EventObjects:: @ 8388D14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0
 
 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C
 	warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F
 
 RustboroCity_Flat1_2F_MapEvents:: @ 8388D34
-	map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc
index 17c11b21f..de4ebf9ab 100644
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ b/data/maps/events/RustboroCity_Flat2_1F.inc
@@ -1,6 +1,6 @@
-RustboroCity_Flat2_1F_MapObjects:: @ 8388E44
-	object_event 1, MAP_OBJ_GFX_SKITTY, 0, 11, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0
+RustboroCity_Flat2_1F_EventObjects:: @ 8388E44
+	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0
 
 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74
 	warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY
@@ -8,4 +8,4 @@ RustboroCity_Flat2_1F_MapWarps:: @ 8388E74
 	warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F
 
 RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C
-	map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc
index b881e1bd2..9fa773e7e 100644
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ b/data/maps/events/RustboroCity_Flat2_2F.inc
@@ -1,10 +1,10 @@
-RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 11, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0
+RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0
 
 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0
 	warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F
 	warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F
 
 RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0
-	map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc
index 4a00bb8f4..324296f82 100644
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ b/data/maps/events/RustboroCity_Flat2_3F.inc
@@ -1,9 +1,9 @@
-RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0
+RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0
 
 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24
 	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
 
 RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C
-	map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc
index e77b55b7f..5dd7bcdf3 100644
--- a/data/maps/events/RustboroCity_Gym.inc
+++ b/data/maps/events/RustboroCity_Gym.inc
@@ -1,8 +1,8 @@
-RustboroCity_Gym_MapObjects:: @ 8388998
-	object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157960, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 3, 0, 7, 0, 3, 10, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157977, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0
+RustboroCity_Gym_EventObjects:: @ 8388998
+	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157960, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 0, 7, 0, 3, 10, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157977, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0
 
 RustboroCity_Gym_MapWarps:: @ 83889F8
 	warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY
@@ -13,4 +13,4 @@ RustboroCity_Gym_MapBGEvents:: @ 8388A08
 	bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD
 
 RustboroCity_Gym_MapEvents:: @ 8388A20
-	map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
+	map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc
index a6471da2e..336ce5c71 100644
--- a/data/maps/events/RustboroCity_House1.inc
+++ b/data/maps/events/RustboroCity_House1.inc
@@ -1,10 +1,10 @@
-RustboroCity_House1_MapObjects:: @ 8388D48
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0
+RustboroCity_House1_EventObjects:: @ 8388D48
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0
 
 RustboroCity_House1_MapWarps:: @ 8388D78
 	warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY
 	warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY
 
 RustboroCity_House1_MapEvents:: @ 8388D88
-	map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc
index 5cdb4fc6c..d7940b241 100644
--- a/data/maps/events/RustboroCity_House2.inc
+++ b/data/maps/events/RustboroCity_House2.inc
@@ -1,10 +1,10 @@
-RustboroCity_House2_MapObjects:: @ 8388DF0
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0
+RustboroCity_House2_EventObjects:: @ 8388DF0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0
 
 RustboroCity_House2_MapWarps:: @ 8388E20
 	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
 	warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY
 
 RustboroCity_House2_MapEvents:: @ 8388E30
-	map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc
index 96c2f2699..d2c505b45 100644
--- a/data/maps/events/RustboroCity_House3.inc
+++ b/data/maps/events/RustboroCity_House3.inc
@@ -1,11 +1,11 @@
-RustboroCity_House3_MapObjects:: @ 8388F40
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0
+RustboroCity_House3_EventObjects:: @ 8388F40
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0
 
 RustboroCity_House3_MapWarps:: @ 8388F88
 	warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY
 	warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY
 
 RustboroCity_House3_MapEvents:: @ 8388F98
-	map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
+	map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc
index b95aa32af..c589726ca 100644
--- a/data/maps/events/RustboroCity_Mart.inc
+++ b/data/maps/events/RustboroCity_Mart.inc
@@ -1,12 +1,12 @@
-RustboroCity_Mart_MapObjects:: @ 8388C34
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 2, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C44, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0
+RustboroCity_Mart_EventObjects:: @ 8388C34
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C44, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0
 
 RustboroCity_Mart_MapWarps:: @ 8388C94
 	warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY
 	warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY
 
 RustboroCity_Mart_MapEvents:: @ 8388CA4
-	map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
+	map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
index 83655d001..685a332a0 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
@@ -1,8 +1,8 @@
-RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0
+RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0
 
 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84
 	warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY
@@ -10,4 +10,4 @@ RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84
 	warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F
 
 RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C
-	map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
index d0c39d80f..c8c5952a3 100644
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0
+RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0
 
 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8
 	warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20
-	map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc
index ef873edb8..cbf1cab76 100644
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ b/data/maps/events/RustboroCity_PokemonSchool.inc
@@ -1,10 +1,10 @@
-RustboroCity_PokemonSchool_MapObjects:: @ 8388A34
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 8, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 3, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0
+RustboroCity_PokemonSchool_EventObjects:: @ 8388A34
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0
 
 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4
 	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
@@ -18,4 +18,4 @@ RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4
 	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5
 
 RustboroCity_PokemonSchool_MapEvents:: @ 8388B10
-	map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
+	map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
index f0b67df82..f4b39bf7a 100644
--- a/data/maps/events/RusturfTunnel.inc
+++ b/data/maps/events/RusturfTunnel.inc
@@ -1,14 +1,14 @@
-RusturfTunnel_MapObjects:: @ 838BD2C
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0
+RusturfTunnel_EventObjects:: @ 838BD2C
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0
+	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0
 
 RusturfTunnel_MapWarps:: @ 838BE1C
 	warp_def 4, 10, 3, 0, MAP_ROUTE116
@@ -23,4 +23,4 @@ RusturfTunnel_MapCoordEvents:: @ 838BE34
 	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5
 
 RusturfTunnel_MapEvents:: @ 838BE84
-	map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
+	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
index 9ca3db288..eec5f46c7 100644
--- a/data/maps/events/SSTidalCorridor.inc
+++ b/data/maps/events/SSTidalCorridor.inc
@@ -1,8 +1,8 @@
-SSTidalCorridor_MapObjects:: @ 83916F8
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
+SSTidalCorridor_EventObjects:: @ 83916F8
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
 
 SSTidalCorridor_MapWarps:: @ 8391758
 	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
@@ -30,4 +30,4 @@ SSTidalCorridor_MapBGEvents:: @ 83917A0
 	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD
 
 SSTidalCorridor_MapEvents:: @ 8391830
-	map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
+	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
index 59d783f61..ce47b4c8b 100644
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ b/data/maps/events/SSTidalLowerDeck.inc
@@ -1,6 +1,6 @@
-SSTidalLowerDeck_MapObjects:: @ 8391844
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 10, 0, 4, 0, 3, 46, 68, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FED7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0
+SSTidalLowerDeck_EventObjects:: @ 8391844
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 0, 4, 0, 3, 46, 68, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FED7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0
 
 SSTidalLowerDeck_MapWarps:: @ 8391874
 	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
@@ -9,4 +9,4 @@ SSTidalLowerDeck_MapBGEvents:: @ 839187C
 	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23
 
 SSTidalLowerDeck_MapEvents:: @ 8391888
-	map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
index af5fdbfa4..60d338c9e 100644
--- a/data/maps/events/SSTidalRooms.inc
+++ b/data/maps/events/SSTidalRooms.inc
@@ -1,12 +1,12 @@
-SSTidalRooms_MapObjects:: @ 839189C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 7, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF5D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 34, 0, 11, 0, 3, 9, 0, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FF74, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 21, 0, 5, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF8B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFA2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0
+SSTidalRooms_EventObjects:: @ 839189C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 0, 7, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF5D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 0, 11, 0, 3, 9, 0, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FF74, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 0, 5, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF8B, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFA2, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0
 
 SSTidalRooms_MapWarps:: @ 839195C
 	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
@@ -27,4 +27,4 @@ SSTidalRooms_MapBGEvents:: @ 83919BC
 	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47
 
 SSTidalRooms_MapEvents:: @ 83919D4
-	map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
+	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
index 68c32e585..2291cc867 100644
--- a/data/maps/events/SafariZone_Northeast.inc
+++ b/data/maps/events/SafariZone_Northeast.inc
@@ -1,13 +1,13 @@
-SafariZone_Northeast_MapObjects:: @ 8391A2C
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0
+SafariZone_Northeast_EventObjects:: @ 8391A2C
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0
 
 SafariZone_Northeast_MapEvents:: @ 8391B04
-	map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0
+	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
index e2cabbd38..5f8b34616 100644
--- a/data/maps/events/SafariZone_Northwest.inc
+++ b/data/maps/events/SafariZone_Northwest.inc
@@ -1,6 +1,6 @@
-SafariZone_Northwest_MapObjects:: @ 83919E8
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0
+SafariZone_Northwest_EventObjects:: @ 83919E8
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0
 
 SafariZone_Northwest_MapEvents:: @ 8391A18
-	map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0
+	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
index f52e734b7..47418cb7f 100644
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ b/data/maps/events/SafariZone_RestHouse.inc
@@ -1,11 +1,11 @@
-SafariZone_RestHouse_MapObjects:: @ 8391EC0
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 8, 0, 4, 0, 0, 9, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0
+SafariZone_RestHouse_EventObjects:: @ 8391EC0
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 0, 4, 0, 0, 9, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0
 
 SafariZone_RestHouse_MapWarps:: @ 8391F08
 	warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
 	warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
 
 SafariZone_RestHouse_MapEvents:: @ 8391F18
-	map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
+	map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc
index c40dc967d..1babf4640 100644
--- a/data/maps/events/SafariZone_Southeast.inc
+++ b/data/maps/events/SafariZone_Southeast.inc
@@ -1,11 +1,11 @@
-SafariZone_Southeast_MapObjects:: @ 8391B70
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 32, 0, 34, 0, 4, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 26, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16008C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 16, 0, 6, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0
+SafariZone_Southeast_EventObjects:: @ 8391B70
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 0, 34, 0, 4, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16008C, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 0, 6, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0
 
 SafariZone_Southeast_MapWarps:: @ 8391BD0
 	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
 
 SafariZone_Southeast_MapEvents:: @ 8391BD8
-	map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0
+	map_events SafariZone_Southeast_EventObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
index 2beec82ae..d93fc9d73 100644
--- a/data/maps/events/SafariZone_Southwest.inc
+++ b/data/maps/events/SafariZone_Southwest.inc
@@ -1,6 +1,6 @@
-SafariZone_Southwest_MapObjects:: @ 8391B18
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0
+SafariZone_Southwest_EventObjects:: @ 8391B18
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0
 
 SafariZone_Southwest_MapWarps:: @ 8391B48
 	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
@@ -9,4 +9,4 @@ SafariZone_Southwest_MapBGEvents:: @ 8391B50
 	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D
 
 SafariZone_Southwest_MapEvents:: @ 8391B5C
-	map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
+	map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
index 1a4f4d92d..c77b9cac3 100644
--- a/data/maps/events/ScorchedSlab.inc
+++ b/data/maps/events/ScorchedSlab.inc
@@ -1,8 +1,8 @@
-ScorchedSlab_MapObjects:: @ 838E988
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0
+ScorchedSlab_EventObjects:: @ 838E988
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0
 
 ScorchedSlab_MapWarps:: @ 838E9A0
 	warp_def 7, 16, 1, 1, MAP_ROUTE120
 
 ScorchedSlab_MapEvents:: @ 838E9A8
-	map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0
+	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
index 0a003bd34..0331887c2 100644
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ b/data/maps/events/SeafloorCavern_Room1.inc
@@ -1,9 +1,9 @@
-SeafloorCavern_Room1_MapObjects:: @ 838D0B8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+SeafloorCavern_Room1_EventObjects:: @ 838D0B8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room1_MapWarps:: @ 838D130
 	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
@@ -11,4 +11,4 @@ SeafloorCavern_Room1_MapWarps:: @ 838D130
 	warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2
 
 SeafloorCavern_Room1_MapEvents:: @ 838D148
-	map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
index e9da0033e..8a71cae92 100644
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ b/data/maps/events/SeafloorCavern_Room2.inc
@@ -1,13 +1,13 @@
-SeafloorCavern_Room2_MapObjects:: @ 838D15C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+SeafloorCavern_Room2_EventObjects:: @ 838D15C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
 
 SeafloorCavern_Room2_MapWarps:: @ 838D234
 	warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
@@ -16,4 +16,4 @@ SeafloorCavern_Room2_MapWarps:: @ 838D234
 	warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7
 
 SeafloorCavern_Room2_MapEvents:: @ 838D254
-	map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
index 5c686bc37..23085b300 100644
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ b/data/maps/events/SeafloorCavern_Room3.inc
@@ -1,14 +1,14 @@
-SeafloorCavern_Room3_MapObjects:: @ 838D268
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+SeafloorCavern_Room3_EventObjects:: @ 838D268
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room3_MapWarps:: @ 838D358
 	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
@@ -16,4 +16,4 @@ SeafloorCavern_Room3_MapWarps:: @ 838D358
 	warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6
 
 SeafloorCavern_Room3_MapEvents:: @ 838D370
-	map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
index be696fc94..9de32240f 100644
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ b/data/maps/events/SeafloorCavern_Room4.inc
@@ -1,5 +1,5 @@
-SeafloorCavern_Room4_MapObjects:: @ 838D384
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+SeafloorCavern_Room4_EventObjects:: @ 838D384
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room4_MapWarps:: @ 838D39C
 	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
@@ -8,4 +8,4 @@ SeafloorCavern_Room4_MapWarps:: @ 838D39C
 	warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
 
 SeafloorCavern_Room4_MapEvents:: @ 838D3BC
-	map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
index 887ee1eb9..767084dd2 100644
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ b/data/maps/events/SeafloorCavern_Room5.inc
@@ -1,10 +1,10 @@
-SeafloorCavern_Room5_MapObjects:: @ 838D3D0
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+SeafloorCavern_Room5_EventObjects:: @ 838D3D0
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
 
 SeafloorCavern_Room5_MapWarps:: @ 838D460
 	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
@@ -12,4 +12,4 @@ SeafloorCavern_Room5_MapWarps:: @ 838D460
 	warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4
 
 SeafloorCavern_Room5_MapEvents:: @ 838D478
-	map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
index 35d230ff2..e24c53154 100644
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ b/data/maps/events/SeafloorCavern_Room8.inc
@@ -1,20 +1,20 @@
-SeafloorCavern_Room8_MapObjects:: @ 838D4DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0
+SeafloorCavern_Room8_EventObjects:: @ 838D4DC
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0
 
 SeafloorCavern_Room8_MapWarps:: @ 838D5FC
 	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
 	warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3
 
 SeafloorCavern_Room8_MapEvents:: @ 838D60C
-	map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
+	map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
index 09a94cf27..97997f3b6 100644
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ b/data/maps/events/SeafloorCavern_Room9.inc
@@ -1,11 +1,11 @@
-SeafloorCavern_Room9_MapObjects:: @ 838D620
-	object_event 1, MAP_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0
+SeafloorCavern_Room9_EventObjects:: @ 838D620
+	object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0
 
 SeafloorCavern_Room9_MapWarps:: @ 838D6C8
 	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
@@ -14,4 +14,4 @@ SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0
 	coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA
 
 SeafloorCavern_Room9_MapEvents:: @ 838D6E0
-	map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
+	map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
index 72fd09222..14d726040 100644
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ b/data/maps/events/SecretBase_BlueCave1.inc
@@ -1,22 +1,22 @@
-SecretBase_BlueCave1_MapObjects:: @ 838F18C
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BlueCave1_EventObjects:: @ 838F18C
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave1_MapWarps:: @ 838F2F4
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_BlueCave1_MapEvents:: @ 838F2FC
-	map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
index 6f599527b..af2ff42dd 100644
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ b/data/maps/events/SecretBase_BlueCave2.inc
@@ -1,22 +1,22 @@
-SecretBase_BlueCave2_MapObjects:: @ 838FAA4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BlueCave2_EventObjects:: @ 838FAA4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave2_MapWarps:: @ 838FC0C
 	warp_def 7, 5, 0, 126, MAP_NONE
 
 SecretBase_BlueCave2_MapEvents:: @ 838FC14
-	map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
index f9b4cbe91..a7b18b152 100644
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ b/data/maps/events/SecretBase_BlueCave3.inc
@@ -1,22 +1,22 @@
-SecretBase_BlueCave3_MapObjects:: @ 83903BC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BlueCave3_EventObjects:: @ 83903BC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave3_MapWarps:: @ 8390524
 	warp_def 4, 15, 0, 126, MAP_NONE
 
 SecretBase_BlueCave3_MapEvents:: @ 839052C
-	map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
index 75ac8b0cb..ac2bce45f 100644
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ b/data/maps/events/SecretBase_BlueCave4.inc
@@ -1,22 +1,22 @@
-SecretBase_BlueCave4_MapObjects:: @ 8390CD4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BlueCave4_EventObjects:: @ 8390CD4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BlueCave4_MapWarps:: @ 8390E3C
 	warp_def 4, 15, 0, 126, MAP_NONE
 
 SecretBase_BlueCave4_MapEvents:: @ 8390E44
-	map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
index 88978e210..61df99fac 100644
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ b/data/maps/events/SecretBase_BrownCave1.inc
@@ -1,22 +1,22 @@
-SecretBase_BrownCave1_MapObjects:: @ 838F008
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BrownCave1_EventObjects:: @ 838F008
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave1_MapWarps:: @ 838F170
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_BrownCave1_MapEvents:: @ 838F178
-	map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
index e3648a538..51aa17e69 100644
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ b/data/maps/events/SecretBase_BrownCave2.inc
@@ -1,22 +1,22 @@
-SecretBase_BrownCave2_MapObjects:: @ 838F920
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BrownCave2_EventObjects:: @ 838F920
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave2_MapWarps:: @ 838FA88
 	warp_def 1, 7, 0, 126, MAP_NONE
 
 SecretBase_BrownCave2_MapEvents:: @ 838FA90
-	map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
index 7d8e140cc..8cbb4755a 100644
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ b/data/maps/events/SecretBase_BrownCave3.inc
@@ -1,22 +1,22 @@
-SecretBase_BrownCave3_MapObjects:: @ 8390238
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BrownCave3_EventObjects:: @ 8390238
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave3_MapWarps:: @ 83903A0
 	warp_def 11, 9, 0, 126, MAP_NONE
 
 SecretBase_BrownCave3_MapEvents:: @ 83903A8
-	map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
index 614e20c89..10f086ef8 100644
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ b/data/maps/events/SecretBase_BrownCave4.inc
@@ -1,22 +1,22 @@
-SecretBase_BrownCave4_MapObjects:: @ 8390B50
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_BrownCave4_EventObjects:: @ 8390B50
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_BrownCave4_MapWarps:: @ 8390CB8
 	warp_def 2, 8, 0, 126, MAP_NONE
 
 SecretBase_BrownCave4_MapEvents:: @ 8390CC0
-	map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
index d9fee6da1..5284323a7 100644
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ b/data/maps/events/SecretBase_RedCave1.inc
@@ -1,22 +1,22 @@
-SecretBase_RedCave1_MapObjects:: @ 838EE84
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_RedCave1_EventObjects:: @ 838EE84
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave1_MapWarps:: @ 838EFEC
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_RedCave1_MapEvents:: @ 838EFF4
-	map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
index f73de0783..cbade9d66 100644
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ b/data/maps/events/SecretBase_RedCave2.inc
@@ -1,22 +1,22 @@
-SecretBase_RedCave2_MapObjects:: @ 838F79C
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_RedCave2_EventObjects:: @ 838F79C
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave2_MapWarps:: @ 838F904
 	warp_def 3, 14, 0, 126, MAP_NONE
 
 SecretBase_RedCave2_MapEvents:: @ 838F90C
-	map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
index 639207929..caa053e69 100644
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ b/data/maps/events/SecretBase_RedCave3.inc
@@ -1,22 +1,22 @@
-SecretBase_RedCave3_MapObjects:: @ 83900B4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_RedCave3_EventObjects:: @ 83900B4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave3_MapWarps:: @ 839021C
 	warp_def 3, 6, 0, 126, MAP_NONE
 
 SecretBase_RedCave3_MapEvents:: @ 8390224
-	map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
index ffa6596a9..66f4db715 100644
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ b/data/maps/events/SecretBase_RedCave4.inc
@@ -1,22 +1,22 @@
-SecretBase_RedCave4_MapObjects:: @ 83909CC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_RedCave4_EventObjects:: @ 83909CC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_RedCave4_MapWarps:: @ 8390B34
 	warp_def 2, 12, 0, 126, MAP_NONE
 
 SecretBase_RedCave4_MapEvents:: @ 8390B3C
-	map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
index 938ad397e..5225f4be7 100644
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ b/data/maps/events/SecretBase_Shrub1.inc
@@ -1,22 +1,22 @@
-SecretBase_Shrub1_MapObjects:: @ 838F618
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Shrub1_EventObjects:: @ 838F618
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub1_MapWarps:: @ 838F780
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_Shrub1_MapEvents:: @ 838F788
-	map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
index 4ea2a0a79..61175c9e2 100644
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ b/data/maps/events/SecretBase_Shrub2.inc
@@ -1,22 +1,22 @@
-SecretBase_Shrub2_MapObjects:: @ 838FF30
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Shrub2_EventObjects:: @ 838FF30
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub2_MapWarps:: @ 8390098
 	warp_def 7, 5, 0, 126, MAP_NONE
 
 SecretBase_Shrub2_MapEvents:: @ 83900A0
-	map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
index fb7b96483..96f92acc1 100644
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ b/data/maps/events/SecretBase_Shrub3.inc
@@ -1,22 +1,22 @@
-SecretBase_Shrub3_MapObjects:: @ 8390848
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Shrub3_EventObjects:: @ 8390848
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub3_MapWarps:: @ 83909B0
 	warp_def 6, 9, 0, 126, MAP_NONE
 
 SecretBase_Shrub3_MapEvents:: @ 83909B8
-	map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
index 0e79ed287..a727555b8 100644
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ b/data/maps/events/SecretBase_Shrub4.inc
@@ -1,22 +1,22 @@
-SecretBase_Shrub4_MapObjects:: @ 8391160
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Shrub4_EventObjects:: @ 8391160
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Shrub4_MapWarps:: @ 83912C8
 	warp_def 11, 8, 0, 126, MAP_NONE
 
 SecretBase_Shrub4_MapEvents:: @ 83912D0
-	map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
+	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
index af6c46e00..a3464e8d2 100644
--- a/data/maps/events/SecretBase_Tree1.inc
+++ b/data/maps/events/SecretBase_Tree1.inc
@@ -1,22 +1,22 @@
-SecretBase_Tree1_MapObjects:: @ 838F494
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Tree1_EventObjects:: @ 838F494
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree1_MapWarps:: @ 838F5FC
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_Tree1_MapEvents:: @ 838F604
-	map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
index 47ee02e45..eab1c676d 100644
--- a/data/maps/events/SecretBase_Tree2.inc
+++ b/data/maps/events/SecretBase_Tree2.inc
@@ -1,22 +1,22 @@
-SecretBase_Tree2_MapObjects:: @ 838FDAC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Tree2_EventObjects:: @ 838FDAC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree2_MapWarps:: @ 838FF14
 	warp_def 3, 14, 0, 126, MAP_NONE
 
 SecretBase_Tree2_MapEvents:: @ 838FF1C
-	map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
index 972530141..833e01691 100644
--- a/data/maps/events/SecretBase_Tree3.inc
+++ b/data/maps/events/SecretBase_Tree3.inc
@@ -1,22 +1,22 @@
-SecretBase_Tree3_MapObjects:: @ 83906C4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Tree3_EventObjects:: @ 83906C4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree3_MapWarps:: @ 839082C
 	warp_def 8, 6, 0, 126, MAP_NONE
 
 SecretBase_Tree3_MapEvents:: @ 8390834
-	map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
index 3746c569a..d2a74e117 100644
--- a/data/maps/events/SecretBase_Tree4.inc
+++ b/data/maps/events/SecretBase_Tree4.inc
@@ -1,22 +1,22 @@
-SecretBase_Tree4_MapObjects:: @ 8390FDC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_Tree4_EventObjects:: @ 8390FDC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_Tree4_MapWarps:: @ 8391144
 	warp_def 7, 12, 0, 126, MAP_NONE
 
 SecretBase_Tree4_MapEvents:: @ 839114C
-	map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
+	map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
index 036dfaa42..aeadee5be 100644
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ b/data/maps/events/SecretBase_YellowCave1.inc
@@ -1,22 +1,22 @@
-SecretBase_YellowCave1_MapObjects:: @ 838F310
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_YellowCave1_EventObjects:: @ 838F310
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave1_MapWarps:: @ 838F478
 	warp_def 5, 7, 0, 126, MAP_NONE
 
 SecretBase_YellowCave1_MapEvents:: @ 838F480
-	map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
index cf7fa415e..5fcea03c6 100644
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ b/data/maps/events/SecretBase_YellowCave2.inc
@@ -1,22 +1,22 @@
-SecretBase_YellowCave2_MapObjects:: @ 838FC28
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_YellowCave2_EventObjects:: @ 838FC28
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave2_MapWarps:: @ 838FD90
 	warp_def 12, 7, 0, 126, MAP_NONE
 
 SecretBase_YellowCave2_MapEvents:: @ 838FD98
-	map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
index 6fc48d147..f91257073 100644
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ b/data/maps/events/SecretBase_YellowCave3.inc
@@ -1,22 +1,22 @@
-SecretBase_YellowCave3_MapObjects:: @ 8390540
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_YellowCave3_EventObjects:: @ 8390540
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave3_MapWarps:: @ 83906A8
 	warp_def 5, 9, 0, 126, MAP_NONE
 
 SecretBase_YellowCave3_MapEvents:: @ 83906B0
-	map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
index e63dbdb0b..2076c49ee 100644
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ b/data/maps/events/SecretBase_YellowCave4.inc
@@ -1,22 +1,22 @@
-SecretBase_YellowCave4_MapObjects:: @ 8390E58
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
+SecretBase_YellowCave4_EventObjects:: @ 8390E58
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
 
 SecretBase_YellowCave4_MapWarps:: @ 8390FC0
 	warp_def 6, 12, 0, 126, MAP_NONE
 
 SecretBase_YellowCave4_MapEvents:: @ 8390FC8
-	map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
+	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
index 8d38fb3ee..f02848ceb 100644
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
@@ -1,6 +1,6 @@
-ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0
+ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0
 
 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C
 	warp_def 20, 30, 3, 0, MAP_ROUTE125
@@ -9,4 +9,4 @@ ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C
 	warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 
 ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C
-	map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
+	map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
index 6e1b36d08..cd59c665b 100644
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc
@@ -1,9 +1,9 @@
-ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0
+ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0
 
 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10
 	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
 
 ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18
-	map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
+	map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
index c699b5e11..2576b5eb1 100644
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
@@ -1,5 +1,5 @@
-ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0
+ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0
 
 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58
 	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
@@ -20,4 +20,4 @@ ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98
 	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7
 
 ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0
-	map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
+	map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
index ba5a0f495..a95bec17c 100644
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
@@ -1,6 +1,6 @@
-ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
+ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
 
 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
 	warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
@@ -12,4 +12,4 @@ ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C
 	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413
 
 ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98
-	map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
+	map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
index f4027a22f..135d23273 100644
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
@@ -1,5 +1,5 @@
-ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0
+ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0
 
 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C
 	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
@@ -9,4 +9,4 @@ ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C
 	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7
 
 ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28
-	map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
+	map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
index 321653635..a6dae88b2 100644
--- a/data/maps/events/SingleBattleColosseum.inc
+++ b/data/maps/events/SingleBattleColosseum.inc
@@ -1,5 +1,5 @@
-SingleBattleColosseum_MapObjects:: @ 83912E4
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0
+SingleBattleColosseum_EventObjects:: @ 83912E4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0
 
 SingleBattleColosseum_MapWarps:: @ 83912FC
 	warp_def 6, 8, 3, 127, MAP_NONE
@@ -10,4 +10,4 @@ SingleBattleColosseum_MapCoordEvents:: @ 839130C
 	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379
 
 SingleBattleColosseum_MapEvents:: @ 839132C
-	map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
+	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
index 5d5fc52d4..3189195d8 100644
--- a/data/maps/events/SkyPillar_Top.inc
+++ b/data/maps/events/SkyPillar_Top.inc
@@ -1,8 +1,8 @@
-SkyPillar_Top_MapObjects:: @ 838EE50
-	object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0
+SkyPillar_Top_EventObjects:: @ 838EE50
+	object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0
 
 SkyPillar_Top_MapWarps:: @ 838EE68
 	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
 
 SkyPillar_Top_MapEvents:: @ 838EE70
-	map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0
+	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
index 05b59b576..97ee3f11b 100644
--- a/data/maps/events/SlateportCity.inc
+++ b/data/maps/events/SlateportCity.inc
@@ -1,35 +1,35 @@
-SlateportCity_MapObjects:: @ 837F7AC
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 21, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBD6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0
-	object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_4, 0, 16, 0, 46, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCFD, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 20, MAP_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0
-	object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 28, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 29, MAP_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 30, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 31, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+SlateportCity_EventObjects:: @ 837F7AC
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBD6, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0
+	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 0, 46, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCFD, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0
+	object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0
+	object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0
+	object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0
+	object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0
+	object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
+	object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
 
 SlateportCity_MapWarps:: @ 837FA94
 	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
@@ -59,4 +59,4 @@ SlateportCity_MapBGEvents:: @ 837FAEC
 	bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C
 
 SlateportCity_MapEvents:: @ 837FB7C
-	map_events SlateportCity_MapObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents
+	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents
diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc
index 6bb6a4285..3ecb4980f 100644
--- a/data/maps/events/SlateportCity_ContestHall.inc
+++ b/data/maps/events/SlateportCity_ContestHall.inc
@@ -1,17 +1,17 @@
-SlateportCity_ContestHall_MapObjects:: @ 83878A4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 15, 0, 3, 2, 34, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 4, 0, 3, 2, 51, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 12, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 9, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_FAT_MAN, 0, 13, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 12, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 5, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0
+SlateportCity_ContestHall_EventObjects:: @ 83878A4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 0, 15, 0, 3, 2, 34, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 4, 0, 3, 2, 51, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0, 0, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0, 0, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0
 
 SlateportCity_ContestHall_MapWarps:: @ 83879DC
 	warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY
@@ -22,4 +22,4 @@ SlateportCity_ContestHall_MapBGEvents:: @ 83879EC
 	bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671
 
 SlateportCity_ContestHall_MapEvents:: @ 8387A04
-	map_events SlateportCity_ContestHall_MapObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents
+	map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents
diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc
index 0c701e0ca..003893c52 100644
--- a/data/maps/events/SlateportCity_ContestLobby.inc
+++ b/data/maps/events/SlateportCity_ContestLobby.inc
@@ -1,12 +1,12 @@
-SlateportCity_ContestLobby_MapObjects:: @ 8387788
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0
+SlateportCity_ContestLobby_EventObjects:: @ 8387788
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0
 
 SlateportCity_ContestLobby_MapWarps:: @ 8387848
 	warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY
@@ -20,4 +20,4 @@ SlateportCity_ContestLobby_MapBGEvents:: @ 8387860
 	bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D
 
 SlateportCity_ContestLobby_MapEvents:: @ 8387890
-	map_events SlateportCity_ContestLobby_MapObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents
+	map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
index 77f0735cd..49c0d95bb 100644
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ b/data/maps/events/SlateportCity_Harbor.inc
@@ -1,12 +1,12 @@
-SlateportCity_Harbor_MapObjects:: @ 8387F30
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0
-	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0
-	object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0
+SlateportCity_Harbor_EventObjects:: @ 8387F30
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0
 
 SlateportCity_Harbor_MapWarps:: @ 8387FF0
 	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
@@ -21,4 +21,4 @@ SlateportCity_Harbor_MapCoordEvents:: @ 8388010
 	coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF
 
 SlateportCity_Harbor_MapEvents:: @ 8388050
-	map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
+	map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc
index 6f5f72944..9421b8b73 100644
--- a/data/maps/events/SlateportCity_House1.inc
+++ b/data/maps/events/SlateportCity_House1.inc
@@ -1,9 +1,9 @@
-SlateportCity_House1_MapObjects:: @ 8387A18
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0
+SlateportCity_House1_EventObjects:: @ 8387A18
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0
 
 SlateportCity_House1_MapWarps:: @ 8387A30
 	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
 	warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY
 
 SlateportCity_House1_MapEvents:: @ 8387A40
-	map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
+	map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc
index ae3f01900..e5e2a4a34 100644
--- a/data/maps/events/SlateportCity_House2.inc
+++ b/data/maps/events/SlateportCity_House2.inc
@@ -1,10 +1,10 @@
-SlateportCity_House2_MapObjects:: @ 8388064
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0
+SlateportCity_House2_EventObjects:: @ 8388064
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0
 
 SlateportCity_House2_MapWarps:: @ 8388094
 	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
 	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
 
 SlateportCity_House2_MapEvents:: @ 83880A4
-	map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
+	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc
index ae111b933..add4d634e 100644
--- a/data/maps/events/SlateportCity_Mart.inc
+++ b/data/maps/events/SlateportCity_Mart.inc
@@ -1,11 +1,11 @@
-SlateportCity_Mart_MapObjects:: @ 83881B0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 4, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0
+SlateportCity_Mart_EventObjects:: @ 83881B0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0
 
 SlateportCity_Mart_MapWarps:: @ 83881F8
 	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
 	warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY
 
 SlateportCity_Mart_MapEvents:: @ 8388208
-	map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
+	map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
index b432f3c3e..1b80e02d0 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
@@ -1,18 +1,18 @@
-SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
 
 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88
 	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
@@ -39,4 +39,4 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0
 	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D
 
 SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C
-	map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
+	map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
index 490c3697f..1aeddb41b 100644
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
@@ -1,11 +1,11 @@
-SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
 
 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18
 	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
@@ -34,4 +34,4 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20
 	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
 
 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C
-	map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
+	map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
index bdfabe5c6..5606731fb 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0
+SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0
 
 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100
 	warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY
@@ -9,4 +9,4 @@ SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100
 	warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F
 
 SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118
-	map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
index 2ecc48423..585d4ec51 100644
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0
+SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0
 
 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174
 	warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C
-	map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc
index 481886da8..4efb35edf 100644
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/events/SlateportCity_PokemonFanClub.inc
@@ -1,16 +1,16 @@
-SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 4, 0, 0, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 0, 5, 0, 0, 3, 16, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 11, 0, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 6, 0, 5, 0, 4, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ZIGZAGOON, 0, 3, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SKITTY, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0
+SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 0, 4, 0, 0, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 0, 5, 0, 0, 3, 16, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 0, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 0, 5, 0, 4, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0
 
 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14
 	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
 	warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY
 
 SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24
-	map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
+	map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
index a20a2f1b6..cfd9c4f51 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
@@ -1,8 +1,8 @@
-SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0
+SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0
 
 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8
 	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
@@ -10,4 +10,4 @@ SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8
 	warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F
 
 SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710
-	map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
index e6d3e7636..56b7d66a2 100644
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
@@ -1,10 +1,10 @@
-SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0
+SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0
 
 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C
 	warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
 
 SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774
-	map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
+	map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
index e725b8e80..7dbf87d44 100644
--- a/data/maps/events/SootopolisCity.inc
+++ b/data/maps/events/SootopolisCity.inc
@@ -1,15 +1,15 @@
-SootopolisCity_MapObjects:: @ 8380608
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+SootopolisCity_EventObjects:: @ 8380608
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
+	object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
 
 SootopolisCity_MapWarps:: @ 8380710
 	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
@@ -37,4 +37,4 @@ SootopolisCity_MapBGEvents:: @ 8380780
 	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6
 
 SootopolisCity_MapEvents:: @ 83807C8
-	map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents
+	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
index 4e655191d..942a135c7 100644
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ b/data/maps/events/SootopolisCity_Gym_1F.inc
@@ -1,6 +1,6 @@
-SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0
+SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0
 
 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20
 	warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY
@@ -12,4 +12,4 @@ SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38
 	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3
 
 SootopolisCity_Gym_1F_MapEvents:: @ 838AD50
-	map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
+	map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc
index a1f3c92cb..b063ebe95 100644
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/events/SootopolisCity_Gym_B1F.inc
@@ -1,15 +1,15 @@
-SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 19, 0, 3, 10, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B11D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 14, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B106, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 13, 0, 3, 10, 0, 0, 1, 0, 5, 0, SootopolisCity_Gym_B1F_EventScript_15B134, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 3, 0, 9, 0, 3, 10, 0, 0, 1, 0, 4, 0, SootopolisCity_Gym_B1F_EventScript_15B162, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B179, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0
+SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 0, 19, 0, 3, 10, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B11D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 0, 14, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B106, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 0, 13, 0, 3, 10, 0, 0, 1, 0, 5, 0, SootopolisCity_Gym_B1F_EventScript_15B134, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 0, 9, 0, 3, 10, 0, 0, 1, 0, 4, 0, SootopolisCity_Gym_B1F_EventScript_15B162, 0, 0, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B179, 0, 0, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0
 
 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24
 	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
 
 SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C
-	map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc
index fc6a57516..9b9a583c5 100644
--- a/data/maps/events/SootopolisCity_House1.inc
+++ b/data/maps/events/SootopolisCity_House1.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House1_MapObjects:: @ 838AFA4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0
+SootopolisCity_House1_EventObjects:: @ 838AFA4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0
 
 SootopolisCity_House1_MapWarps:: @ 838AFD4
 	warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House1_MapEvents:: @ 838AFE4
-	map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc
index 5fac2c45e..4e3e51d69 100644
--- a/data/maps/events/SootopolisCity_House2.inc
+++ b/data/maps/events/SootopolisCity_House2.inc
@@ -1,9 +1,9 @@
-SootopolisCity_House2_MapObjects:: @ 838AFF8
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0
+SootopolisCity_House2_EventObjects:: @ 838AFF8
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0
 
 SootopolisCity_House2_MapWarps:: @ 838B010
 	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House2_MapEvents:: @ 838B020
-	map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc
index 343bc0d2b..9908934b5 100644
--- a/data/maps/events/SootopolisCity_House3.inc
+++ b/data/maps/events/SootopolisCity_House3.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House3_MapObjects:: @ 838B034
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0
+SootopolisCity_House3_EventObjects:: @ 838B034
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0
 
 SootopolisCity_House3_MapWarps:: @ 838B064
 	warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House3_MapEvents:: @ 838B074
-	map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc
index f50aa1fe1..94cb33ea0 100644
--- a/data/maps/events/SootopolisCity_House4.inc
+++ b/data/maps/events/SootopolisCity_House4.inc
@@ -1,11 +1,11 @@
-SootopolisCity_House4_MapObjects:: @ 838B088
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 5, 0, 2, 0, 3, 7, 33, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B356, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0
+SootopolisCity_House4_EventObjects:: @ 838B088
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 0, 2, 0, 3, 7, 33, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B356, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0
 
 SootopolisCity_House4_MapWarps:: @ 838B0D0
 	warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House4_MapEvents:: @ 838B0E0
-	map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc
index f574443e8..cf5eedf4d 100644
--- a/data/maps/events/SootopolisCity_House5.inc
+++ b/data/maps/events/SootopolisCity_House5.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House5_MapObjects:: @ 838B0F4
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0
+SootopolisCity_House5_EventObjects:: @ 838B0F4
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0
 
 SootopolisCity_House5_MapWarps:: @ 838B124
 	warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House5_MapEvents:: @ 838B134
-	map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc
index a943baf27..bde7a4006 100644
--- a/data/maps/events/SootopolisCity_House6.inc
+++ b/data/maps/events/SootopolisCity_House6.inc
@@ -1,9 +1,9 @@
-SootopolisCity_House6_MapObjects:: @ 838B148
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0
+SootopolisCity_House6_EventObjects:: @ 838B148
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0
 
 SootopolisCity_House6_MapWarps:: @ 838B160
 	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House6_MapEvents:: @ 838B170
-	map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc
index f1ac930cc..198289c1b 100644
--- a/data/maps/events/SootopolisCity_House7.inc
+++ b/data/maps/events/SootopolisCity_House7.inc
@@ -1,10 +1,10 @@
-SootopolisCity_House7_MapObjects:: @ 838B184
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0
+SootopolisCity_House7_EventObjects:: @ 838B184
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0
 
 SootopolisCity_House7_MapWarps:: @ 838B1B4
 	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_House7_MapEvents:: @ 838B1C4
-	map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc
index b6f35a8d0..60897423f 100644
--- a/data/maps/events/SootopolisCity_House8.inc
+++ b/data/maps/events/SootopolisCity_House8.inc
@@ -1,6 +1,6 @@
-SootopolisCity_House8_MapObjects:: @ 838B1D8
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0
+SootopolisCity_House8_EventObjects:: @ 838B1D8
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0
 
 SootopolisCity_House8_MapWarps:: @ 838B208
 	warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY
@@ -11,4 +11,4 @@ SootopolisCity_House8_MapBGEvents:: @ 838B218
 	bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531
 
 SootopolisCity_House8_MapEvents:: @ 838B230
-	map_events SootopolisCity_House8_MapObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents
+	map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc
index 0cc9dc532..42f6f94a7 100644
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ b/data/maps/events/SootopolisCity_Mart.inc
@@ -1,11 +1,11 @@
-SootopolisCity_Mart_MapObjects:: @ 838AF38
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0
+SootopolisCity_Mart_EventObjects:: @ 838AF38
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0
 
 SootopolisCity_Mart_MapWarps:: @ 838AF80
 	warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY
 	warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY
 
 SootopolisCity_Mart_MapEvents:: @ 838AF90
-	map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
index 94091956e..aa2febcc2 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 12, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0
+SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0
 
 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88
 	warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY
@@ -9,4 +9,4 @@ SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88
 	warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F
 
 SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0
-	map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
index 4ce8631e8..8b6107733 100644
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0
+SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0
 
 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC
 	warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24
-	map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc
index da65af081..c1560ddee 100644
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ b/data/maps/events/SouthernIsland_Exterior.inc
@@ -1,6 +1,6 @@
-SouthernIsland_Exterior_MapObjects:: @ 8391E00
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 23, 0, 3, 7, 0, 0, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
+SouthernIsland_Exterior_EventObjects:: @ 8391E00
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 0, 23, 0, 3, 7, 0, 0, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
 
 SouthernIsland_Exterior_MapWarps:: @ 8391E30
 	warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR
@@ -10,4 +10,4 @@ SouthernIsland_Exterior_MapBGEvents:: @ 8391E40
 	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A
 
 SouthernIsland_Exterior_MapEvents:: @ 8391E4C
-	map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
+	map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
index 065c11315..6f41cd9f3 100644
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ b/data/maps/events/SouthernIsland_Interior.inc
@@ -1,6 +1,6 @@
-SouthernIsland_Interior_MapObjects:: @ 8391E60
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0
+SouthernIsland_Interior_EventObjects:: @ 8391E60
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0
 
 SouthernIsland_Interior_MapWarps:: @ 8391E90
 	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
@@ -10,4 +10,4 @@ SouthernIsland_Interior_MapBGEvents:: @ 8391EA0
 	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B
 
 SouthernIsland_Interior_MapEvents:: @ 8391EAC
-	map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
+	map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
index cae954321..e59aea71a 100644
--- a/data/maps/events/TradeCenter.inc
+++ b/data/maps/events/TradeCenter.inc
@@ -1,5 +1,5 @@
-TradeCenter_MapObjects:: @ 8391340
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0
+TradeCenter_EventObjects:: @ 8391340
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0
 
 TradeCenter_MapWarps:: @ 8391358
 	warp_def 5, 8, 3, 127, MAP_NONE
@@ -10,4 +10,4 @@ TradeCenter_MapCoordEvents:: @ 8391368
 	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA
 
 TradeCenter_MapEvents:: @ 8391388
-	map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
+	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
index fa8c12c65..fbede2e15 100644
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ b/data/maps/events/Underwater_SeafloorCavern.inc
@@ -1,11 +1,11 @@
-Underwater_SeafloorCavern_MapObjects:: @ 838D018
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+Underwater_SeafloorCavern_EventObjects:: @ 838D018
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
 
 Underwater_SeafloorCavern_MapWarps:: @ 838D078
 	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
 
 Underwater_SeafloorCavern_MapEvents:: @ 838D080
-	map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
+	map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc
index f3778b3eb..7cca882bc 100644
--- a/data/maps/events/UnknownMap_25_34.inc
+++ b/data/maps/events/UnknownMap_25_34.inc
@@ -1,2 +1,2 @@
 UnknownMap_25_34_MapEvents:: @ 8391604
-	map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0
+	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
index b8f74073e..51557480a 100644
--- a/data/maps/events/VerdanturfTown.inc
+++ b/data/maps/events/VerdanturfTown.inc
@@ -1,8 +1,8 @@
-VerdanturfTown_MapObjects:: @ 8380F00
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 17, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 0, 2, 0, 3, 9, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 9, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0
+VerdanturfTown_EventObjects:: @ 8380F00
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 0, 17, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 0, 2, 0, 3, 9, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 0, 9, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8AB, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0
 
 VerdanturfTown_MapWarps:: @ 8380F60
 	warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
@@ -24,4 +24,4 @@ VerdanturfTown_MapBGEvents:: @ 8380F98
 	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5
 
 VerdanturfTown_MapEvents:: @ 8380FF8
-	map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
+	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc
index 4e21027c4..cec6f89d0 100644
--- a/data/maps/events/VerdanturfTown_ContestHall.inc
+++ b/data/maps/events/VerdanturfTown_ContestHall.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 7, 0, 0, 2, 49, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 20, 0, 15, 0, 0, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0
+VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 7, 0, 0, 2, 49, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 0, 15, 0, 0, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0
 
 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34
 	warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
@@ -12,4 +12,4 @@ VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44
 	bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2
 
 VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C
-	map_events VerdanturfTown_ContestHall_MapObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents
+	map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc
index 465bb2fde..0a565dd8d 100644
--- a/data/maps/events/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/events/VerdanturfTown_ContestLobby.inc
@@ -1,10 +1,10 @@
-VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0
+VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0
 
 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90
 	warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN
@@ -18,4 +18,4 @@ VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8
 	bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89
 
 VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8
-	map_events VerdanturfTown_ContestLobby_MapObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents
+	map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
index 8a731fab0..7ca82cc8f 100644
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
@@ -1,10 +1,10 @@
-VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0
+VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0
 
 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8
 	warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN
 	warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN
 
 VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8
-	map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc
index 5bf1c7cae..85ff00200 100644
--- a/data/maps/events/VerdanturfTown_House.inc
+++ b/data/maps/events/VerdanturfTown_House.inc
@@ -1,10 +1,10 @@
-VerdanturfTown_House_MapObjects:: @ 8386DDC
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0
+VerdanturfTown_House_EventObjects:: @ 8386DDC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0
 
 VerdanturfTown_House_MapWarps:: @ 8386E0C
 	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
 	warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN
 
 VerdanturfTown_House_MapEvents:: @ 8386E1C
-	map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc
index 341055a52..41a65f22f 100644
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ b/data/maps/events/VerdanturfTown_Mart.inc
@@ -1,12 +1,12 @@
-VerdanturfTown_Mart_MapObjects:: @ 8386B70
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0
+VerdanturfTown_Mart_EventObjects:: @ 8386B70
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0
 
 VerdanturfTown_Mart_MapWarps:: @ 8386BD0
 	warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN
 	warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN
 
 VerdanturfTown_Mart_MapEvents:: @ 8386BE0
-	map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
index db6d4400b..f9c98b790 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0
+VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0
 
 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C
 	warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN
@@ -9,4 +9,4 @@ VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C
 	warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F
 
 VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54
-	map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
index 43cd0dc12..8dd05fccb 100644
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0
+VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0
 
 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0
 	warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
@@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0
 	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
 
 VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8
-	map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
index 26c178a87..0694222a1 100644
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/events/VerdanturfTown_WandasHouse.inc
@@ -1,13 +1,13 @@
-VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC
-	object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0
+VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC
+	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0
 
 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64
 	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
 	warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN
 
 VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74
-	map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
+	map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
index 31e1cebb6..48f81c2f0 100644
--- a/data/maps/events/VictoryRoad_1F.inc
+++ b/data/maps/events/VictoryRoad_1F.inc
@@ -1,11 +1,11 @@
-VictoryRoad_1F_MapObjects:: @ 838D8E4
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0
-	object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0
+VictoryRoad_1F_EventObjects:: @ 838D8E4
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0
 
 VictoryRoad_1F_MapWarps:: @ 838D98C
 	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
@@ -23,4 +23,4 @@ VictoryRoad_1F_MapBGEvents:: @ 838D9E4
 	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51
 
 VictoryRoad_1F_MapEvents:: @ 838D9F0
-	map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
+	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
index 0c30a96fa..ea7803ac3 100644
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ b/data/maps/events/VictoryRoad_B1F.inc
@@ -1,23 +1,23 @@
-VictoryRoad_B1F_MapObjects:: @ 838DA04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0
+VictoryRoad_B1F_EventObjects:: @ 838DA04
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0
 
 VictoryRoad_B1F_MapWarps:: @ 838DBCC
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
@@ -29,4 +29,4 @@ VictoryRoad_B1F_MapWarps:: @ 838DBCC
 	warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F
 
 VictoryRoad_B1F_MapEvents:: @ 838DC04
-	map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
+	map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
index ffa8252d5..bd882db79 100644
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ b/data/maps/events/VictoryRoad_B2F.inc
@@ -1,9 +1,9 @@
-VictoryRoad_B2F_MapObjects:: @ 838DC18
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 15, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15DFFB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0
+VictoryRoad_B2F_EventObjects:: @ 838DC18
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15DFFB, 0, 0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0
 
 VictoryRoad_B2F_MapWarps:: @ 838DC90
 	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
@@ -16,4 +16,4 @@ VictoryRoad_B2F_MapBGEvents:: @ 838DCB0
 	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53
 
 VictoryRoad_B2F_MapEvents:: @ 838DCC8
-	map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
+	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 9fb808074..286a2786f 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,5 +1,5 @@
 S_BerryTree:: @ 81A14DD
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	switch VAR_SPECIAL_4
 	case 255, Route102_EventScript_1A1533
 	case 0, Route102_EventScript_1A153D
@@ -108,10 +108,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9
 	goto_if_eq Route102_EventScript_1A164B
 
 Route102_EventScript_1A161D:: @ 81A161D
-	special FieldObjectInteractionPickBerryTree
+	special EventObjectInteractionPickBerryTree
 	compare VAR_SPECIAL_4, 0
 	goto_if_eq Route102_EventScript_1A1642
-	special FieldObjectInteractionRemoveBerryTree
+	special EventObjectInteractionRemoveBerryTree
 	message Route102_Text_1A17FD
 	playfanfare BGM_ME_KINOMI
 	waitmessage
@@ -139,7 +139,7 @@ Route102_EventScript_1A164B:: @ 81A164B
 
 gUnknown_081A1654:: @ 81A1654
 	lockall
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	call Route102_EventScript_1A16A9
 	releaseall
 	end
@@ -159,13 +159,13 @@ Route102_EventScript_1A168D:: @ 81A168D
 	end
 
 gUnknown_081A168F:: @ 81A168F
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	lockall
 
 Route102_EventScript_1A1693:: @ 81A1693
 	message Route102_Text_1A1912
 	waitmessage
-	special FieldObjectInteractionWaterBerryTree
+	special EventObjectInteractionWaterBerryTree
 	special DoWateringBerryTreeAnim
 	waitstate
 	message Route102_Text_1A1925
@@ -175,7 +175,7 @@ Route102_EventScript_1A1693:: @ 81A1693
 	end
 
 Route102_EventScript_1A16A9:: @ 81A16A9
-	special FieldObjectInteractionPlantBerryTree
+	special EventObjectInteractionPlantBerryTree
 	incrementgamestat GAME_STAT_PLANTED_BERRIES
 	message Route102_Text_1A16FB
 	waitmessage
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 0e2012de9..a6fa56078 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -566,31 +566,31 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354
-	step_00
-	step_end
+	face_down
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356
-	step_03
-	step_end
+	face_right
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B
-	step_right
-	step_up
-	step_up
-	step_end
+	walk_right
+	walk_up
+	walk_up
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
-	step_02
-	step_end
+	face_left
+	end_movement
 
 gUnknown_081A4363:: @ 81A4363
 	lockall
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 7f0f6b710..ec603257d 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -1152,184 +1152,184 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	return
 
 LinkContestRoom1_Movement_1A5D85:: @ 81A5D85
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D87:: @ 81A5D87
-	step_40
-	step_up
-	step_41
-	step_end
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D
-	step_58
-	step_end
+	emote_heart
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D91:: @ 81A5D91
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D95:: @ 81A5D95
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D99:: @ 81A5D99
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5
-	step_left
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF
-	step_02
-	step_14
-	step_4e
-	step_end
+	face_left
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3
-	step_01
-	step_14
-	step_4e
-	step_end
+	face_up
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7
-	step_03
-	step_14
-	step_4e
-	step_end
+	face_right
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB
-	step_00
-	step_14
-	step_4e
-	step_end
+	face_down
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF
-	step_01
-	step_end
+	face_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1
-	step_01
-	step_14
-	step_28
-	step_end
+	face_up
+	delay_16
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5
-	step_27
-	step_14
-	step_14
-	step_25
-	step_end
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA
-	step_14
-	step_14
-	step_25
-	step_end
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
-	step_17
-	step_17
-	step_17
-	step_15
-	step_26
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE
-	step_17
-	step_15
-	step_26
-	step_end
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2
-	step_up
-	step_left
-	step_26
-	step_end
+	walk_up
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6
-	step_18
-	step_15
-	step_26
-	step_end
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
-	step_up
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
-	step_18
-	step_18
-	step_18
-	step_15
-	step_26
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6
-	step_right
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_right
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA
-	step_up
-	step_end
+	walk_up
+	end_movement
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index fc5df6abe..8d226887e 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -233,26 +233,26 @@ Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539
 	end
 
 Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
-	step_03
-	step_14
-	step_14
-	step_01
-	slow_step_up
-	step_54
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_00
-	step_55
-	slow_step_down
-	step_end
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	face_up
+	walk_slow_up
+	set_invisible
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_down
+	set_visible
+	walk_slow_down
+	end_movement
 
 @ 81B2557
 	end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 5ddcf4a65..957d56609 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582
 
 Route111_EventScript_1AE5A2:: @ 81AE5A2
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare FACING, 2
 	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
@@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F
 Route118_EventScript_1AE60F:: @ 81AE60F
 Route120_EventScript_1AE60F:: @ 81AE60F
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare FACING, 2
 	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
@@ -256,16 +256,16 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	end
 
 Route111_Movement_1AE699:: @ 81AE699
-	step_1d
-	step_end
+	walk_in_place_down
+	end_movement
 
 Route111_Movement_1AE69B:: @ 81AE69B
-	step_1e
-	step_end
+	walk_in_place_up
+	end_movement
 
 Route111_Movement_1AE69D:: @ 81AE69D
-	step_1f
-	step_end
+	walk_in_place_left
+	end_movement
 
 Route111_EventScript_1AE69F:: @ 81AE69F
 	msgbox Route111_Text_1AC60B, MSGBOX_YESNO
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index d7b47cdfd..37830a00e 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -70,18 +70,18 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	end
 
 AquaHideout_B2F_Movement_15D958:: @ 815D958
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 AquaHideout_B2F_Movement_15D95D:: @ 815D95D
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 AquaHideout_B2F_EventScript_15D962:: @ 815D962
 MagmaHideout_B2F_EventScript_15D962:: @ 815D962
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index ce7d7c0e9..f540777ee 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -120,46 +120,46 @@ BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
 	end
 
 BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	end_movement
 
 BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
-	step_00
-	step_end
+	face_down
+	end_movement
 
 BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
-	step_03
-	step_end
+	face_right
+	end_movement
 
 BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	end_movement
 
 BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
 
 BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
-	step_down
-	step_left
-	step_left
-	step_left
-	step_03
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	face_right
+	end_movement
diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc
index 965da8d9c..d9d73b832 100644
--- a/data/scripts/maps/BattleTower_Corridor.inc
+++ b/data/scripts/maps/BattleTower_Corridor.inc
@@ -40,19 +40,19 @@ BattleTower_Corridor_EventScript_1608C2:: @ 81608C2
 	end
 
 BattleTower_Corridor_Movement_1608D1:: @ 81608D1
-	step_right
+	walk_right
 
 BattleTower_Corridor_Movement_1608D2:: @ 81608D2
-	step_right
-	step_right
+	walk_right
+	walk_right
 
 BattleTower_Corridor_Movement_1608D4:: @ 81608D4
-	step_right
+	walk_right
 
 BattleTower_Corridor_Movement_1608D5:: @ 81608D5
-	step_right
-	step_right
-	step_right
-	step_up
-	step_54
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	set_invisible
+	end_movement
diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc
index 6749c5623..f3373ee6e 100644
--- a/data/scripts/maps/BattleTower_Elevator.inc
+++ b/data/scripts/maps/BattleTower_Elevator.inc
@@ -33,25 +33,25 @@ BattleTower_Elevator_EventScript_16082B:: @ 816082B
 	end
 
 BattleTower_Elevator_Movement_160835:: @ 8160835
-	step_up
-	step_right
-	step_00
-	step_end
+	walk_up
+	walk_right
+	face_down
+	end_movement
 
 BattleTower_Elevator_Movement_160839:: @ 8160839
-	step_up
-	step_up
-	step_00
-	step_end
+	walk_up
+	walk_up
+	face_down
+	end_movement
 
 BattleTower_Elevator_Movement_16083D:: @ 816083D
-	step_down
-	step_down
-	step_54
-	step_end
+	walk_down
+	walk_down
+	set_invisible
+	end_movement
 
 BattleTower_Elevator_Movement_160841:: @ 8160841
-	step_right
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 57eb62dfe..24637ee75 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -19,7 +19,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C
 	compare VAR_SPECIAL_7, 50
 	goto_if_lt BattleTower_Lobby_EventScript_1602E4
 	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special sub_810F8FC
+	special TryInitBattleTowerAwardManEventObject
 	return
 
 BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
@@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
 	compare VAR_SPECIAL_7, 100
 	goto_if_lt BattleTower_Lobby_EventScript_1602E4
 	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special sub_810F8FC
+	special TryInitBattleTowerAwardManEventObject
 	return
 
 BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
@@ -304,30 +304,30 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664
 	return
 
 BattleTower_Lobby_Movement_160693:: @ 8160693
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 BattleTower_Lobby_Movement_160697:: @ 8160697
-	step_up
-	step_54
-	step_end
+	walk_up
+	set_invisible
+	end_movement
 
 BattleTower_Lobby_Movement_16069A:: @ 816069A
-	step_up
-	step_up
-	step_54
-	step_end
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
 
 @ 816069E
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_54
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	set_invisible
+	end_movement
 
 BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
 	lock
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index bba6d89bc..aeec7023f 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -89,9 +89,9 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
 	return
 
 CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D
-	step_5e
-	step_60
-	step_14
-	step_14
-	step_61
-	step_end
+	init_affine_anim
+	walk_down_affine_0
+	delay_16
+	delay_16
+	walk_down_affine_1
+	end_movement
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index e7aeccbd0..63f8c45b9 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -193,402 +193,402 @@ DewfordTown_EventScript_14E28A:: @ 814E28A
 	return
 
 DewfordTown_Movement_14E293:: @ 814E293
-	step_up
-	step_up
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_left
-	step_left
-	step_17
-	step_17
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 DewfordTown_Movement_14E356:: @ 814E356
-	step_right
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 DewfordTown_Movement_14E402:: @ 814E402
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_up
+	end_movement
 
 DewfordTown_Movement_14E405:: @ 814E405
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 DewfordTown_Movement_14E409:: @ 814E409
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 DewfordTown_Movement_14E40E:: @ 814E40E
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 DewfordTown_Movement_14E410:: @ 814E410
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 DewfordTown_EventScript_14E413:: @ 814E413
 	lock
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index 45d389b28..602c4776e 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -241,12 +241,12 @@ DewfordTown_Hall_EventScript_153583:: @ 8153583
 	return
 
 DewfordTown_Hall_Movement_153599:: @ 8153599
-	step_1f
-	step_end
+	walk_in_place_left
+	end_movement
 
 DewfordTown_Hall_Movement_15359B:: @ 815359B
-	step_20
-	step_end
+	walk_in_place_right
+	end_movement
 
 DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	lock
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index 78009271b..a4406c8e6 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -33,9 +33,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
 	end
 
 EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
 	playbgm BGM_DAIGO, FALSE
@@ -163,64 +163,64 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
 	return
 
 EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
-	step_up
-	step_14
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_up
+	delay_16
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_28
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
-	step_26
-	step_14
-	step_28
-	step_14
-	step_26
-	step_13
-	step_28
-	step_14
-	step_end
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
-	step_up
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_27
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index c57f311b2..6cfc5ae27 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -67,18 +67,18 @@ EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
 	end
 
 EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index a8eb820ea..0138f99f1 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -99,23 +99,23 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
 	end
 
 EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
-	step_down
-	step_left
-	step_26
-	step_end
+	walk_down
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
-	step_down
-	step_right
-	step_26
-	step_end
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index 11dd6159e..5386fec4f 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -46,46 +46,46 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
 	return
 
 FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F
-	step_down
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
 	msgbox FallarborTown_ContestLobby_Text_177141, 2
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 93a5115af..6ae897ec8 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
@@ -53,29 +53,29 @@ FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
 	end
 
 FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
 
 FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index e576df5bd..342e2fdc3 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -86,5 +86,5 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4
 	end
 
 FortreeCity_Movement_14CA13:: @ 814CA13
-	step_right
-	step_end
+	walk_right
+	end_movement
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index 490ef0c9b..77e43be34 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -46,12 +46,12 @@ FortreeCity_House4_EventScript_158204:: @ 8158204
 	end
 
 FortreeCity_House4_Movement_158218:: @ 8158218
-	step_15
-	step_15
-	step_18
-	step_25
-	step_13
-	step_end
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_down
+	delay_8
+	end_movement
 
 FortreeCity_House4_EventScript_15821E:: @ 815821E
 	lock
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index d33813680..013703e92 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -42,21 +42,21 @@ GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83
 	return
 
 GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	end_movement
 
 GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	end_movement
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index a7f71baf6..f14601747 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -185,57 +185,57 @@ LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
 	return
 
 LavaridgeTown_Movement_14E6E8:: @ 814E6E8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LavaridgeTown_Movement_14E6EF:: @ 814E6EF
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 LavaridgeTown_Movement_14E6FA:: @ 814E6FA
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 LavaridgeTown_Movement_14E703:: @ 814E703
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 LavaridgeTown_Movement_14E70E:: @ 814E70E
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 LavaridgeTown_EventScript_14E710:: @ 814E710
-	specialvar RESULT, player_get_direction_lower_nybble
+	specialvar RESULT, GetPlayerFacingDirection
 	compare RESULT, 1
 	goto_if_eq LavaridgeTown_EventScript_14E721
 	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index a04629903..4784a4903 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -145,46 +145,46 @@ LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
 	return
 
 LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_28
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_right
+	end_movement
 
 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
@@ -258,47 +258,47 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
 	return
 
 LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_27
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	end_movement
 
 LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	lockall
@@ -518,50 +518,50 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
 	return
 
 LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
-	step_28
-	step_right
-	step_end
+	walk_in_place_fastest_right
+	walk_right
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
-	step_down
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 	specialvar RESULT, sub_80C5044
@@ -655,48 +655,48 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
 	return
 
 LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
-	step_27
-	step_left
-	step_end
+	walk_in_place_fastest_left
+	walk_left
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
-	step_down
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
 	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index b80b0873b..c3eca04f4 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -57,18 +57,18 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D
 	end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395
-	step_03
-	step_40
-	step_left
-	step_41
-	step_end
+	face_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
 
 LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C
-	step_00
-	step_down
-	step_01
-	step_end
+	face_down
+	walk_down
+	face_up
+	end_movement
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index d32107396..57ad4b85b 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -140,17 +140,17 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	end
 
 LilycoveCity_Harbor_Movement_159A86:: @ 8159A86
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 @ 8159A8B
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
index 95338f231..b45261aca 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
@@ -70,23 +70,23 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7
 	end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_up
+	end_movement
 
 LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_up
+	end_movement
 
 LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index 9cf3ecbd7..1643c3a8b 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -81,13 +81,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A
 	end
 
 LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
-	step_01
-	step_14
-	step_end
+	face_up
+	delay_16
+	end_movement
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	lockall
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 85ee953ac..bab091a0e 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -29,36 +29,36 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F
 	end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA
-	step_13
-	step_25
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
+	delay_8
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
 
 LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402
-	step_17
-	step_17
-	step_15
-	step_15
-	step_17
-	step_15
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	end_movement
 
 LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409
-	step_down
-	step_28
-	step_end
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C
-	step_49
-	step_16
-	step_16
-	step_18
-	step_25
-	step_end
+	jump_in_place_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_in_place_fastest_down
+	end_movement
 
 LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 57ad9aae5..9f328bc4a 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -131,43 +131,43 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 	return
 
 LittlerootTown_Movement_14D6AC:: @ 814D6AC
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 LittlerootTown_Movement_14D6AE:: @ 814D6AE
-	step_down
-	step_27
-	step_end
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_Movement_14D6B1:: @ 814D6B1
-	step_14
-	step_13
-	step_up
-	step_end
+	delay_16
+	delay_8
+	walk_up
+	end_movement
 
 LittlerootTown_Movement_14D6B5:: @ 814D6B5
-	step_up
-	step_54
-	step_end
+	walk_up
+	set_invisible
+	end_movement
 
 LittlerootTown_Movement_14D6B8:: @ 814D6B8
-	step_14
-	step_13
-	step_right
-	step_26
-	step_end
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14D6BD:: @ 814D6BD
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 LittlerootTown_Movement_14D6C0:: @ 814D6C0
-	step_45
-	step_14
-	step_14
-	step_14
-	step_end
+	jump_right
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 LittlerootTown_EventScript_14D6C5:: @ 814D6C5
 	lockall
@@ -235,42 +235,42 @@ LittlerootTown_EventScript_14D755:: @ 814D755
 	return
 
 LittlerootTown_Movement_14D779:: @ 814D779
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_17
-	step_00
-	step_end
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	face_down
+	end_movement
 
 LittlerootTown_Movement_14D787:: @ 814D787
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 LittlerootTown_Movement_14D789:: @ 814D789
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_25
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 LittlerootTown_Movement_14D793:: @ 814D793
-	step_40
-	step_down
-	step_41
-	step_end
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	end_movement
 
 LittlerootTown_EventScript_14D797:: @ 814D797
 	lockall
@@ -283,28 +283,28 @@ LittlerootTown_EventScript_14D797:: @ 814D797
 	end
 
 LittlerootTown_Movement_14D7B3:: @ 814D7B3
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_18
-	step_00
-	step_end
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	face_down
+	end_movement
 
 LittlerootTown_Movement_14D7C0:: @ 814D7C0
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 LittlerootTown_EventScript_14D7C7:: @ 814D7C7
 	lockall
@@ -686,154 +686,154 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50
 	return
 
 LittlerootTown_Movement_14DC76:: @ 814DC76
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 LittlerootTown_Movement_14DC7D:: @ 814DC7D
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 LittlerootTown_Movement_14DC84:: @ 814DC84
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_Movement_14DC89:: @ 814DC89
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_Movement_14DC8F:: @ 814DC8F
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_Movement_14DC92:: @ 814DC92
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_Movement_14DC96:: @ 814DC96
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_Movement_14DC9A:: @ 814DC9A
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_Movement_14DC9D:: @ 814DC9D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_Movement_14DCA3:: @ 814DCA3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_Movement_14DCA8:: @ 814DCA8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LittlerootTown_Movement_14DCAE:: @ 814DCAE
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 LittlerootTown_Movement_14DCB4:: @ 814DCB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCBA:: @ 814DCBA
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCC1:: @ 814DCC1
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCC5:: @ 814DCC5
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCCA:: @ 814DCCA
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCCF:: @ 814DCCF
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCD3:: @ 814DCD3
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCDA:: @ 814DCDA
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LittlerootTown_Movement_14DCE0:: @ 814DCE0
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 	lock
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index 1de2e91a4..340f50894 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -70,8 +70,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722
 	lockall
@@ -105,13 +105,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789
 	lockall
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 8096589aa..ad7257e0b 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -70,8 +70,8 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
 	end
 
 LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960
 	lockall
@@ -105,13 +105,13 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
 	end
 
 LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 @ 81529C7
 	lockall
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index ede58e7a5..e716962b7 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -138,52 +138,52 @@ LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_13
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_13
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	delay_8
+	end_movement
 
 gUnknown_08152C39:: @ 8152C39
 
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 7608ba65d..6b2867f54 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -73,14 +73,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
 	end
 
 LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	lock
@@ -174,9 +174,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
 	return
 
 LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
-	step_down
-	step_27
-	step_end
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index 852f24f2a..bd4f8ab3d 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -186,96 +186,96 @@ MauvilleCity_EventScript_14C292:: @ 814C292
 	end
 
 MauvilleCity_Movement_14C2AA:: @ 814C2AA
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2B0:: @ 814C2B0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2B6:: @ 814C2B6
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2C1:: @ 814C2C1
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2CC:: @ 814C2CC
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 MauvilleCity_Movement_14C2D2:: @ 814C2D2
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2D8:: @ 814C2D8
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 MauvilleCity_Movement_14C2DC:: @ 814C2DC
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_up
+	end_movement
 
 MauvilleCity_Movement_14C2DF:: @ 814C2DF
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_Movement_14C2E8:: @ 814C2E8
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	lock
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index 272d7ed6e..ee2c5b1dc 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -83,134 +83,134 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	end
 
 MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C608:: @ 815C608
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C617:: @ 815C617
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C628:: @ 815C628
-	step_right
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C639:: @ 815C639
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
-	step_25
-	step_12
-	step_28
-	step_40
-	step_left
-	step_41
-	step_end
+	walk_in_place_fastest_down
+	delay_4
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
 
 MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
 	lock
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 364778613..4d9989d82 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -73,13 +73,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34
 	return
 
 MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
 	lock
@@ -154,32 +154,32 @@ MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28
 	return
 
 MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A
-	step_14
-	step_up
-	step_up
-	step_end
+	delay_16
+	walk_up
+	walk_up
+	end_movement
 
 MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E
-	step_14
-	step_right
-	step_up
-	step_end
+	delay_16
+	walk_right
+	walk_up
+	end_movement
 
 MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42
-	step_14
-	step_left
-	step_up
-	step_end
+	delay_16
+	walk_left
+	walk_up
+	end_movement
 
 MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49
-	step_right
-	step_27
-	step_end
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C
 	msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index f62693756..0af775590 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -59,19 +59,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
 	return
 
 MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
 
 MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	end_movement
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 0ae02fba4..a17d09e10 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -212,9 +212,9 @@ MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED
 	end
 
 MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index 415dbfc33..c8bccdd52 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -38,17 +38,17 @@ MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9
 	return
 
 MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4
-	step_18
-	step_15
-	step_15
-	step_17
-	step_15
-	step_13
-	step_end
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	delay_8
+	end_movement
 
 MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 0f1aace1d..d415e7fc9 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -51,22 +51,22 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	end
 
 MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	lockall
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index ac7c00013..f13850570 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -59,250 +59,250 @@ MtChimney_EventScript_15D018:: @ 815D018
 	end
 
 MtChimney_Movement_15D025:: @ 815D025
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	end_movement
 
 MtChimney_Movement_15D02D:: @ 815D02D
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 MtChimney_Movement_15D036:: @ 815D036
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
 
 MtChimney_Movement_15D03E:: @ 815D03E
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D048
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
 
 @ 815D05A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
 
 @ 815D063
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D072
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
 
 @ 815D08B
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
 
 @ 815D096
-	step_14
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D0A6
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
 
 @ 815D0B7
-	step_14
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
+	delay_16
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 @ 815D0BF
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D0CD
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 @ 815D0CF
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D0D7
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D0E1
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	end_movement
 
 @ 815D0EC
-	step_40
-	step_17
-	step_41
-	step_03
-	step_end
+	lock_facing_direction
+	walk_fast_left
+	unlock_facing_direction
+	face_right
+	end_movement
 
 @ 815D0F1
-	step_left
-	step_28
-	step_14
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	end_movement
 
 MtChimney_EventScript_15D0F5:: @ 815D0F5
 	.ifdef SAPPHIRE
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index 1f98778d6..7161e8800 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -59,29 +59,29 @@ MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B
 	end
 
 MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5
-	step_up
-	step_up
-	step_left
-	step_28
-	step_end
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA
-	step_14
-	step_right
-	step_down
-	step_down
-	step_end
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	end_movement
 
 MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	end_movement
 
 MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index d37100938..36b72ad12 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -110,30 +110,30 @@ MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA
 	return
 
 MtPyre_Summit_Movement_15D5DF:: @ 815D5DF
-	step_down
-	step_down
-	step_27
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 MtPyre_Summit_Movement_15D5E3:: @ 815D5E3
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 MtPyre_Summit_Movement_15D5E5:: @ 815D5E5
-	step_down
-	step_down
-	step_28
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 MtPyre_Summit_Movement_15D5E9:: @ 815D5E9
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 MtPyre_Summit_Movement_15D5EC:: @ 815D5EC
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	lock
@@ -319,47 +319,47 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795
 	return
 
 MtPyre_Summit_Movement_15D7A0:: @ 815D7A0
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 MtPyre_Summit_Movement_15D7A3:: @ 815D7A3
-	step_end
+	end_movement
 
 MtPyre_Summit_Movement_15D7A4:: @ 815D7A4
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 MtPyre_Summit_Movement_15D7A7:: @ 815D7A7
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 MtPyre_Summit_Movement_15D7B0:: @ 815D7B0
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 MtPyre_Summit_Movement_15D7B9:: @ 815D7B9
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index 9b1c9dd80..5385272b8 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -91,101 +91,101 @@ OldaleTown_EventScript_14DE83:: @ 814DE83
 	end
 
 OldaleTown_Movement_14DE8E:: @ 814DE8E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 OldaleTown_Movement_14DE97:: @ 814DE97
-	step_left
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 OldaleTown_Movement_14DEA2:: @ 814DEA2
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 @ 814DEAB
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_25
-	step_end
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
 
 OldaleTown_Movement_14DEB9:: @ 814DEB9
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 OldaleTown_Movement_14DEC1:: @ 814DEC1
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 OldaleTown_Movement_14DECB:: @ 814DECB
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 @ 814DED3
-	step_left
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
@@ -278,41 +278,41 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
 	end
 
 OldaleTown_Movement_14DFDE:: @ 814DFDE
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 OldaleTown_Movement_14DFE1:: @ 814DFE1
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 OldaleTown_Movement_14DFE3:: @ 814DFE3
-	step_02
-	step_end
+	face_left
+	end_movement
 
 OldaleTown_Movement_14DFE5:: @ 814DFE5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 OldaleTown_Movement_14DFEC:: @ 814DFEC
-	step_13
-	step_right
-	step_end
+	delay_8
+	walk_right
+	end_movement
 
 OldaleTown_Movement_14DFEF:: @ 814DFEF
-	step_16
-	step_27
-	step_40
-	step_right
-	step_41
-	step_end
+	walk_fast_up
+	walk_in_place_fastest_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
 
 OldaleTown_Movement_14DFF5:: @ 814DFF5
-	step_down
-	step_left
-	step_end
+	walk_down
+	walk_left
+	end_movement
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index cb47a0edd..03013f66c 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -65,78 +65,78 @@ PetalburgCity_EventScript_14B7C3:: @ 814B7C3
 	end
 
 PetalburgCity_Movement_14B7CC:: @ 814B7CC
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_28
-	step_end
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
 
 PetalburgCity_Movement_14B7ED:: @ 814B7ED
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
-	step_end
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	end_movement
 
 PetalburgCity_EventScript_14B812:: @ 814B812
 	msgbox PetalburgCity_Text_1645BB, 3
@@ -268,160 +268,160 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B
 	return
 
 @ 814B9AD
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 PetalburgCity_Movement_14B9B1:: @ 814B9B1
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgCity_Movement_14B9B6:: @ 814B9B6
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 PetalburgCity_Movement_14B9B9:: @ 814B9B9
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 PetalburgCity_Movement_14B9BE:: @ 814B9BE
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 PetalburgCity_Movement_14B9C4:: @ 814B9C4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgCity_Movement_14B9CF:: @ 814B9CF
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgCity_Movement_14B9DD:: @ 814B9DD
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgCity_Movement_14B9E8:: @ 814B9E8
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgCity_Movement_14B9F4:: @ 814B9F4
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 PetalburgCity_Movement_14BA01:: @ 814BA01
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
 
 PetalburgCity_Movement_14BA0B:: @ 814BA0B
-	step_14
-	step_14
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
+	delay_16
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
 
 PetalburgCity_Movement_14BA18:: @ 814BA18
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
 
 PetalburgCity_Movement_14BA22:: @ 814BA22
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
 
 PetalburgCity_EventScript_14BA2D:: @ 814BA2D
 	msgbox PetalburgCity_Text_16438A, 2
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 1dc1a77ec..59828c28d 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -88,11 +88,11 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C
 	end
 
 PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
 
 PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
 	lock
@@ -471,109 +471,109 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
 	return
 
 @ 8154B14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
-	step_end
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
 
 PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
 
 PetalburgCity_Gym_Movement_154B27:: @ 8154B27
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_up
-	step_end
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_up
+	end_movement
 
 PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
-	step_down
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
 
 PetalburgCity_Gym_Movement_154B36:: @ 8154B36
-	step_down
-	step_down
-	step_right
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
 
 PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
 
 PetalburgCity_Gym_Movement_154B45:: @ 8154B45
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
 
 PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
 
 PetalburgCity_Gym_Movement_154B57:: @ 8154B57
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
 
 PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
-	step_25
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_right
-	step_down
-	step_13
-	step_end
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	delay_8
+	end_movement
 
 PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
 	msgbox PetalburgCity_Gym_Text_17AB17, 4
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 17908440c..1d5fbeaf2 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -116,119 +116,119 @@ PetalburgWoods_EventScript_15CE69:: @ 815CE69
 	end
 
 PetalburgWoods_Movement_15CE73:: @ 815CE73
-	step_01
-	step_14
-	step_03
-	step_14
-	step_02
-	step_14
-	step_00
-	step_14
-	step_03
-	step_14
-	step_01
-	step_14
-	step_end
+	face_up
+	delay_16
+	face_right
+	delay_16
+	face_left
+	delay_16
+	face_down
+	delay_16
+	face_right
+	delay_16
+	face_up
+	delay_16
+	end_movement
 
 PetalburgWoods_Movement_15CE80:: @ 815CE80
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 PetalburgWoods_Movement_15CE89:: @ 815CE89
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_end
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	end_movement
 
 PetalburgWoods_Movement_15CE8E:: @ 815CE8E
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 PetalburgWoods_Movement_15CE95:: @ 815CE95
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 PetalburgWoods_Movement_15CE9E:: @ 815CE9E
-	step_18
-	step_15
-	step_15
-	step_17
-	step_26
-	step_end
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgWoods_Movement_15CEA4:: @ 815CEA4
-	step_15
-	step_18
-	step_26
-	step_end
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
 
 PetalburgWoods_Movement_15CEA8:: @ 815CEA8
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_01
-	step_end
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_up
+	end_movement
 
 PetalburgWoods_Movement_15CEB0:: @ 815CEB0
-	step_15
-	step_15
-	step_end
+	walk_fast_down
+	walk_fast_down
+	end_movement
 
 PetalburgWoods_Movement_15CEB3:: @ 815CEB3
-	step_40
-	step_up
-	step_41
-	step_end
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	end_movement
 
 PetalburgWoods_Movement_15CEB7:: @ 815CEB7
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_14
-	step_14
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	delay_16
+	delay_16
+	end_movement
 
 PetalburgWoods_Movement_15CEBF:: @ 815CEBF
-	step_15
-	step_15
-	step_15
-	step_end
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	end_movement
 
 PetalburgWoods_Movement_15CEC3:: @ 815CEC3
-	step_down
-	step_down
-	step_14
-	step_14
-	step_end
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	end_movement
 
 PetalburgWoods_Movement_15CEC8:: @ 815CEC8
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 PetalburgWoods_EventScript_15CECA:: @ 815CECA
 	msgbox PetalburgWoods_Text_1953AC, 2
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 6840c45f4..a4af7ceb4 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -69,138 +69,138 @@ Route101_EventScript_14E9E4:: @ 814E9E4
 	end
 
 Route101_Movement_14E9FA:: @ 814E9FA
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 Route101_Movement_14E9FC:: @ 814E9FC
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 Route101_Movement_14E9FE:: @ 814E9FE
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route101_Movement_14EA00:: @ 814EA00
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	end_movement
 
 Route101_Movement_14EA1F:: @ 814EA1F
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
 
 @ 814EA26
-	step_end
+	end_movement
 
 Route101_Movement_14EA27:: @ 814EA27
-	step_23
-	step_23
-	step_23
-	step_23
-	step_end
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	end_movement
 
 Route101_Movement_14EA2C:: @ 814EA2C
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route101_Movement_14EA31:: @ 814EA31
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
 
 Route101_Movement_14EA50:: @ 814EA50
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 @ 814EA57
-	step_end
+	end_movement
 
 Route101_Movement_14EA58:: @ 814EA58
-	step_24
-	step_24
-	step_24
-	step_24
-	step_end
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	end_movement
 
 @ 814EA5D
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 @ 814EA60
-	step_up
-	step_left
-	step_up
-	step_end
+	walk_up
+	walk_left
+	walk_up
+	end_movement
 
 Route101_EventScript_14EA64:: @ 814EA64
 	msgbox Route101_Text_16D25E, 2
@@ -242,5 +242,5 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	end
 
 Route101_Movement_14EAD7:: @ 814EAD7
-	step_right
-	step_end
+	walk_right
+	end_movement
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index 22c3fa391..94d0aa8d6 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -129,30 +129,30 @@ Route103_EventScript_14ED46:: @ 814ED46
 	end
 
 Route103_Movement_14ED67:: @ 814ED67
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 Route103_Movement_14ED6B:: @ 814ED6B
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
-	step_end
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 Route103_Movement_14ED71:: @ 814ED71
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	end_movement
 
 Route103_Movement_14ED74:: @ 814ED74
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_end
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	end_movement
 
 Route103_EventScript_14ED79:: @ 814ED79
 	msgbox Route103_Text_16D950, 2
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 2d44d4dfd..8fda04ea5 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -168,227 +168,227 @@ Route104_EventScript_14F095:: @ 814F095
 	end
 
 Route104_Movement_14F09F:: @ 814F09F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
+	end_movement
 
 Route104_Movement_14F162:: @ 814F162
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 Route104_Movement_14F166:: @ 814F166
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route104_Movement_14F168:: @ 814F168
-	step_down
-	step_left
-	step_28
-	step_end
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 Route104_Movement_14F16C:: @ 814F16C
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	end_movement
 
 Route104_Movement_14F16F:: @ 814F16F
-	step_down
-	step_27
-	step_end
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 Route104_EventScript_14F172:: @ 814F172
 	trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index c70365b6a..6f24b2142 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -62,211 +62,211 @@ Route109_EventScript_14F548:: @ 814F548
 	end
 
 Route109_Movement_14F5BF:: @ 814F5BF
-	step_25
-	step_down
-	step_down
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 Route109_Movement_14F66D:: @ 814F66D
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	end_movement
 
 Route109_Movement_14F670:: @ 814F670
-	step_down
-	step_down
-	step_left
-	step_28
-	step_end
+	walk_down
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 Route109_Movement_14F675:: @ 814F675
-	step_right
-	step_down
-	step_end
+	walk_right
+	walk_down
+	end_movement
 
 Route109_Movement_14F678:: @ 814F678
-	step_left
-	step_down
-	step_end
+	walk_left
+	walk_down
+	end_movement
 
 Route109_Movement_14F67B:: @ 814F67B
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route109_Movement_14F67D:: @ 814F67D
-	step_down
-	step_27
-	step_end
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 Route109_EventScript_14F680:: @ 814F680
 	lock
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 070340760..8245b3107 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -492,48 +492,48 @@ Route110_EventScript_14FF66:: @ 814FF66
 	return
 
 Route110_Movement_14FF6E:: @ 814FF6E
-	step_down
-	step_left
-	step_25
-	step_end
+	walk_down
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 Route110_Movement_14FF72:: @ 814FF72
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route110_Movement_14FF74:: @ 814FF74
-	step_down
-	step_right
-	step_25
-	step_end
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 Route110_Movement_14FF78:: @ 814FF78
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route110_Movement_14FF80:: @ 814FF80
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_15
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_down
+	end_movement
 
 Route110_Movement_14FF89:: @ 814FF89
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index f05e2caa2..8d6465c89 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -48,8 +48,8 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
 	end
 
 Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
 @ Coord event directly in front of the gatesman heading right to left
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 2f54753ab..edae49291 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -27,8 +27,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6
 	end
 
 Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
 	lockall
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index 2c2215a42..ca992427c 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -243,9 +243,9 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
 	end
 
 Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA
-	step_48
-	step_end
+	jump_in_place_left
+	end_movement
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index e7468ec4f..a14ce2e2d 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -298,27 +298,27 @@ Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
 
 Route110_TrickHouseEnd_Movement_161315:: @ 8161315
 Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
-	step_01
-	step_12
-	step_02
-	step_12
-	step_00
-	step_12
-	step_03
-	step_12
-	step_end
+	face_up
+	delay_4
+	face_left
+	delay_4
+	face_down
+	delay_4
+	face_right
+	delay_4
+	end_movement
 
 Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
 Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
-	step_01
-	step_52
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_end
+	face_up
+	disable_anim
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	end_movement
 
 Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
 	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
@@ -513,8 +513,8 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
 	end
 
 Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
-	step_54
-	step_end
+	set_invisible
+	end_movement
 
 Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index 5ec1a4d64..a7f283b2d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
@@ -646,80 +646,80 @@ Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082
 	return
 
 Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F
 Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_00
-	step_end
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_down
+	end_movement
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index 99fa29efb..3e1570aff 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -92,28 +92,28 @@ Route111_EventScript_1500A5:: @ 81500A5
 	end
 
 Route111_Movement_1500AF:: @ 81500AF
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
-	step_end
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
 
 Route111_EventScript_1500C5:: @ 81500C5
 	lock
@@ -202,20 +202,20 @@ Route111_EventScript_1501A9:: @ 81501A9
 	return
 
 Route111_Movement_1501B4:: @ 81501B4
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 Route111_Movement_1501B6:: @ 81501B6
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route111_Movement_1501B8:: @ 81501B8
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 Route111_Movement_1501BA:: @ 81501BA
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 Route111_EventScript_1501BC:: @ 81501BC
 	setweather WEATHER_SUNNY
@@ -321,19 +321,19 @@ Route111_EventScript_15034F:: @ 815034F
 	return
 
 Route111_Movement_150356:: @ 8150356
-	step_26
-	step_up
-	step_end
+	walk_in_place_fastest_up
+	walk_up
+	end_movement
 
 Route111_Movement_150359:: @ 8150359
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 Route111_Movement_15035B:: @ 815035B
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 Route111_EventScript_15035F:: @ 815035F
 	msgbox Route111_Text_16FC9C, 3
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index 570075078..a593ccccc 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -60,29 +60,29 @@ Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC
 	end
 
 Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6
-	step_up
-	step_up
-	step_right
-	step_27
-	step_end
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB
-	step_14
-	step_left
-	step_down
-	step_down
-	step_end
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	end_movement
 
 Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index eea14e25d..77fbf57a4 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -79,28 +79,28 @@ Route116_EventScript_150B12:: @ 8150B12
 	end
 
 Route116_Movement_150B1C:: @ 8150B1C
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 Route116_Movement_150B25:: @ 8150B25
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 Route116_EventScript_150B30:: @ 8150B30
 	msgbox Route116_Text_170A46, 3
@@ -200,29 +200,29 @@ Route116_EventScript_150C42:: @ 8150C42
 	return
 
 Route116_Movement_150C4D:: @ 8150C4D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 Route116_Movement_150C57:: @ 8150C57
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 Route116_EventScript_150C62:: @ 8150C62
 	trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index 569a7103e..b938d0cc2 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -109,54 +109,54 @@ Route118_EventScript_15105E:: @ 815105E
 	return
 
 Route118_Movement_151069:: @ 8151069
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 Route118_Movement_15106B:: @ 815106B
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 Route118_Movement_15106D:: @ 815106D
-	fast_step_down
-	step_14
-	step_down
-	step_end
+	jump_2_down
+	delay_16
+	walk_down
+	end_movement
 
 Route118_Movement_151071:: @ 8151071
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route118_Movement_15107C:: @ 815107C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route118_Movement_151086:: @ 8151086
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route118_EventScript_15108F:: @ 815108F
 	trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index 30eed9cc0..b1f2d33bf 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -202,54 +202,54 @@ Route119_EventScript_1513E1:: @ 81513E1
 	return
 
 Route119_Movement_1513F0:: @ 81513F0
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
 
 Route119_Movement_1513FA:: @ 81513FA
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
 
 Route119_Movement_151405:: @ 8151405
-	step_18
-	step_16
-	step_16
-	step_16
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route119_Movement_15140F:: @ 815140F
-	step_17
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route119_EventScript_15141A:: @ 815141A
 	msgbox Route119_Text_171698, 2
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 81037941f..32c264acc 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -79,10 +79,10 @@ Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
 	end
 
 Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
 	lock
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index eb696b45b..6f561391f 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -263,9 +263,9 @@ Route120_EventScript_15198A:: @ 815198A
 	return
 
 Route120_Movement_151995:: @ 8151995
-	step_down
-	step_left
-	step_end
+	walk_down
+	walk_left
+	end_movement
 
 Route120_EventScript_151998:: @ 8151998
 	msgbox Route120_Text_171B93, 2
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
index 6108b129d..5fe7f6330 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/scripts/maps/Route121.inc
@@ -34,37 +34,37 @@ Route121_EventScript_151B25:: @ 8151B25
 	end
 
 Route121_Movement_151B57:: @ 8151B57
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 Route121_Movement_151B60:: @ 8151B60
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 Route121_Movement_151B69:: @ 8151B69
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 Route121_EventScript_151B72:: @ 8151B72
 	trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 2648e19ce..6e9ae80fd 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -16,15 +16,15 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
 	end
 
 Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
 	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
@@ -119,19 +119,19 @@ Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
 	end
 
 Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_14
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	delay_16
+	end_movement
 
 Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
 	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index f580a7e0b..ec4fb954e 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -86,98 +86,98 @@ Route128_EventScript_15213F:: @ 815213F
 	end
 
 @ 815225E
-	step_17
-	step_end
+	walk_fast_left
+	end_movement
 
 @ 8152260
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 Route128_Movement_15226D:: @ 815226D
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 Route128_Movement_15226F:: @ 815226F
-	step_17
-	step_end
+	walk_fast_left
+	end_movement
 
 Route128_Movement_152271:: @ 8152271
-	step_15
-	step_27
-	step_14
-	step_28
-	step_14
-	step_14
-	step_25
-	step_end
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 Route128_Movement_152279:: @ 8152279
-	step_40
-	slow_step_up
-	step_14
-	step_41
-	step_end
+	lock_facing_direction
+	walk_slow_up
+	delay_16
+	unlock_facing_direction
+	end_movement
 
 Route128_Movement_15227E:: @ 815227E
-	step_17
-	step_17
-	step_17
-	step_28
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_in_place_fastest_right
+	end_movement
 
 Route128_Movement_152283:: @ 8152283
-	step_14
-	step_14
-	step_16
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route128_Movement_152290:: @ 8152290
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 Route128_Movement_152293:: @ 8152293
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 Route128_Movement_152296:: @ 8152296
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 Route128_Movement_1522A1:: @ 81522A1
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 Route128_EventScript_1522A4:: @ 81522A4
 	trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index 415138d67..72699ab79 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -224,101 +224,101 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	return
 
 @ 814C5B0
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 RustboroCity_Movement_14C5C2:: @ 814C5C2
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
 
 RustboroCity_Movement_14C5D3:: @ 814C5D3
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 RustboroCity_Movement_14C5DB:: @ 814C5DB
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 RustboroCity_Movement_14C5E3:: @ 814C5E3
-	step_down
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_Movement_14C5E7:: @ 814C5E7
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_Movement_14C5EC:: @ 814C5EC
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_Movement_14C5F1:: @ 814C5F1
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_Movement_14C5F7:: @ 814C5F7
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 RustboroCity_EventScript_14C5FF:: @ 814C5FF
 	lock
@@ -425,8 +425,8 @@ RustboroCity_EventScript_14C715:: @ 814C715
 	return
 
 RustboroCity_Movement_14C74B:: @ 814C74B
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 RustboroCity_EventScript_14C74D:: @ 814C74D
 	lockall
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 0b71effee..e68269437 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -69,79 +69,79 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	end
 
 @ 81577FE
-	step_up
-	step_up
-	step_up
-	step_27
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_27
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
-	step_14
-	step_25
-	step_end
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
-	step_14
-	step_14
-	step_down
-	step_down
-	step_28
-	step_end
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 155df8de5..f8193cbb8 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -112,53 +112,53 @@ RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34
 	end
 
 RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49
-	step_left
-	step_down
-	step_down
-	step_right
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_right
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	end_movement
 
 RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60
-	step_right
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_left
-	step_left
-	step_end
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	end_movement
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 06f2dfa82..1aae9faba 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -155,114 +155,114 @@ RusturfTunnel_EventScript_15C92D:: @ 815C92D
 	return
 
 RusturfTunnel_Movement_15C945:: @ 815C945
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 RusturfTunnel_Movement_15C951:: @ 815C951
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 @ 815C95D
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 @ 815C960
-	step_down
-	step_26
-	step_13
-	step_28
-	step_end
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
 
 @ 815C965
-	step_up
-	step_25
-	step_13
-	step_28
-	step_end
+	walk_up
+	walk_in_place_fastest_down
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
 
 RusturfTunnel_Movement_15C96A:: @ 815C96A
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 RusturfTunnel_Movement_15C96D:: @ 815C96D
-	step_right
-	step_27
-	step_end
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 RusturfTunnel_Movement_15C970:: @ 815C970
-	step_up
-	step_28
-	step_end
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
 
 RusturfTunnel_Movement_15C973:: @ 815C973
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 RusturfTunnel_Movement_15C980:: @ 815C980
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
 
 RusturfTunnel_Movement_15C98D:: @ 815C98D
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 RusturfTunnel_Movement_15C98F:: @ 815C98F
-	step_22
-	step_22
-	step_16
-	step_18
-	step_end
+	walk_in_place_fast_up
+	walk_in_place_fast_up
+	walk_fast_up
+	walk_fast_right
+	end_movement
 
 RusturfTunnel_Movement_15C994:: @ 815C994
-	step_24
-	step_24
-	step_18
-	step_26
-	step_end
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
 
 RusturfTunnel_EventScript_15C999:: @ 815C999
 	setvar VAR_TEMP_1, 1
@@ -290,10 +290,10 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
 	end
 
 RusturfTunnel_Movement_15C9D3:: @ 815C9D3
-	step_40
-	step_right
-	step_41
-	step_end
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
 
 RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
 	lock
@@ -349,70 +349,70 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	end
 
 RusturfTunnel_Movement_15CA99:: @ 815CA99
-	step_00
-	step_40
-	step_up
-	step_41
-	step_27
-	step_end
+	face_down
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	walk_in_place_fastest_left
+	end_movement
 
 RusturfTunnel_Movement_15CA9F:: @ 815CA9F
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 RusturfTunnel_Movement_15CAA2:: @ 815CAA2
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
 
 RusturfTunnel_Movement_15CAAC:: @ 815CAAC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 RusturfTunnel_Movement_15CAB4:: @ 815CAB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 RusturfTunnel_Movement_15CAC0:: @ 815CAC0
-	step_14
-	step_right
-	step_end
+	delay_16
+	walk_right
+	end_movement
 
 RusturfTunnel_Movement_15CAC3:: @ 815CAC3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 RusturfTunnel_EventScript_15CACD:: @ 815CACD
 	trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc
index 493aa55a1..d7d581891 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/scripts/maps/SafariZone_Southeast.inc
@@ -29,13 +29,13 @@ SafariZone_Southeast_EventScript_16007F:: @ 816007F
 	return
 
 SafariZone_Southeast_Movement_160087:: @ 8160087
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 SafariZone_Southeast_Movement_160089:: @ 8160089
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 SafariZone_Southeast_EventScript_16008C:: @ 816008C
 	msgbox SafariZone_Southeast_Text_1C3B71, 2
@@ -99,20 +99,20 @@ SafariZone_Southeast_EventScript_160139:: @ 8160139
 	end
 
 SafariZone_Southeast_Movement_16014B:: @ 816014B
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 SafariZone_Southeast_Movement_16014D:: @ 816014D
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 SafariZone_Southeast_Movement_160150:: @ 8160150
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 SafariZone_Southeast_Movement_160153:: @ 8160153
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index f9cd83cac..eb46278dd 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -216,76 +216,76 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	end
 
 SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 @ 815DD3E
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
-	step_left
-	step_14
-	step_end
+	walk_left
+	delay_16
+	end_movement
 
 @ 815DD44
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
-	step_01
-	step_40
-	step_down
-	step_41
-	step_28
-	step_end
+	face_up
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	walk_in_place_fastest_right
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
-	step_32
-	step_32
-	step_end
+	slide_up
+	slide_up
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 213fc3163..7d244e633 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36
 
 SlateportCity_MapScript1_14BA3C:: @ 814BA3C
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
 	.else
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
 	.endif
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
 	call SlateportCity_EventScript_14BA5C
@@ -537,96 +537,96 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	end
 
 SlateportCity_Movement_14BFCD:: @ 814BFCD
-	step_14
-	step_14
-	step_57
-	step_28
-	step_14
-	step_14
-	step_27
-	step_end
+	delay_16
+	delay_16
+	emote_question_mark
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
 
 SlateportCity_Movement_14BFD5:: @ 814BFD5
-	step_57
-	step_26
-	step_14
-	step_25
-	step_14
-	step_14
-	step_27
-	step_end
+	emote_question_mark
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
 
 SlateportCity_Movement_14BFDD:: @ 814BFDD
-	step_14
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 SlateportCity_Movement_14BFEA:: @ 814BFEA
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 @ 814BFF8
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 SlateportCity_Movement_14BFFB:: @ 814BFFB
-	step_right
-	step_up
-	step_up
-	step_54
-	step_end
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
 
 SlateportCity_Movement_14C000:: @ 814C000
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
+	end_movement
 
 SlateportCity_Movement_14C008:: @ 814C008
-	step_28
-	step_14
-	step_14
-	step_right
-	step_up
-	step_end
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	end_movement
 
 SlateportCity_Movement_14C00E:: @ 814C00E
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_25
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 SlateportCity_EventScript_14C017:: @ 814C017
 	msgbox SlateportCity_Text_165425, 3
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index 22f797968..fd26671dd 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -46,46 +46,46 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
 	return
 
 SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF
-	step_down
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE
 	msgbox SlateportCity_ContestLobby_Text_17C937, 2
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 82a17b0a6..8ab61661a 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -101,59 +101,59 @@ SlateportCity_Harbor_EventScript_156086:: @ 8156086
 	return
 
 SlateportCity_Harbor_Movement_15609B:: @ 815609B
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
 
 @ 81560A0
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
 
 SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
 
 SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	end_movement
 
 SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
-	step_left
-	step_left
-	step_up
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	end_movement
 
 SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
@@ -247,13 +247,13 @@ SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
 	return
 
 SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
-	step_right
-	step_26
-	step_end
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
 	msgbox SlateportCity_Harbor_Text_17FC07, 2
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 45ca62167..cb65f1be5 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
 
 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
 	.else
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
 	.endif
 	end
 
@@ -74,8 +74,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
 	end
 
 SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2
@@ -199,19 +199,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2
 	end
 
 SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC
-	step_00
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
+	face_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
 
 SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index d84982e2e..6947d52b1 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -114,104 +114,104 @@ SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
 	return
 
 SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
-	step_left
-	step_down
-	step_27
-	step_end
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
-	step_up
-	step_left
-	step_left
-	step_down
-	step_27
-	step_end
+	walk_up
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
-	step_down
-	step_right
-	step_25
-	step_end
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
-	step_40
-	step_left
-	step_41
-	step_end
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_15
-	step_26
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 6222d3774..f5452a7bb 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -282,146 +282,146 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	end
 
 SootopolisCity_Movement_14D413:: @ 814D413
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 SootopolisCity_Movement_14D417:: @ 814D417
-	step_right
-	step_right
-	step_right
-	step_up
-	step_25
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 SootopolisCity_Movement_14D41D:: @ 814D41D
-	step_down
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
 
 SootopolisCity_Movement_14D42D:: @ 814D42D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SootopolisCity_Movement_14D440:: @ 814D440
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SootopolisCity_Movement_14D445:: @ 814D445
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 SootopolisCity_Movement_14D457:: @ 814D457
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SootopolisCity_Movement_14D46A:: @ 814D46A
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 SootopolisCity_Movement_14D47C:: @ 814D47C
-	step_14
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 SootopolisCity_EventScript_14D48F:: @ 814D48F
 	.ifdef SAPPHIRE
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index 0ad6aa027..a404013e0 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -82,8 +82,8 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
 	end
 
 SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
-	step_54
-	step_end
+	set_invisible
+	end_movement
 
 SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
 	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 874e3e901..13e4774e2 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -41,13 +41,13 @@ BattleTower_Outside_EventScript_160B3A:: @ 8160B3A
 	return
 
 BattleTower_Outside_Movement_160B45:: @ 8160B45
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 BattleTower_Outside_Movement_160B47:: @ 8160B47
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A
 	msgbox SouthernIsland_Exterior_Text_1C52FB, 3
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
index 1a537cfb0..7094ebed8 100644
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ b/data/scripts/maps/SouthernIsland_Interior.inc
@@ -13,9 +13,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
 
 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS
 	.else
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS
 	.endif
 	call SouthernIsland_Interior_EventScript_160B77
 	end
@@ -29,11 +29,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77
 	end
 
 SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 SouthernIsland_Interior_EventScript_160B95:: @ 8160B95
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
@@ -76,35 +76,35 @@ SouthernIsland_Interior_EventScript_160C08:: @ 8160C08
 	end
 
 SouthernIsland_Interior_Movement_160C12:: @ 8160C12
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 SouthernIsland_Interior_Movement_160C16:: @ 8160C16
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_26
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 SouthernIsland_Interior_Movement_160C22:: @ 8160C22
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
index 44b9463b4..7377d2298 100644
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ b/data/scripts/maps/UnknownMap_25_34.inc
@@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
 	return
 
 FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 3aef08e94..32661485d 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -46,46 +46,46 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
 	return
 
 VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28
-	step_down
-	step_down
-	step_26
-	step_end
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
 
 VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
 
 VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37
 	lockall
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index 4f3180318..045189759 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -48,43 +48,43 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
 	end
 
 VictoryRoad_1F_Movement_15DF07:: @ 815DF07
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
 
 VictoryRoad_1F_Movement_15DF13:: @ 815DF13
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
 
 VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
 
 VictoryRoad_1F_EventScript_15DF28:: @ 815DF28
 	msgbox VictoryRoad_1F_Text_197967, 2
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 3d8f5532f..a1a99fa89 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -32,8 +32,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
@@ -118,34 +118,34 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2
-	step_13
-	step_down
-	step_27
-	step_14
-	step_13
-	step_left
-	step_end
+	delay_8
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_8
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9
-	step_right
-	step_up
-	step_13
-	step_end
+	walk_right
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
-	step_13
-	step_down
-	step_28
-	step_14
-	step_13
-	step_right
-	step_end
+	delay_8
+	walk_down
+	walk_in_place_fastest_right
+	delay_16
+	delay_8
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4
-	step_left
-	step_up
-	step_13
-	step_end
+	walk_left
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
@@ -226,26 +226,26 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE
-	step_right
-	step_27
-	step_end
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1
-	step_left
-	step_down
-	step_28
-	step_end
+	walk_left
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5
-	step_right
-	step_down
-	step_27
-	step_end
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
@@ -327,32 +327,32 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
@@ -455,58 +455,58 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
-	step_down
-	step_right
-	step_right
-	step_down
-	step_13
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
-	step_down
-	step_left
-	step_left
-	step_down
-	step_13
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
-	step_14
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F
-	step_14
-	step_14
-	step_14
-	step_25
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
-	step_14
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 4b21aa99b..6f8cb1176 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -182,8 +182,8 @@ FallarborTown_ContestLobby_Movement_1B7821:: @ 81B7821
 LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821
 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821
 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
 	goto FallarborTown_ContestLobby_EventScript_1B783B
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 6fe9e9a6e..49b8c5286 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -42,29 +42,29 @@ Route111_EventScript_1A38D9:: @ 81A38D9
 	end
 
 Route111_Movement_1A38E3:: @ 81A38E3
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 Route111_Movement_1A38EF:: @ 81A38EF
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/specials.inc b/data/specials.inc
index bb2065429..2728d98fc 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -51,12 +51,12 @@ gSpecials::
 	def_special LoadPlayerParty
 	def_special sub_80C5568
 	def_special sub_8083BDC
-	def_special FieldObjectInteractionGetBerryTreeData
+	def_special EventObjectInteractionGetBerryTreeData
 	def_special Berry_FadeAndGoToBerryBagMenu
-	def_special FieldObjectInteractionPlantBerryTree
-	def_special FieldObjectInteractionPickBerryTree
-	def_special FieldObjectInteractionRemoveBerryTree
-	def_special FieldObjectInteractionWaterBerryTree
+	def_special EventObjectInteractionPlantBerryTree
+	def_special EventObjectInteractionPickBerryTree
+	def_special EventObjectInteractionRemoveBerryTree
+	def_special EventObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
 	def_special ScrSpecial_GetTrainerBattleMode
@@ -187,7 +187,7 @@ gSpecials::
 	def_special IsTVShowInSearchOfTrainersAiring
 	def_special GabbyAndTyGetLastQuote
 	def_special GabbyAndTyGetLastBattleTrivia
-	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	def_special GetBattleOutcome
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
@@ -295,7 +295,7 @@ gSpecials::
 	def_special WaitWeather
 	def_special BufferEReaderTrainerName
 	def_special GetSlotMachineId
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special FoundAbandonedShipRoom1Key
 	def_special FoundAbandonedShipRoom2Key
 	def_special FoundAbandonedShipRoom4Key
@@ -337,7 +337,7 @@ gSpecials::
 	def_special ScriptGetMultiplayerId
 	def_special ScriptGetPartyMonSpecies
 	def_special IsSelectedMonEgg
-	def_special sub_810F8FC
+	def_special TryInitBattleTowerAwardManEventObject
 	def_special MoveSecretBase
 	def_special LoadPlayerBag
 	def_special sub_8081924
diff --git a/graphics/map_objects/palettes/00.pal b/graphics/event_objects/palettes/00.pal
index 7bb5bd9ed..7bb5bd9ed 100644
--- a/graphics/map_objects/palettes/00.pal
+++ b/graphics/event_objects/palettes/00.pal
diff --git a/graphics/map_objects/palettes/01.pal b/graphics/event_objects/palettes/01.pal
index 558095bda..558095bda 100644
--- a/graphics/map_objects/palettes/01.pal
+++ b/graphics/event_objects/palettes/01.pal
diff --git a/graphics/map_objects/palettes/02.pal b/graphics/event_objects/palettes/02.pal
index b84930395..b84930395 100644
--- a/graphics/map_objects/palettes/02.pal
+++ b/graphics/event_objects/palettes/02.pal
diff --git a/graphics/map_objects/palettes/03.pal b/graphics/event_objects/palettes/03.pal
index 6c53450ba..6c53450ba 100644
--- a/graphics/map_objects/palettes/03.pal
+++ b/graphics/event_objects/palettes/03.pal
diff --git a/graphics/map_objects/palettes/04.pal b/graphics/event_objects/palettes/04.pal
index 7b1e30115..7b1e30115 100644
--- a/graphics/map_objects/palettes/04.pal
+++ b/graphics/event_objects/palettes/04.pal
diff --git a/graphics/map_objects/palettes/05.pal b/graphics/event_objects/palettes/05.pal
index bcea45b22..bcea45b22 100644
--- a/graphics/map_objects/palettes/05.pal
+++ b/graphics/event_objects/palettes/05.pal
diff --git a/graphics/map_objects/palettes/06.pal b/graphics/event_objects/palettes/06.pal
index a94b5acd4..a94b5acd4 100644
--- a/graphics/map_objects/palettes/06.pal
+++ b/graphics/event_objects/palettes/06.pal
diff --git a/graphics/map_objects/palettes/07.pal b/graphics/event_objects/palettes/07.pal
index 3dc56e918..3dc56e918 100644
--- a/graphics/map_objects/palettes/07.pal
+++ b/graphics/event_objects/palettes/07.pal
diff --git a/graphics/map_objects/palettes/08.pal b/graphics/event_objects/palettes/08.pal
index e7717d74e..e7717d74e 100644
--- a/graphics/map_objects/palettes/08.pal
+++ b/graphics/event_objects/palettes/08.pal
diff --git a/graphics/map_objects/palettes/09.pal b/graphics/event_objects/palettes/09.pal
index 758b59c4f..758b59c4f 100644
--- a/graphics/map_objects/palettes/09.pal
+++ b/graphics/event_objects/palettes/09.pal
diff --git a/graphics/map_objects/palettes/10.pal b/graphics/event_objects/palettes/10.pal
index 0cebd6c4d..0cebd6c4d 100644
--- a/graphics/map_objects/palettes/10.pal
+++ b/graphics/event_objects/palettes/10.pal
diff --git a/graphics/map_objects/palettes/11.pal b/graphics/event_objects/palettes/11.pal
index b28799ed8..b28799ed8 100644
--- a/graphics/map_objects/palettes/11.pal
+++ b/graphics/event_objects/palettes/11.pal
diff --git a/graphics/map_objects/palettes/12.pal b/graphics/event_objects/palettes/12.pal
index b36c29ab1..b36c29ab1 100644
--- a/graphics/map_objects/palettes/12.pal
+++ b/graphics/event_objects/palettes/12.pal
diff --git a/graphics/map_objects/palettes/13.pal b/graphics/event_objects/palettes/13.pal
index b69e9ac0a..b69e9ac0a 100644
--- a/graphics/map_objects/palettes/13.pal
+++ b/graphics/event_objects/palettes/13.pal
diff --git a/graphics/map_objects/palettes/14.pal b/graphics/event_objects/palettes/14.pal
index 61947264f..61947264f 100644
--- a/graphics/map_objects/palettes/14.pal
+++ b/graphics/event_objects/palettes/14.pal
diff --git a/graphics/map_objects/palettes/15.pal b/graphics/event_objects/palettes/15.pal
index 9cce740df..9cce740df 100644
--- a/graphics/map_objects/palettes/15.pal
+++ b/graphics/event_objects/palettes/15.pal
diff --git a/graphics/map_objects/palettes/16.pal b/graphics/event_objects/palettes/16.pal
index 5ce2f4728..5ce2f4728 100644
--- a/graphics/map_objects/palettes/16.pal
+++ b/graphics/event_objects/palettes/16.pal
diff --git a/graphics/map_objects/palettes/17.pal b/graphics/event_objects/palettes/17.pal
index e106ce693..e106ce693 100644
--- a/graphics/map_objects/palettes/17.pal
+++ b/graphics/event_objects/palettes/17.pal
diff --git a/graphics/map_objects/palettes/18.pal b/graphics/event_objects/palettes/18.pal
index aeb04ccf8..aeb04ccf8 100644
--- a/graphics/map_objects/palettes/18.pal
+++ b/graphics/event_objects/palettes/18.pal
diff --git a/graphics/map_objects/palettes/19.pal b/graphics/event_objects/palettes/19.pal
index 53de0c383..53de0c383 100644
--- a/graphics/map_objects/palettes/19.pal
+++ b/graphics/event_objects/palettes/19.pal
diff --git a/graphics/map_objects/palettes/20.pal b/graphics/event_objects/palettes/20.pal
index 64985f6da..64985f6da 100644
--- a/graphics/map_objects/palettes/20.pal
+++ b/graphics/event_objects/palettes/20.pal
diff --git a/graphics/map_objects/palettes/21.pal b/graphics/event_objects/palettes/21.pal
index 5e68e105d..5e68e105d 100644
--- a/graphics/map_objects/palettes/21.pal
+++ b/graphics/event_objects/palettes/21.pal
diff --git a/graphics/map_objects/palettes/22.pal b/graphics/event_objects/palettes/22.pal
index 21fa9999d..21fa9999d 100644
--- a/graphics/map_objects/palettes/22.pal
+++ b/graphics/event_objects/palettes/22.pal
diff --git a/graphics/map_objects/palettes/23.pal b/graphics/event_objects/palettes/23.pal
index 73b0b1d41..73b0b1d41 100644
--- a/graphics/map_objects/palettes/23.pal
+++ b/graphics/event_objects/palettes/23.pal
diff --git a/graphics/map_objects/palettes/24.pal b/graphics/event_objects/palettes/24.pal
index d710b6830..d710b6830 100644
--- a/graphics/map_objects/palettes/24.pal
+++ b/graphics/event_objects/palettes/24.pal
diff --git a/graphics/map_objects/palettes/25.pal b/graphics/event_objects/palettes/25.pal
index f48038d41..f48038d41 100644
--- a/graphics/map_objects/palettes/25.pal
+++ b/graphics/event_objects/palettes/25.pal
diff --git a/graphics/map_objects/palettes/26.pal b/graphics/event_objects/palettes/26.pal
index fe4c1c112..fe4c1c112 100644
--- a/graphics/map_objects/palettes/26.pal
+++ b/graphics/event_objects/palettes/26.pal
diff --git a/graphics/map_objects/pics/berry_trees/aguav/0.png b/graphics/event_objects/pics/berry_trees/aguav/0.png
index 0463d51db..0463d51db 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/0.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/0.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/1.png b/graphics/event_objects/pics/berry_trees/aguav/1.png
index a5f4b8bee..a5f4b8bee 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/1.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/1.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/2.png b/graphics/event_objects/pics/berry_trees/aguav/2.png
index 7af57fd97..7af57fd97 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/2.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/2.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/3.png b/graphics/event_objects/pics/berry_trees/aguav/3.png
index 0fdd3f994..0fdd3f994 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/3.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/3.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/4.png b/graphics/event_objects/pics/berry_trees/aguav/4.png
index f3fc70076..f3fc70076 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/4.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/4.png
diff --git a/graphics/map_objects/pics/berry_trees/aguav/5.png b/graphics/event_objects/pics/berry_trees/aguav/5.png
index b437940bf..b437940bf 100644
--- a/graphics/map_objects/pics/berry_trees/aguav/5.png
+++ b/graphics/event_objects/pics/berry_trees/aguav/5.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/0.png b/graphics/event_objects/pics/berry_trees/aspear/0.png
index 933957413..933957413 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/0.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/0.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/1.png b/graphics/event_objects/pics/berry_trees/aspear/1.png
index ee750e7f3..ee750e7f3 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/1.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/1.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/2.png b/graphics/event_objects/pics/berry_trees/aspear/2.png
index e3a4e47bb..e3a4e47bb 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/2.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/2.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/3.png b/graphics/event_objects/pics/berry_trees/aspear/3.png
index df16ae330..df16ae330 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/3.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/3.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/4.png b/graphics/event_objects/pics/berry_trees/aspear/4.png
index 8d9bd38fb..8d9bd38fb 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/4.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/4.png
diff --git a/graphics/map_objects/pics/berry_trees/aspear/5.png b/graphics/event_objects/pics/berry_trees/aspear/5.png
index 495119480..495119480 100644
--- a/graphics/map_objects/pics/berry_trees/aspear/5.png
+++ b/graphics/event_objects/pics/berry_trees/aspear/5.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/0.png b/graphics/event_objects/pics/berry_trees/cheri/0.png
index 18588dc6c..18588dc6c 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/0.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/0.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/1.png b/graphics/event_objects/pics/berry_trees/cheri/1.png
index e9419d0fe..e9419d0fe 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/1.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/1.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/2.png b/graphics/event_objects/pics/berry_trees/cheri/2.png
index 4022a7e5e..4022a7e5e 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/2.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/2.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/3.png b/graphics/event_objects/pics/berry_trees/cheri/3.png
index c2572383c..c2572383c 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/3.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/3.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/4.png b/graphics/event_objects/pics/berry_trees/cheri/4.png
index 462596c51..462596c51 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/4.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/4.png
diff --git a/graphics/map_objects/pics/berry_trees/cheri/5.png b/graphics/event_objects/pics/berry_trees/cheri/5.png
index 447f1d865..447f1d865 100644
--- a/graphics/map_objects/pics/berry_trees/cheri/5.png
+++ b/graphics/event_objects/pics/berry_trees/cheri/5.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/0.png b/graphics/event_objects/pics/berry_trees/chesto/0.png
index 516a334c1..516a334c1 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/0.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/0.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/1.png b/graphics/event_objects/pics/berry_trees/chesto/1.png
index dacc90fb3..dacc90fb3 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/1.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/1.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/2.png b/graphics/event_objects/pics/berry_trees/chesto/2.png
index c0a2ec30d..c0a2ec30d 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/2.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/2.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/3.png b/graphics/event_objects/pics/berry_trees/chesto/3.png
index 328fee834..328fee834 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/3.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/3.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/4.png b/graphics/event_objects/pics/berry_trees/chesto/4.png
index d40a393a2..d40a393a2 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/4.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/4.png
diff --git a/graphics/map_objects/pics/berry_trees/chesto/5.png b/graphics/event_objects/pics/berry_trees/chesto/5.png
index 3d3d03d64..3d3d03d64 100644
--- a/graphics/map_objects/pics/berry_trees/chesto/5.png
+++ b/graphics/event_objects/pics/berry_trees/chesto/5.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/0.png b/graphics/event_objects/pics/berry_trees/cornn/0.png
index 8388b030c..8388b030c 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/0.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/0.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/1.png b/graphics/event_objects/pics/berry_trees/cornn/1.png
index 23d529796..23d529796 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/1.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/1.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/2.png b/graphics/event_objects/pics/berry_trees/cornn/2.png
index 969020d39..969020d39 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/2.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/2.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/3.png b/graphics/event_objects/pics/berry_trees/cornn/3.png
index 88d136547..88d136547 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/3.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/3.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/4.png b/graphics/event_objects/pics/berry_trees/cornn/4.png
index c50789645..c50789645 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/4.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/4.png
diff --git a/graphics/map_objects/pics/berry_trees/cornn/5.png b/graphics/event_objects/pics/berry_trees/cornn/5.png
index de7b7f4ad..de7b7f4ad 100644
--- a/graphics/map_objects/pics/berry_trees/cornn/5.png
+++ b/graphics/event_objects/pics/berry_trees/cornn/5.png
diff --git a/graphics/map_objects/pics/berry_trees/dirt_pile.png b/graphics/event_objects/pics/berry_trees/dirt_pile.png
index 3790fd846..3790fd846 100644
--- a/graphics/map_objects/pics/berry_trees/dirt_pile.png
+++ b/graphics/event_objects/pics/berry_trees/dirt_pile.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/0.png b/graphics/event_objects/pics/berry_trees/durin/0.png
index eefe4ba78..eefe4ba78 100644
--- a/graphics/map_objects/pics/berry_trees/durin/0.png
+++ b/graphics/event_objects/pics/berry_trees/durin/0.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/1.png b/graphics/event_objects/pics/berry_trees/durin/1.png
index d5b75b3b3..d5b75b3b3 100644
--- a/graphics/map_objects/pics/berry_trees/durin/1.png
+++ b/graphics/event_objects/pics/berry_trees/durin/1.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/2.png b/graphics/event_objects/pics/berry_trees/durin/2.png
index cf854194d..cf854194d 100644
--- a/graphics/map_objects/pics/berry_trees/durin/2.png
+++ b/graphics/event_objects/pics/berry_trees/durin/2.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/3.png b/graphics/event_objects/pics/berry_trees/durin/3.png
index 41425502f..41425502f 100644
--- a/graphics/map_objects/pics/berry_trees/durin/3.png
+++ b/graphics/event_objects/pics/berry_trees/durin/3.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/4.png b/graphics/event_objects/pics/berry_trees/durin/4.png
index 66337024c..66337024c 100644
--- a/graphics/map_objects/pics/berry_trees/durin/4.png
+++ b/graphics/event_objects/pics/berry_trees/durin/4.png
diff --git a/graphics/map_objects/pics/berry_trees/durin/5.png b/graphics/event_objects/pics/berry_trees/durin/5.png
index 22c672fac..22c672fac 100644
--- a/graphics/map_objects/pics/berry_trees/durin/5.png
+++ b/graphics/event_objects/pics/berry_trees/durin/5.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/0.png b/graphics/event_objects/pics/berry_trees/figy/0.png
index 0eea8f98c..0eea8f98c 100644
--- a/graphics/map_objects/pics/berry_trees/figy/0.png
+++ b/graphics/event_objects/pics/berry_trees/figy/0.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/1.png b/graphics/event_objects/pics/berry_trees/figy/1.png
index 018e0ae3f..018e0ae3f 100644
--- a/graphics/map_objects/pics/berry_trees/figy/1.png
+++ b/graphics/event_objects/pics/berry_trees/figy/1.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/2.png b/graphics/event_objects/pics/berry_trees/figy/2.png
index df10bb526..df10bb526 100644
--- a/graphics/map_objects/pics/berry_trees/figy/2.png
+++ b/graphics/event_objects/pics/berry_trees/figy/2.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/3.png b/graphics/event_objects/pics/berry_trees/figy/3.png
index bf1785f87..bf1785f87 100644
--- a/graphics/map_objects/pics/berry_trees/figy/3.png
+++ b/graphics/event_objects/pics/berry_trees/figy/3.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/4.png b/graphics/event_objects/pics/berry_trees/figy/4.png
index 46d794635..46d794635 100644
--- a/graphics/map_objects/pics/berry_trees/figy/4.png
+++ b/graphics/event_objects/pics/berry_trees/figy/4.png
diff --git a/graphics/map_objects/pics/berry_trees/figy/5.png b/graphics/event_objects/pics/berry_trees/figy/5.png
index 945773fda..945773fda 100644
--- a/graphics/map_objects/pics/berry_trees/figy/5.png
+++ b/graphics/event_objects/pics/berry_trees/figy/5.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/0.png b/graphics/event_objects/pics/berry_trees/grepa/0.png
index abd265e0b..abd265e0b 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/0.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/1.png b/graphics/event_objects/pics/berry_trees/grepa/1.png
index 27e90c9bd..27e90c9bd 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/1.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/2.png b/graphics/event_objects/pics/berry_trees/grepa/2.png
index 22e354eb0..22e354eb0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/2.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/3.png b/graphics/event_objects/pics/berry_trees/grepa/3.png
index e23824dd3..e23824dd3 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/3.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/4.png b/graphics/event_objects/pics/berry_trees/grepa/4.png
index 4b8ad19a0..4b8ad19a0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/4.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/grepa/5.png b/graphics/event_objects/pics/berry_trees/grepa/5.png
index 9bf54a3e0..9bf54a3e0 100644
--- a/graphics/map_objects/pics/berry_trees/grepa/5.png
+++ b/graphics/event_objects/pics/berry_trees/grepa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/0.png b/graphics/event_objects/pics/berry_trees/hondew/0.png
index ab1cffe55..ab1cffe55 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/0.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/0.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/1.png b/graphics/event_objects/pics/berry_trees/hondew/1.png
index e24fd5b95..e24fd5b95 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/1.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/1.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/2.png b/graphics/event_objects/pics/berry_trees/hondew/2.png
index dc7938958..dc7938958 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/2.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/2.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/3.png b/graphics/event_objects/pics/berry_trees/hondew/3.png
index 5c9536e87..5c9536e87 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/3.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/3.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/4.png b/graphics/event_objects/pics/berry_trees/hondew/4.png
index 2419d058b..2419d058b 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/4.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/4.png
diff --git a/graphics/map_objects/pics/berry_trees/hondew/5.png b/graphics/event_objects/pics/berry_trees/hondew/5.png
index 76aa9a8e3..76aa9a8e3 100644
--- a/graphics/map_objects/pics/berry_trees/hondew/5.png
+++ b/graphics/event_objects/pics/berry_trees/hondew/5.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/0.png b/graphics/event_objects/pics/berry_trees/iapapa/0.png
index 506c8bb4b..506c8bb4b 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/0.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/1.png b/graphics/event_objects/pics/berry_trees/iapapa/1.png
index 6eae7f4ba..6eae7f4ba 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/1.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/2.png b/graphics/event_objects/pics/berry_trees/iapapa/2.png
index d779ca7fb..d779ca7fb 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/2.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/3.png b/graphics/event_objects/pics/berry_trees/iapapa/3.png
index 4bbd498e3..4bbd498e3 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/3.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/4.png b/graphics/event_objects/pics/berry_trees/iapapa/4.png
index 36cde6254..36cde6254 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/4.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/iapapa/5.png b/graphics/event_objects/pics/berry_trees/iapapa/5.png
index b6a39d318..b6a39d318 100644
--- a/graphics/map_objects/pics/berry_trees/iapapa/5.png
+++ b/graphics/event_objects/pics/berry_trees/iapapa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/0.png b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
index bb794552a..bb794552a 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/0.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/0.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/1.png b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
index 90257b261..90257b261 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/1.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/1.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/2.png b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
index 2f3fec1ec..2f3fec1ec 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/2.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/2.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/3.png b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
index 2efd0d160..2efd0d160 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/3.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/3.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/4.png b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
index cf0c47d0a..cf0c47d0a 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/4.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/4.png
diff --git a/graphics/map_objects/pics/berry_trees/kelpsy/5.png b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
index e31dfd23f..e31dfd23f 100644
--- a/graphics/map_objects/pics/berry_trees/kelpsy/5.png
+++ b/graphics/event_objects/pics/berry_trees/kelpsy/5.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/0.png b/graphics/event_objects/pics/berry_trees/lansat/0.png
index 56d59b0a7..56d59b0a7 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/0.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/0.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/1.png b/graphics/event_objects/pics/berry_trees/lansat/1.png
index 59e7edcfa..59e7edcfa 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/1.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/1.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/2.png b/graphics/event_objects/pics/berry_trees/lansat/2.png
index f4d1145ef..f4d1145ef 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/2.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/2.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/3.png b/graphics/event_objects/pics/berry_trees/lansat/3.png
index 32ca5e3e9..32ca5e3e9 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/3.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/3.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/4.png b/graphics/event_objects/pics/berry_trees/lansat/4.png
index bf285b8ee..bf285b8ee 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/4.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/4.png
diff --git a/graphics/map_objects/pics/berry_trees/lansat/5.png b/graphics/event_objects/pics/berry_trees/lansat/5.png
index 3a8dae404..3a8dae404 100644
--- a/graphics/map_objects/pics/berry_trees/lansat/5.png
+++ b/graphics/event_objects/pics/berry_trees/lansat/5.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/0.png b/graphics/event_objects/pics/berry_trees/leppa/0.png
index cecd61e2d..cecd61e2d 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/0.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/0.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/1.png b/graphics/event_objects/pics/berry_trees/leppa/1.png
index f3ce88199..f3ce88199 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/1.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/1.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/2.png b/graphics/event_objects/pics/berry_trees/leppa/2.png
index d00cf5f89..d00cf5f89 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/2.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/2.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/3.png b/graphics/event_objects/pics/berry_trees/leppa/3.png
index 8a9ed3c34..8a9ed3c34 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/3.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/3.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/4.png b/graphics/event_objects/pics/berry_trees/leppa/4.png
index dd4fc6df2..dd4fc6df2 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/4.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/4.png
diff --git a/graphics/map_objects/pics/berry_trees/leppa/5.png b/graphics/event_objects/pics/berry_trees/leppa/5.png
index 056518295..056518295 100644
--- a/graphics/map_objects/pics/berry_trees/leppa/5.png
+++ b/graphics/event_objects/pics/berry_trees/leppa/5.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/0.png b/graphics/event_objects/pics/berry_trees/liechi/0.png
index 51827869f..51827869f 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/0.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/0.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/1.png b/graphics/event_objects/pics/berry_trees/liechi/1.png
index 182400260..182400260 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/1.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/1.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/2.png b/graphics/event_objects/pics/berry_trees/liechi/2.png
index a24565623..a24565623 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/2.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/2.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/3.png b/graphics/event_objects/pics/berry_trees/liechi/3.png
index b7bde2e7f..b7bde2e7f 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/3.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/3.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/4.png b/graphics/event_objects/pics/berry_trees/liechi/4.png
index 2ed774c17..2ed774c17 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/4.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/4.png
diff --git a/graphics/map_objects/pics/berry_trees/liechi/5.png b/graphics/event_objects/pics/berry_trees/liechi/5.png
index d8fe39b21..d8fe39b21 100644
--- a/graphics/map_objects/pics/berry_trees/liechi/5.png
+++ b/graphics/event_objects/pics/berry_trees/liechi/5.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/0.png b/graphics/event_objects/pics/berry_trees/lum/0.png
index 4c08ea797..4c08ea797 100644
--- a/graphics/map_objects/pics/berry_trees/lum/0.png
+++ b/graphics/event_objects/pics/berry_trees/lum/0.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/1.png b/graphics/event_objects/pics/berry_trees/lum/1.png
index b2035c555..b2035c555 100644
--- a/graphics/map_objects/pics/berry_trees/lum/1.png
+++ b/graphics/event_objects/pics/berry_trees/lum/1.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/2.png b/graphics/event_objects/pics/berry_trees/lum/2.png
index b09991fd9..b09991fd9 100644
--- a/graphics/map_objects/pics/berry_trees/lum/2.png
+++ b/graphics/event_objects/pics/berry_trees/lum/2.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/3.png b/graphics/event_objects/pics/berry_trees/lum/3.png
index e32e7b64a..e32e7b64a 100644
--- a/graphics/map_objects/pics/berry_trees/lum/3.png
+++ b/graphics/event_objects/pics/berry_trees/lum/3.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/4.png b/graphics/event_objects/pics/berry_trees/lum/4.png
index 1347d66b2..1347d66b2 100644
--- a/graphics/map_objects/pics/berry_trees/lum/4.png
+++ b/graphics/event_objects/pics/berry_trees/lum/4.png
diff --git a/graphics/map_objects/pics/berry_trees/lum/5.png b/graphics/event_objects/pics/berry_trees/lum/5.png
index 1c601d09b..1c601d09b 100644
--- a/graphics/map_objects/pics/berry_trees/lum/5.png
+++ b/graphics/event_objects/pics/berry_trees/lum/5.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/0.png b/graphics/event_objects/pics/berry_trees/mago/0.png
index b58d4aba1..b58d4aba1 100644
--- a/graphics/map_objects/pics/berry_trees/mago/0.png
+++ b/graphics/event_objects/pics/berry_trees/mago/0.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/1.png b/graphics/event_objects/pics/berry_trees/mago/1.png
index 0ed2ad6ad..0ed2ad6ad 100644
--- a/graphics/map_objects/pics/berry_trees/mago/1.png
+++ b/graphics/event_objects/pics/berry_trees/mago/1.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/2.png b/graphics/event_objects/pics/berry_trees/mago/2.png
index 221af2806..221af2806 100644
--- a/graphics/map_objects/pics/berry_trees/mago/2.png
+++ b/graphics/event_objects/pics/berry_trees/mago/2.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/3.png b/graphics/event_objects/pics/berry_trees/mago/3.png
index 71a8d4294..71a8d4294 100644
--- a/graphics/map_objects/pics/berry_trees/mago/3.png
+++ b/graphics/event_objects/pics/berry_trees/mago/3.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/4.png b/graphics/event_objects/pics/berry_trees/mago/4.png
index ba6bf2d00..ba6bf2d00 100644
--- a/graphics/map_objects/pics/berry_trees/mago/4.png
+++ b/graphics/event_objects/pics/berry_trees/mago/4.png
diff --git a/graphics/map_objects/pics/berry_trees/mago/5.png b/graphics/event_objects/pics/berry_trees/mago/5.png
index 6271425a3..6271425a3 100644
--- a/graphics/map_objects/pics/berry_trees/mago/5.png
+++ b/graphics/event_objects/pics/berry_trees/mago/5.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/0.png b/graphics/event_objects/pics/berry_trees/nomel/0.png
index d504524eb..d504524eb 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/0.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/0.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/1.png b/graphics/event_objects/pics/berry_trees/nomel/1.png
index 37ff4b082..37ff4b082 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/1.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/1.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/2.png b/graphics/event_objects/pics/berry_trees/nomel/2.png
index 4e5c03cb4..4e5c03cb4 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/2.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/2.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/3.png b/graphics/event_objects/pics/berry_trees/nomel/3.png
index 7fd46d627..7fd46d627 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/3.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/3.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/4.png b/graphics/event_objects/pics/berry_trees/nomel/4.png
index 913274d81..913274d81 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/4.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/4.png
diff --git a/graphics/map_objects/pics/berry_trees/nomel/5.png b/graphics/event_objects/pics/berry_trees/nomel/5.png
index 3af9a516a..3af9a516a 100644
--- a/graphics/map_objects/pics/berry_trees/nomel/5.png
+++ b/graphics/event_objects/pics/berry_trees/nomel/5.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/0.png b/graphics/event_objects/pics/berry_trees/oran/0.png
index 8770230de..8770230de 100644
--- a/graphics/map_objects/pics/berry_trees/oran/0.png
+++ b/graphics/event_objects/pics/berry_trees/oran/0.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/1.png b/graphics/event_objects/pics/berry_trees/oran/1.png
index afeb286a9..afeb286a9 100644
--- a/graphics/map_objects/pics/berry_trees/oran/1.png
+++ b/graphics/event_objects/pics/berry_trees/oran/1.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/2.png b/graphics/event_objects/pics/berry_trees/oran/2.png
index 7b7dc8b1a..7b7dc8b1a 100644
--- a/graphics/map_objects/pics/berry_trees/oran/2.png
+++ b/graphics/event_objects/pics/berry_trees/oran/2.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/3.png b/graphics/event_objects/pics/berry_trees/oran/3.png
index 81857442d..81857442d 100644
--- a/graphics/map_objects/pics/berry_trees/oran/3.png
+++ b/graphics/event_objects/pics/berry_trees/oran/3.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/4.png b/graphics/event_objects/pics/berry_trees/oran/4.png
index 58a197d08..58a197d08 100644
--- a/graphics/map_objects/pics/berry_trees/oran/4.png
+++ b/graphics/event_objects/pics/berry_trees/oran/4.png
diff --git a/graphics/map_objects/pics/berry_trees/oran/5.png b/graphics/event_objects/pics/berry_trees/oran/5.png
index 8878c8550..8878c8550 100644
--- a/graphics/map_objects/pics/berry_trees/oran/5.png
+++ b/graphics/event_objects/pics/berry_trees/oran/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/0.png b/graphics/event_objects/pics/berry_trees/pamtre/0.png
index ac56c5370..ac56c5370 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/0.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/1.png b/graphics/event_objects/pics/berry_trees/pamtre/1.png
index 105974668..105974668 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/1.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/2.png b/graphics/event_objects/pics/berry_trees/pamtre/2.png
index 09363b8ba..09363b8ba 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/2.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/3.png b/graphics/event_objects/pics/berry_trees/pamtre/3.png
index 263856830..263856830 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/3.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/4.png b/graphics/event_objects/pics/berry_trees/pamtre/4.png
index 509057976..509057976 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/4.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pamtre/5.png b/graphics/event_objects/pics/berry_trees/pamtre/5.png
index 1adf263df..1adf263df 100644
--- a/graphics/map_objects/pics/berry_trees/pamtre/5.png
+++ b/graphics/event_objects/pics/berry_trees/pamtre/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/0.png b/graphics/event_objects/pics/berry_trees/pecha/0.png
index 8a69441a4..8a69441a4 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/0.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/1.png b/graphics/event_objects/pics/berry_trees/pecha/1.png
index 4d1923735..4d1923735 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/1.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/2.png b/graphics/event_objects/pics/berry_trees/pecha/2.png
index a93a37738..a93a37738 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/2.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/3.png b/graphics/event_objects/pics/berry_trees/pecha/3.png
index 5cd4f5e3c..5cd4f5e3c 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/3.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/4.png b/graphics/event_objects/pics/berry_trees/pecha/4.png
index 451d74260..451d74260 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/4.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pecha/5.png b/graphics/event_objects/pics/berry_trees/pecha/5.png
index 242a9b53f..242a9b53f 100644
--- a/graphics/map_objects/pics/berry_trees/pecha/5.png
+++ b/graphics/event_objects/pics/berry_trees/pecha/5.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/0.png b/graphics/event_objects/pics/berry_trees/persim/0.png
index 1996615ff..1996615ff 100644
--- a/graphics/map_objects/pics/berry_trees/persim/0.png
+++ b/graphics/event_objects/pics/berry_trees/persim/0.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/1.png b/graphics/event_objects/pics/berry_trees/persim/1.png
index eda84785f..eda84785f 100644
--- a/graphics/map_objects/pics/berry_trees/persim/1.png
+++ b/graphics/event_objects/pics/berry_trees/persim/1.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/2.png b/graphics/event_objects/pics/berry_trees/persim/2.png
index 6e71b3786..6e71b3786 100644
--- a/graphics/map_objects/pics/berry_trees/persim/2.png
+++ b/graphics/event_objects/pics/berry_trees/persim/2.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/3.png b/graphics/event_objects/pics/berry_trees/persim/3.png
index f45bf0646..f45bf0646 100644
--- a/graphics/map_objects/pics/berry_trees/persim/3.png
+++ b/graphics/event_objects/pics/berry_trees/persim/3.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/4.png b/graphics/event_objects/pics/berry_trees/persim/4.png
index a5aeda410..a5aeda410 100644
--- a/graphics/map_objects/pics/berry_trees/persim/4.png
+++ b/graphics/event_objects/pics/berry_trees/persim/4.png
diff --git a/graphics/map_objects/pics/berry_trees/persim/5.png b/graphics/event_objects/pics/berry_trees/persim/5.png
index 72c69c068..72c69c068 100644
--- a/graphics/map_objects/pics/berry_trees/persim/5.png
+++ b/graphics/event_objects/pics/berry_trees/persim/5.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/0.png b/graphics/event_objects/pics/berry_trees/pomeg/0.png
index c343bc210..c343bc210 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/0.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/0.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/1.png b/graphics/event_objects/pics/berry_trees/pomeg/1.png
index cc1c08f92..cc1c08f92 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/1.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/1.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/2.png b/graphics/event_objects/pics/berry_trees/pomeg/2.png
index 46d0fb7cc..46d0fb7cc 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/2.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/2.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/3.png b/graphics/event_objects/pics/berry_trees/pomeg/3.png
index d2475b748..d2475b748 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/3.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/3.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/4.png b/graphics/event_objects/pics/berry_trees/pomeg/4.png
index 4f3019213..4f3019213 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/4.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/4.png
diff --git a/graphics/map_objects/pics/berry_trees/pomeg/5.png b/graphics/event_objects/pics/berry_trees/pomeg/5.png
index f519675ce..f519675ce 100644
--- a/graphics/map_objects/pics/berry_trees/pomeg/5.png
+++ b/graphics/event_objects/pics/berry_trees/pomeg/5.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/0.png b/graphics/event_objects/pics/berry_trees/rabuta/0.png
index 5fe85e4e3..5fe85e4e3 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/0.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/0.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/1.png b/graphics/event_objects/pics/berry_trees/rabuta/1.png
index 0973e21cb..0973e21cb 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/1.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/1.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/2.png b/graphics/event_objects/pics/berry_trees/rabuta/2.png
index c2d027ebd..c2d027ebd 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/2.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/2.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/3.png b/graphics/event_objects/pics/berry_trees/rabuta/3.png
index 79b2cc45f..79b2cc45f 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/3.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/3.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/4.png b/graphics/event_objects/pics/berry_trees/rabuta/4.png
index 931350042..931350042 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/4.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/4.png
diff --git a/graphics/map_objects/pics/berry_trees/rabuta/5.png b/graphics/event_objects/pics/berry_trees/rabuta/5.png
index efa1ac89e..efa1ac89e 100644
--- a/graphics/map_objects/pics/berry_trees/rabuta/5.png
+++ b/graphics/event_objects/pics/berry_trees/rabuta/5.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/0.png b/graphics/event_objects/pics/berry_trees/rawst/0.png
index ef3548002..ef3548002 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/0.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/0.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/1.png b/graphics/event_objects/pics/berry_trees/rawst/1.png
index dccad21b0..dccad21b0 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/1.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/1.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/2.png b/graphics/event_objects/pics/berry_trees/rawst/2.png
index d89f7484e..d89f7484e 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/2.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/2.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/3.png b/graphics/event_objects/pics/berry_trees/rawst/3.png
index afd11e0f6..afd11e0f6 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/3.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/3.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/4.png b/graphics/event_objects/pics/berry_trees/rawst/4.png
index aada33789..aada33789 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/4.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/4.png
diff --git a/graphics/map_objects/pics/berry_trees/rawst/5.png b/graphics/event_objects/pics/berry_trees/rawst/5.png
index 311044bf0..311044bf0 100644
--- a/graphics/map_objects/pics/berry_trees/rawst/5.png
+++ b/graphics/event_objects/pics/berry_trees/rawst/5.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/0.png b/graphics/event_objects/pics/berry_trees/razz/0.png
index 4685d0977..4685d0977 100644
--- a/graphics/map_objects/pics/berry_trees/razz/0.png
+++ b/graphics/event_objects/pics/berry_trees/razz/0.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/1.png b/graphics/event_objects/pics/berry_trees/razz/1.png
index 396122c5b..396122c5b 100644
--- a/graphics/map_objects/pics/berry_trees/razz/1.png
+++ b/graphics/event_objects/pics/berry_trees/razz/1.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/2.png b/graphics/event_objects/pics/berry_trees/razz/2.png
index f48a2c6e2..f48a2c6e2 100644
--- a/graphics/map_objects/pics/berry_trees/razz/2.png
+++ b/graphics/event_objects/pics/berry_trees/razz/2.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/3.png b/graphics/event_objects/pics/berry_trees/razz/3.png
index 47e6a52c1..47e6a52c1 100644
--- a/graphics/map_objects/pics/berry_trees/razz/3.png
+++ b/graphics/event_objects/pics/berry_trees/razz/3.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/4.png b/graphics/event_objects/pics/berry_trees/razz/4.png
index 075c4674b..075c4674b 100644
--- a/graphics/map_objects/pics/berry_trees/razz/4.png
+++ b/graphics/event_objects/pics/berry_trees/razz/4.png
diff --git a/graphics/map_objects/pics/berry_trees/razz/5.png b/graphics/event_objects/pics/berry_trees/razz/5.png
index 7ae7b7bba..7ae7b7bba 100644
--- a/graphics/map_objects/pics/berry_trees/razz/5.png
+++ b/graphics/event_objects/pics/berry_trees/razz/5.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/0.png b/graphics/event_objects/pics/berry_trees/sitrus/0.png
index 64671e0a1..64671e0a1 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/0.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/0.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/1.png b/graphics/event_objects/pics/berry_trees/sitrus/1.png
index 13f82d092..13f82d092 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/1.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/1.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/2.png b/graphics/event_objects/pics/berry_trees/sitrus/2.png
index 7a382402a..7a382402a 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/2.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/2.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/3.png b/graphics/event_objects/pics/berry_trees/sitrus/3.png
index 6bbc0dca0..6bbc0dca0 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/3.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/3.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/4.png b/graphics/event_objects/pics/berry_trees/sitrus/4.png
index 1e6ff6838..1e6ff6838 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/4.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/4.png
diff --git a/graphics/map_objects/pics/berry_trees/sitrus/5.png b/graphics/event_objects/pics/berry_trees/sitrus/5.png
index cd97f552f..cd97f552f 100644
--- a/graphics/map_objects/pics/berry_trees/sitrus/5.png
+++ b/graphics/event_objects/pics/berry_trees/sitrus/5.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/0.png b/graphics/event_objects/pics/berry_trees/spelon/0.png
index 32bd06af1..32bd06af1 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/0.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/0.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/1.png b/graphics/event_objects/pics/berry_trees/spelon/1.png
index 37e77e391..37e77e391 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/1.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/1.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/2.png b/graphics/event_objects/pics/berry_trees/spelon/2.png
index d36cf3b16..d36cf3b16 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/2.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/2.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/3.png b/graphics/event_objects/pics/berry_trees/spelon/3.png
index 6a7099d83..6a7099d83 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/3.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/3.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/4.png b/graphics/event_objects/pics/berry_trees/spelon/4.png
index de1c24e58..de1c24e58 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/4.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/4.png
diff --git a/graphics/map_objects/pics/berry_trees/spelon/5.png b/graphics/event_objects/pics/berry_trees/spelon/5.png
index 578231a24..578231a24 100644
--- a/graphics/map_objects/pics/berry_trees/spelon/5.png
+++ b/graphics/event_objects/pics/berry_trees/spelon/5.png
diff --git a/graphics/map_objects/pics/berry_trees/sprout/0.png b/graphics/event_objects/pics/berry_trees/sprout/0.png
index df37532a7..df37532a7 100644
--- a/graphics/map_objects/pics/berry_trees/sprout/0.png
+++ b/graphics/event_objects/pics/berry_trees/sprout/0.png
diff --git a/graphics/map_objects/pics/berry_trees/sprout/1.png b/graphics/event_objects/pics/berry_trees/sprout/1.png
index f0a67f382..f0a67f382 100644
--- a/graphics/map_objects/pics/berry_trees/sprout/1.png
+++ b/graphics/event_objects/pics/berry_trees/sprout/1.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/0.png b/graphics/event_objects/pics/berry_trees/tamato/0.png
index 499e473bc..499e473bc 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/0.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/0.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/1.png b/graphics/event_objects/pics/berry_trees/tamato/1.png
index 2c45d60d8..2c45d60d8 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/1.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/1.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/2.png b/graphics/event_objects/pics/berry_trees/tamato/2.png
index ef3ac700b..ef3ac700b 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/2.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/2.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/3.png b/graphics/event_objects/pics/berry_trees/tamato/3.png
index 57b60904f..57b60904f 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/3.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/3.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/4.png b/graphics/event_objects/pics/berry_trees/tamato/4.png
index 823ff49a7..823ff49a7 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/4.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/4.png
diff --git a/graphics/map_objects/pics/berry_trees/tamato/5.png b/graphics/event_objects/pics/berry_trees/tamato/5.png
index 8656cb5db..8656cb5db 100644
--- a/graphics/map_objects/pics/berry_trees/tamato/5.png
+++ b/graphics/event_objects/pics/berry_trees/tamato/5.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/0.png b/graphics/event_objects/pics/berry_trees/wepear/0.png
index ccf834a94..ccf834a94 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/0.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/0.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/1.png b/graphics/event_objects/pics/berry_trees/wepear/1.png
index d46390bdd..d46390bdd 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/1.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/1.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/2.png b/graphics/event_objects/pics/berry_trees/wepear/2.png
index 040a70931..040a70931 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/2.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/2.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/3.png b/graphics/event_objects/pics/berry_trees/wepear/3.png
index 94918f7ff..94918f7ff 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/3.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/3.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/4.png b/graphics/event_objects/pics/berry_trees/wepear/4.png
index ee242d657..ee242d657 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/4.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/4.png
diff --git a/graphics/map_objects/pics/berry_trees/wepear/5.png b/graphics/event_objects/pics/berry_trees/wepear/5.png
index 1b5256a9e..1b5256a9e 100644
--- a/graphics/map_objects/pics/berry_trees/wepear/5.png
+++ b/graphics/event_objects/pics/berry_trees/wepear/5.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/0.png b/graphics/event_objects/pics/berry_trees/wiki/0.png
index e51325e18..e51325e18 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/0.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/0.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/1.png b/graphics/event_objects/pics/berry_trees/wiki/1.png
index f7f28e44b..f7f28e44b 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/1.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/1.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/2.png b/graphics/event_objects/pics/berry_trees/wiki/2.png
index e7d6c3824..e7d6c3824 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/2.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/2.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/3.png b/graphics/event_objects/pics/berry_trees/wiki/3.png
index 6447302a6..6447302a6 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/3.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/3.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/4.png b/graphics/event_objects/pics/berry_trees/wiki/4.png
index a494a7eaa..a494a7eaa 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/4.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/4.png
diff --git a/graphics/map_objects/pics/berry_trees/wiki/5.png b/graphics/event_objects/pics/berry_trees/wiki/5.png
index 5a6b9f193..5a6b9f193 100644
--- a/graphics/map_objects/pics/berry_trees/wiki/5.png
+++ b/graphics/event_objects/pics/berry_trees/wiki/5.png
diff --git a/graphics/map_objects/pics/cushions/ball_cushion.png b/graphics/event_objects/pics/cushions/ball_cushion.png
index 54ecc1980..54ecc1980 100644
--- a/graphics/map_objects/pics/cushions/ball_cushion.png
+++ b/graphics/event_objects/pics/cushions/ball_cushion.png
diff --git a/graphics/map_objects/pics/cushions/diamond_cushion.png b/graphics/event_objects/pics/cushions/diamond_cushion.png
index 747866941..747866941 100644
--- a/graphics/map_objects/pics/cushions/diamond_cushion.png
+++ b/graphics/event_objects/pics/cushions/diamond_cushion.png
diff --git a/graphics/map_objects/pics/cushions/fire_cushion.png b/graphics/event_objects/pics/cushions/fire_cushion.png
index aa9a70f2e..aa9a70f2e 100644
--- a/graphics/map_objects/pics/cushions/fire_cushion.png
+++ b/graphics/event_objects/pics/cushions/fire_cushion.png
diff --git a/graphics/map_objects/pics/cushions/grass_cushion.png b/graphics/event_objects/pics/cushions/grass_cushion.png
index 8ee854f17..8ee854f17 100644
--- a/graphics/map_objects/pics/cushions/grass_cushion.png
+++ b/graphics/event_objects/pics/cushions/grass_cushion.png
diff --git a/graphics/map_objects/pics/cushions/kiss_cushion.png b/graphics/event_objects/pics/cushions/kiss_cushion.png
index 6a99348c9..6a99348c9 100644
--- a/graphics/map_objects/pics/cushions/kiss_cushion.png
+++ b/graphics/event_objects/pics/cushions/kiss_cushion.png
diff --git a/graphics/map_objects/pics/cushions/pika_cushion.png b/graphics/event_objects/pics/cushions/pika_cushion.png
index 947713c39..947713c39 100644
--- a/graphics/map_objects/pics/cushions/pika_cushion.png
+++ b/graphics/event_objects/pics/cushions/pika_cushion.png
diff --git a/graphics/map_objects/pics/cushions/round_cushion.png b/graphics/event_objects/pics/cushions/round_cushion.png
index 0e7b71ad5..0e7b71ad5 100644
--- a/graphics/map_objects/pics/cushions/round_cushion.png
+++ b/graphics/event_objects/pics/cushions/round_cushion.png
diff --git a/graphics/map_objects/pics/cushions/spin_cushion.png b/graphics/event_objects/pics/cushions/spin_cushion.png
index 81eba708c..81eba708c 100644
--- a/graphics/map_objects/pics/cushions/spin_cushion.png
+++ b/graphics/event_objects/pics/cushions/spin_cushion.png
diff --git a/graphics/map_objects/pics/cushions/water_cushion.png b/graphics/event_objects/pics/cushions/water_cushion.png
index 9ed16c633..9ed16c633 100644
--- a/graphics/map_objects/pics/cushions/water_cushion.png
+++ b/graphics/event_objects/pics/cushions/water_cushion.png
diff --git a/graphics/map_objects/pics/cushions/zigzag_cushion.png b/graphics/event_objects/pics/cushions/zigzag_cushion.png
index 407e6a66b..407e6a66b 100644
--- a/graphics/map_objects/pics/cushions/zigzag_cushion.png
+++ b/graphics/event_objects/pics/cushions/zigzag_cushion.png
diff --git a/graphics/map_objects/pics/dolls/azurill_doll.png b/graphics/event_objects/pics/dolls/azurill_doll.png
index 1d1f7492f..1d1f7492f 100644
--- a/graphics/map_objects/pics/dolls/azurill_doll.png
+++ b/graphics/event_objects/pics/dolls/azurill_doll.png
diff --git a/graphics/map_objects/pics/dolls/baltoy_doll.png b/graphics/event_objects/pics/dolls/baltoy_doll.png
index 5205123da..5205123da 100644
--- a/graphics/map_objects/pics/dolls/baltoy_doll.png
+++ b/graphics/event_objects/pics/dolls/baltoy_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_blastoise_doll.png b/graphics/event_objects/pics/dolls/big_blastoise_doll.png
index fa295f302..fa295f302 100644
--- a/graphics/map_objects/pics/dolls/big_blastoise_doll.png
+++ b/graphics/event_objects/pics/dolls/big_blastoise_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_charizard_doll.png b/graphics/event_objects/pics/dolls/big_charizard_doll.png
index 4fa5aed45..4fa5aed45 100644
--- a/graphics/map_objects/pics/dolls/big_charizard_doll.png
+++ b/graphics/event_objects/pics/dolls/big_charizard_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_lapras_doll.png b/graphics/event_objects/pics/dolls/big_lapras_doll.png
index 572d3c810..572d3c810 100644
--- a/graphics/map_objects/pics/dolls/big_lapras_doll.png
+++ b/graphics/event_objects/pics/dolls/big_lapras_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_regice_doll.png b/graphics/event_objects/pics/dolls/big_regice_doll.png
index e437d3558..e437d3558 100644
--- a/graphics/map_objects/pics/dolls/big_regice_doll.png
+++ b/graphics/event_objects/pics/dolls/big_regice_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_regirock_doll.png b/graphics/event_objects/pics/dolls/big_regirock_doll.png
index 139abbb28..139abbb28 100644
--- a/graphics/map_objects/pics/dolls/big_regirock_doll.png
+++ b/graphics/event_objects/pics/dolls/big_regirock_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_registeel_doll.png b/graphics/event_objects/pics/dolls/big_registeel_doll.png
index 632a2cadd..632a2cadd 100644
--- a/graphics/map_objects/pics/dolls/big_registeel_doll.png
+++ b/graphics/event_objects/pics/dolls/big_registeel_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_rhydon_doll.png b/graphics/event_objects/pics/dolls/big_rhydon_doll.png
index 2e059f8c9..2e059f8c9 100644
--- a/graphics/map_objects/pics/dolls/big_rhydon_doll.png
+++ b/graphics/event_objects/pics/dolls/big_rhydon_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_snorlax_doll.png b/graphics/event_objects/pics/dolls/big_snorlax_doll.png
index 397c9baac..397c9baac 100644
--- a/graphics/map_objects/pics/dolls/big_snorlax_doll.png
+++ b/graphics/event_objects/pics/dolls/big_snorlax_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_venusaur_doll.png b/graphics/event_objects/pics/dolls/big_venusaur_doll.png
index 9d1961608..9d1961608 100644
--- a/graphics/map_objects/pics/dolls/big_venusaur_doll.png
+++ b/graphics/event_objects/pics/dolls/big_venusaur_doll.png
diff --git a/graphics/map_objects/pics/dolls/big_wailmer_doll.png b/graphics/event_objects/pics/dolls/big_wailmer_doll.png
index a174d30f7..a174d30f7 100644
--- a/graphics/map_objects/pics/dolls/big_wailmer_doll.png
+++ b/graphics/event_objects/pics/dolls/big_wailmer_doll.png
diff --git a/graphics/map_objects/pics/dolls/chikorita_doll.png b/graphics/event_objects/pics/dolls/chikorita_doll.png
index 6b5e6417d..6b5e6417d 100644
--- a/graphics/map_objects/pics/dolls/chikorita_doll.png
+++ b/graphics/event_objects/pics/dolls/chikorita_doll.png
diff --git a/graphics/map_objects/pics/dolls/clefairy_doll.png b/graphics/event_objects/pics/dolls/clefairy_doll.png
index 137b20213..137b20213 100644
--- a/graphics/map_objects/pics/dolls/clefairy_doll.png
+++ b/graphics/event_objects/pics/dolls/clefairy_doll.png
diff --git a/graphics/map_objects/pics/dolls/cyndaquil_doll.png b/graphics/event_objects/pics/dolls/cyndaquil_doll.png
index b76221e1d..b76221e1d 100644
--- a/graphics/map_objects/pics/dolls/cyndaquil_doll.png
+++ b/graphics/event_objects/pics/dolls/cyndaquil_doll.png
diff --git a/graphics/map_objects/pics/dolls/ditto_doll.png b/graphics/event_objects/pics/dolls/ditto_doll.png
index da4c33018..da4c33018 100644
--- a/graphics/map_objects/pics/dolls/ditto_doll.png
+++ b/graphics/event_objects/pics/dolls/ditto_doll.png
diff --git a/graphics/map_objects/pics/dolls/duskull_doll.png b/graphics/event_objects/pics/dolls/duskull_doll.png
index fdfbe3fec..fdfbe3fec 100644
--- a/graphics/map_objects/pics/dolls/duskull_doll.png
+++ b/graphics/event_objects/pics/dolls/duskull_doll.png
diff --git a/graphics/map_objects/pics/dolls/gulpin_doll.png b/graphics/event_objects/pics/dolls/gulpin_doll.png
index 48bf1824b..48bf1824b 100644
--- a/graphics/map_objects/pics/dolls/gulpin_doll.png
+++ b/graphics/event_objects/pics/dolls/gulpin_doll.png
diff --git a/graphics/map_objects/pics/dolls/jigglypuff_doll.png b/graphics/event_objects/pics/dolls/jigglypuff_doll.png
index 1a2c8d44a..1a2c8d44a 100644
--- a/graphics/map_objects/pics/dolls/jigglypuff_doll.png
+++ b/graphics/event_objects/pics/dolls/jigglypuff_doll.png
diff --git a/graphics/map_objects/pics/dolls/kecleon_doll.png b/graphics/event_objects/pics/dolls/kecleon_doll.png
index 92869882f..92869882f 100644
--- a/graphics/map_objects/pics/dolls/kecleon_doll.png
+++ b/graphics/event_objects/pics/dolls/kecleon_doll.png
diff --git a/graphics/map_objects/pics/dolls/lotad_doll.png b/graphics/event_objects/pics/dolls/lotad_doll.png
index 9ee2182d1..9ee2182d1 100644
--- a/graphics/map_objects/pics/dolls/lotad_doll.png
+++ b/graphics/event_objects/pics/dolls/lotad_doll.png
diff --git a/graphics/map_objects/pics/dolls/marill_doll.png b/graphics/event_objects/pics/dolls/marill_doll.png
index d5372f7dd..d5372f7dd 100644
--- a/graphics/map_objects/pics/dolls/marill_doll.png
+++ b/graphics/event_objects/pics/dolls/marill_doll.png
diff --git a/graphics/map_objects/pics/dolls/meowth_doll.png b/graphics/event_objects/pics/dolls/meowth_doll.png
index 67ce3db4c..67ce3db4c 100644
--- a/graphics/map_objects/pics/dolls/meowth_doll.png
+++ b/graphics/event_objects/pics/dolls/meowth_doll.png
diff --git a/graphics/map_objects/pics/dolls/mudkip_doll.png b/graphics/event_objects/pics/dolls/mudkip_doll.png
index 8d6af157f..8d6af157f 100644
--- a/graphics/map_objects/pics/dolls/mudkip_doll.png
+++ b/graphics/event_objects/pics/dolls/mudkip_doll.png
diff --git a/graphics/map_objects/pics/dolls/pichu_doll.png b/graphics/event_objects/pics/dolls/pichu_doll.png
index 7a2aefc31..7a2aefc31 100644
--- a/graphics/map_objects/pics/dolls/pichu_doll.png
+++ b/graphics/event_objects/pics/dolls/pichu_doll.png
diff --git a/graphics/map_objects/pics/dolls/pikachu_doll.png b/graphics/event_objects/pics/dolls/pikachu_doll.png
index a762f1e15..a762f1e15 100644
--- a/graphics/map_objects/pics/dolls/pikachu_doll.png
+++ b/graphics/event_objects/pics/dolls/pikachu_doll.png
diff --git a/graphics/map_objects/pics/dolls/seedot_doll.png b/graphics/event_objects/pics/dolls/seedot_doll.png
index e00c485ae..e00c485ae 100644
--- a/graphics/map_objects/pics/dolls/seedot_doll.png
+++ b/graphics/event_objects/pics/dolls/seedot_doll.png
diff --git a/graphics/map_objects/pics/dolls/skitty_doll.png b/graphics/event_objects/pics/dolls/skitty_doll.png
index 57ae4c5ed..57ae4c5ed 100644
--- a/graphics/map_objects/pics/dolls/skitty_doll.png
+++ b/graphics/event_objects/pics/dolls/skitty_doll.png
diff --git a/graphics/map_objects/pics/dolls/smoochum_doll.png b/graphics/event_objects/pics/dolls/smoochum_doll.png
index 4adacdfd5..4adacdfd5 100644
--- a/graphics/map_objects/pics/dolls/smoochum_doll.png
+++ b/graphics/event_objects/pics/dolls/smoochum_doll.png
diff --git a/graphics/map_objects/pics/dolls/swablu_doll.png b/graphics/event_objects/pics/dolls/swablu_doll.png
index 94e3051d7..94e3051d7 100644
--- a/graphics/map_objects/pics/dolls/swablu_doll.png
+++ b/graphics/event_objects/pics/dolls/swablu_doll.png
diff --git a/graphics/map_objects/pics/dolls/togepi_doll.png b/graphics/event_objects/pics/dolls/togepi_doll.png
index 4deda750c..4deda750c 100644
--- a/graphics/map_objects/pics/dolls/togepi_doll.png
+++ b/graphics/event_objects/pics/dolls/togepi_doll.png
diff --git a/graphics/map_objects/pics/dolls/torchic_doll.png b/graphics/event_objects/pics/dolls/torchic_doll.png
index 067eae9fb..067eae9fb 100644
--- a/graphics/map_objects/pics/dolls/torchic_doll.png
+++ b/graphics/event_objects/pics/dolls/torchic_doll.png
diff --git a/graphics/map_objects/pics/dolls/totodile_doll.png b/graphics/event_objects/pics/dolls/totodile_doll.png
index b347125c9..b347125c9 100644
--- a/graphics/map_objects/pics/dolls/totodile_doll.png
+++ b/graphics/event_objects/pics/dolls/totodile_doll.png
diff --git a/graphics/map_objects/pics/dolls/treecko_doll.png b/graphics/event_objects/pics/dolls/treecko_doll.png
index 3ccf44a58..3ccf44a58 100644
--- a/graphics/map_objects/pics/dolls/treecko_doll.png
+++ b/graphics/event_objects/pics/dolls/treecko_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png
index bbf386e6a..bbf386e6a 100644
--- a/graphics/map_objects/pics/dolls/unused_magnemite_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_magnemite_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_natu_doll.png b/graphics/event_objects/pics/dolls/unused_natu_doll.png
index a2c4995e3..a2c4995e3 100644
--- a/graphics/map_objects/pics/dolls/unused_natu_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_natu_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png
index 9bf762d02..9bf762d02 100644
--- a/graphics/map_objects/pics/dolls/unused_pikachu_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_pikachu_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png
index 465b7a092..465b7a092 100644
--- a/graphics/map_objects/pics/dolls/unused_porygon2_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_porygon2_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png
index ccc526aae..ccc526aae 100644
--- a/graphics/map_objects/pics/dolls/unused_squirtle_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_squirtle_doll.png
diff --git a/graphics/map_objects/pics/dolls/unused_wooper_doll.png b/graphics/event_objects/pics/dolls/unused_wooper_doll.png
index 29bc8fd99..29bc8fd99 100644
--- a/graphics/map_objects/pics/dolls/unused_wooper_doll.png
+++ b/graphics/event_objects/pics/dolls/unused_wooper_doll.png
diff --git a/graphics/map_objects/pics/dolls/wynaut_doll.png b/graphics/event_objects/pics/dolls/wynaut_doll.png
index 3ac3d1311..3ac3d1311 100644
--- a/graphics/map_objects/pics/dolls/wynaut_doll.png
+++ b/graphics/event_objects/pics/dolls/wynaut_doll.png
diff --git a/graphics/map_objects/pics/misc/birchs_bag.png b/graphics/event_objects/pics/misc/birchs_bag.png
index 045e5546c..045e5546c 100644
--- a/graphics/map_objects/pics/misc/birchs_bag.png
+++ b/graphics/event_objects/pics/misc/birchs_bag.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/0.png b/graphics/event_objects/pics/misc/breakable_rock/0.png
index 058324c86..058324c86 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/0.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/0.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/1.png b/graphics/event_objects/pics/misc/breakable_rock/1.png
index 6c8b3133a..6c8b3133a 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/1.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/1.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/2.png b/graphics/event_objects/pics/misc/breakable_rock/2.png
index 737148d66..737148d66 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/2.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/2.png
diff --git a/graphics/map_objects/pics/misc/breakable_rock/3.png b/graphics/event_objects/pics/misc/breakable_rock/3.png
index 89eedd1aa..89eedd1aa 100644
--- a/graphics/map_objects/pics/misc/breakable_rock/3.png
+++ b/graphics/event_objects/pics/misc/breakable_rock/3.png
diff --git a/graphics/map_objects/pics/misc/cable_car.png b/graphics/event_objects/pics/misc/cable_car.png
index e0bd21ddf..e0bd21ddf 100644
--- a/graphics/map_objects/pics/misc/cable_car.png
+++ b/graphics/event_objects/pics/misc/cable_car.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/0.png b/graphics/event_objects/pics/misc/cuttable_tree/0.png
index 509d8b03c..509d8b03c 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/0.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/0.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/1.png b/graphics/event_objects/pics/misc/cuttable_tree/1.png
index afa42cf16..afa42cf16 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/1.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/1.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/2.png b/graphics/event_objects/pics/misc/cuttable_tree/2.png
index f222ece43..f222ece43 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/2.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/2.png
diff --git a/graphics/map_objects/pics/misc/cuttable_tree/3.png b/graphics/event_objects/pics/misc/cuttable_tree/3.png
index 09ffefd29..09ffefd29 100644
--- a/graphics/map_objects/pics/misc/cuttable_tree/3.png
+++ b/graphics/event_objects/pics/misc/cuttable_tree/3.png
diff --git a/graphics/map_objects/pics/misc/fossil.png b/graphics/event_objects/pics/misc/fossil.png
index a8da0e8ff..a8da0e8ff 100644
--- a/graphics/map_objects/pics/misc/fossil.png
+++ b/graphics/event_objects/pics/misc/fossil.png
diff --git a/graphics/map_objects/pics/misc/item_ball.png b/graphics/event_objects/pics/misc/item_ball.png
index a30e02fb1..a30e02fb1 100644
--- a/graphics/map_objects/pics/misc/item_ball.png
+++ b/graphics/event_objects/pics/misc/item_ball.png
diff --git a/graphics/map_objects/pics/misc/moving_box.png b/graphics/event_objects/pics/misc/moving_box.png
index 3cbc41900..3cbc41900 100644
--- a/graphics/map_objects/pics/misc/moving_box.png
+++ b/graphics/event_objects/pics/misc/moving_box.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png
index 593ed07c8..593ed07c8 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/0.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/0.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png
index 39b75fd73..39b75fd73 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/1.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/1.png
diff --git a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png
index 9db6b11fe..9db6b11fe 100644
--- a/graphics/map_objects/pics/misc/mr_brineys_boat/2.png
+++ b/graphics/event_objects/pics/misc/mr_brineys_boat/2.png
diff --git a/graphics/map_objects/pics/misc/pushable_boulder.png b/graphics/event_objects/pics/misc/pushable_boulder.png
index a6962123c..a6962123c 100644
--- a/graphics/map_objects/pics/misc/pushable_boulder.png
+++ b/graphics/event_objects/pics/misc/pushable_boulder.png
diff --git a/graphics/map_objects/pics/misc/ss_tidal.png b/graphics/event_objects/pics/misc/ss_tidal.png
index 40ca9a3f3..40ca9a3f3 100644
--- a/graphics/map_objects/pics/misc/ss_tidal.png
+++ b/graphics/event_objects/pics/misc/ss_tidal.png
diff --git a/graphics/map_objects/pics/misc/submarine_shadow.png b/graphics/event_objects/pics/misc/submarine_shadow.png
index b9dfc4c55..b9dfc4c55 100644
--- a/graphics/map_objects/pics/misc/submarine_shadow.png
+++ b/graphics/event_objects/pics/misc/submarine_shadow.png
diff --git a/graphics/map_objects/pics/misc/truck.png b/graphics/event_objects/pics/misc/truck.png
index 28bd00111..28bd00111 100644
--- a/graphics/map_objects/pics/misc/truck.png
+++ b/graphics/event_objects/pics/misc/truck.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/0.png b/graphics/event_objects/pics/people/aqua_member_f/0.png
index c4fcfc90e..c4fcfc90e 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/0.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/0.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/1.png b/graphics/event_objects/pics/people/aqua_member_f/1.png
index 59de99021..59de99021 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/1.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/1.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/2.png b/graphics/event_objects/pics/people/aqua_member_f/2.png
index 20f50bc67..20f50bc67 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/2.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/2.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/3.png b/graphics/event_objects/pics/people/aqua_member_f/3.png
index 001d2c144..001d2c144 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/3.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/3.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/4.png b/graphics/event_objects/pics/people/aqua_member_f/4.png
index ff2bf22a8..ff2bf22a8 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/4.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/4.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/5.png b/graphics/event_objects/pics/people/aqua_member_f/5.png
index 8189d4625..8189d4625 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/5.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/5.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/6.png b/graphics/event_objects/pics/people/aqua_member_f/6.png
index 84b7104aa..84b7104aa 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/6.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/6.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/7.png b/graphics/event_objects/pics/people/aqua_member_f/7.png
index e0f6311d8..e0f6311d8 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/7.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/7.png
diff --git a/graphics/map_objects/pics/people/aqua_member_f/8.png b/graphics/event_objects/pics/people/aqua_member_f/8.png
index 03572a720..03572a720 100644
--- a/graphics/map_objects/pics/people/aqua_member_f/8.png
+++ b/graphics/event_objects/pics/people/aqua_member_f/8.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/0.png b/graphics/event_objects/pics/people/aqua_member_m/0.png
index fed477fac..fed477fac 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/0.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/0.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/1.png b/graphics/event_objects/pics/people/aqua_member_m/1.png
index d87426a18..d87426a18 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/1.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/1.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/2.png b/graphics/event_objects/pics/people/aqua_member_m/2.png
index 05142a5ee..05142a5ee 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/2.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/2.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/3.png b/graphics/event_objects/pics/people/aqua_member_m/3.png
index ee0014022..ee0014022 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/3.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/3.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/4.png b/graphics/event_objects/pics/people/aqua_member_m/4.png
index 194e13628..194e13628 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/4.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/4.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/5.png b/graphics/event_objects/pics/people/aqua_member_m/5.png
index 647cfb95c..647cfb95c 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/5.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/5.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/6.png b/graphics/event_objects/pics/people/aqua_member_m/6.png
index 3918e64e9..3918e64e9 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/6.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/6.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/7.png b/graphics/event_objects/pics/people/aqua_member_m/7.png
index f5505b7df..f5505b7df 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/7.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/7.png
diff --git a/graphics/map_objects/pics/people/aqua_member_m/8.png b/graphics/event_objects/pics/people/aqua_member_m/8.png
index dead93ba5..dead93ba5 100644
--- a/graphics/map_objects/pics/people/aqua_member_m/8.png
+++ b/graphics/event_objects/pics/people/aqua_member_m/8.png
diff --git a/graphics/map_objects/pics/people/archie/0.png b/graphics/event_objects/pics/people/archie/0.png
index dd091bd16..dd091bd16 100644
--- a/graphics/map_objects/pics/people/archie/0.png
+++ b/graphics/event_objects/pics/people/archie/0.png
diff --git a/graphics/map_objects/pics/people/archie/1.png b/graphics/event_objects/pics/people/archie/1.png
index 1d278db6d..1d278db6d 100644
--- a/graphics/map_objects/pics/people/archie/1.png
+++ b/graphics/event_objects/pics/people/archie/1.png
diff --git a/graphics/map_objects/pics/people/archie/2.png b/graphics/event_objects/pics/people/archie/2.png
index 2e1b7a1ce..2e1b7a1ce 100644
--- a/graphics/map_objects/pics/people/archie/2.png
+++ b/graphics/event_objects/pics/people/archie/2.png
diff --git a/graphics/map_objects/pics/people/archie/3.png b/graphics/event_objects/pics/people/archie/3.png
index 576abb99d..576abb99d 100644
--- a/graphics/map_objects/pics/people/archie/3.png
+++ b/graphics/event_objects/pics/people/archie/3.png
diff --git a/graphics/map_objects/pics/people/archie/4.png b/graphics/event_objects/pics/people/archie/4.png
index f48687318..f48687318 100644
--- a/graphics/map_objects/pics/people/archie/4.png
+++ b/graphics/event_objects/pics/people/archie/4.png
diff --git a/graphics/map_objects/pics/people/archie/5.png b/graphics/event_objects/pics/people/archie/5.png
index f21490b7b..f21490b7b 100644
--- a/graphics/map_objects/pics/people/archie/5.png
+++ b/graphics/event_objects/pics/people/archie/5.png
diff --git a/graphics/map_objects/pics/people/archie/6.png b/graphics/event_objects/pics/people/archie/6.png
index 29305a952..29305a952 100644
--- a/graphics/map_objects/pics/people/archie/6.png
+++ b/graphics/event_objects/pics/people/archie/6.png
diff --git a/graphics/map_objects/pics/people/archie/7.png b/graphics/event_objects/pics/people/archie/7.png
index 778a7e964..778a7e964 100644
--- a/graphics/map_objects/pics/people/archie/7.png
+++ b/graphics/event_objects/pics/people/archie/7.png
diff --git a/graphics/map_objects/pics/people/archie/8.png b/graphics/event_objects/pics/people/archie/8.png
index 237101046..237101046 100644
--- a/graphics/map_objects/pics/people/archie/8.png
+++ b/graphics/event_objects/pics/people/archie/8.png
diff --git a/graphics/map_objects/pics/people/artist/0.png b/graphics/event_objects/pics/people/artist/0.png
index 9f25f9ea0..9f25f9ea0 100644
--- a/graphics/map_objects/pics/people/artist/0.png
+++ b/graphics/event_objects/pics/people/artist/0.png
diff --git a/graphics/map_objects/pics/people/artist/1.png b/graphics/event_objects/pics/people/artist/1.png
index 6056f77a5..6056f77a5 100644
--- a/graphics/map_objects/pics/people/artist/1.png
+++ b/graphics/event_objects/pics/people/artist/1.png
diff --git a/graphics/map_objects/pics/people/artist/2.png b/graphics/event_objects/pics/people/artist/2.png
index f1908e664..f1908e664 100644
--- a/graphics/map_objects/pics/people/artist/2.png
+++ b/graphics/event_objects/pics/people/artist/2.png
diff --git a/graphics/map_objects/pics/people/artist/3.png b/graphics/event_objects/pics/people/artist/3.png
index 62cafaa79..62cafaa79 100644
--- a/graphics/map_objects/pics/people/artist/3.png
+++ b/graphics/event_objects/pics/people/artist/3.png
diff --git a/graphics/map_objects/pics/people/artist/4.png b/graphics/event_objects/pics/people/artist/4.png
index 718ad2d3b..718ad2d3b 100644
--- a/graphics/map_objects/pics/people/artist/4.png
+++ b/graphics/event_objects/pics/people/artist/4.png
diff --git a/graphics/map_objects/pics/people/artist/5.png b/graphics/event_objects/pics/people/artist/5.png
index cb37c0138..cb37c0138 100644
--- a/graphics/map_objects/pics/people/artist/5.png
+++ b/graphics/event_objects/pics/people/artist/5.png
diff --git a/graphics/map_objects/pics/people/artist/6.png b/graphics/event_objects/pics/people/artist/6.png
index 281724e3d..281724e3d 100644
--- a/graphics/map_objects/pics/people/artist/6.png
+++ b/graphics/event_objects/pics/people/artist/6.png
diff --git a/graphics/map_objects/pics/people/artist/7.png b/graphics/event_objects/pics/people/artist/7.png
index 36157c6ee..36157c6ee 100644
--- a/graphics/map_objects/pics/people/artist/7.png
+++ b/graphics/event_objects/pics/people/artist/7.png
diff --git a/graphics/map_objects/pics/people/artist/8.png b/graphics/event_objects/pics/people/artist/8.png
index df7afa65e..df7afa65e 100644
--- a/graphics/map_objects/pics/people/artist/8.png
+++ b/graphics/event_objects/pics/people/artist/8.png
diff --git a/graphics/map_objects/pics/people/beauty/0.png b/graphics/event_objects/pics/people/beauty/0.png
index 50e0ece37..50e0ece37 100644
--- a/graphics/map_objects/pics/people/beauty/0.png
+++ b/graphics/event_objects/pics/people/beauty/0.png
diff --git a/graphics/map_objects/pics/people/beauty/1.png b/graphics/event_objects/pics/people/beauty/1.png
index 3a1ba51e9..3a1ba51e9 100644
--- a/graphics/map_objects/pics/people/beauty/1.png
+++ b/graphics/event_objects/pics/people/beauty/1.png
diff --git a/graphics/map_objects/pics/people/beauty/2.png b/graphics/event_objects/pics/people/beauty/2.png
index 5787f360f..5787f360f 100644
--- a/graphics/map_objects/pics/people/beauty/2.png
+++ b/graphics/event_objects/pics/people/beauty/2.png
diff --git a/graphics/map_objects/pics/people/beauty/3.png b/graphics/event_objects/pics/people/beauty/3.png
index cc200158f..cc200158f 100644
--- a/graphics/map_objects/pics/people/beauty/3.png
+++ b/graphics/event_objects/pics/people/beauty/3.png
diff --git a/graphics/map_objects/pics/people/beauty/4.png b/graphics/event_objects/pics/people/beauty/4.png
index f49ef45c6..f49ef45c6 100644
--- a/graphics/map_objects/pics/people/beauty/4.png
+++ b/graphics/event_objects/pics/people/beauty/4.png
diff --git a/graphics/map_objects/pics/people/beauty/5.png b/graphics/event_objects/pics/people/beauty/5.png
index c8eed61d1..c8eed61d1 100644
--- a/graphics/map_objects/pics/people/beauty/5.png
+++ b/graphics/event_objects/pics/people/beauty/5.png
diff --git a/graphics/map_objects/pics/people/beauty/6.png b/graphics/event_objects/pics/people/beauty/6.png
index fb298aa74..fb298aa74 100644
--- a/graphics/map_objects/pics/people/beauty/6.png
+++ b/graphics/event_objects/pics/people/beauty/6.png
diff --git a/graphics/map_objects/pics/people/beauty/7.png b/graphics/event_objects/pics/people/beauty/7.png
index 0b576e71a..0b576e71a 100644
--- a/graphics/map_objects/pics/people/beauty/7.png
+++ b/graphics/event_objects/pics/people/beauty/7.png
diff --git a/graphics/map_objects/pics/people/beauty/8.png b/graphics/event_objects/pics/people/beauty/8.png
index 77de6d5c5..77de6d5c5 100644
--- a/graphics/map_objects/pics/people/beauty/8.png
+++ b/graphics/event_objects/pics/people/beauty/8.png
diff --git a/graphics/map_objects/pics/people/black_belt/0.png b/graphics/event_objects/pics/people/black_belt/0.png
index 0003a1a88..0003a1a88 100644
--- a/graphics/map_objects/pics/people/black_belt/0.png
+++ b/graphics/event_objects/pics/people/black_belt/0.png
diff --git a/graphics/map_objects/pics/people/black_belt/1.png b/graphics/event_objects/pics/people/black_belt/1.png
index c3e3b8a1d..c3e3b8a1d 100644
--- a/graphics/map_objects/pics/people/black_belt/1.png
+++ b/graphics/event_objects/pics/people/black_belt/1.png
diff --git a/graphics/map_objects/pics/people/black_belt/2.png b/graphics/event_objects/pics/people/black_belt/2.png
index 0cb8f30bf..0cb8f30bf 100644
--- a/graphics/map_objects/pics/people/black_belt/2.png
+++ b/graphics/event_objects/pics/people/black_belt/2.png
diff --git a/graphics/map_objects/pics/people/black_belt/3.png b/graphics/event_objects/pics/people/black_belt/3.png
index 8bae80b47..8bae80b47 100644
--- a/graphics/map_objects/pics/people/black_belt/3.png
+++ b/graphics/event_objects/pics/people/black_belt/3.png
diff --git a/graphics/map_objects/pics/people/black_belt/4.png b/graphics/event_objects/pics/people/black_belt/4.png
index aacf9c3f7..aacf9c3f7 100644
--- a/graphics/map_objects/pics/people/black_belt/4.png
+++ b/graphics/event_objects/pics/people/black_belt/4.png
diff --git a/graphics/map_objects/pics/people/black_belt/5.png b/graphics/event_objects/pics/people/black_belt/5.png
index 41c60075c..41c60075c 100644
--- a/graphics/map_objects/pics/people/black_belt/5.png
+++ b/graphics/event_objects/pics/people/black_belt/5.png
diff --git a/graphics/map_objects/pics/people/black_belt/6.png b/graphics/event_objects/pics/people/black_belt/6.png
index fa1c426a1..fa1c426a1 100644
--- a/graphics/map_objects/pics/people/black_belt/6.png
+++ b/graphics/event_objects/pics/people/black_belt/6.png
diff --git a/graphics/map_objects/pics/people/black_belt/7.png b/graphics/event_objects/pics/people/black_belt/7.png
index 013986add..013986add 100644
--- a/graphics/map_objects/pics/people/black_belt/7.png
+++ b/graphics/event_objects/pics/people/black_belt/7.png
diff --git a/graphics/map_objects/pics/people/black_belt/8.png b/graphics/event_objects/pics/people/black_belt/8.png
index 5efef483a..5efef483a 100644
--- a/graphics/map_objects/pics/people/black_belt/8.png
+++ b/graphics/event_objects/pics/people/black_belt/8.png
diff --git a/graphics/map_objects/pics/people/boy_1/0.png b/graphics/event_objects/pics/people/boy_1/0.png
index ddb78aa81..ddb78aa81 100644
--- a/graphics/map_objects/pics/people/boy_1/0.png
+++ b/graphics/event_objects/pics/people/boy_1/0.png
diff --git a/graphics/map_objects/pics/people/boy_1/1.png b/graphics/event_objects/pics/people/boy_1/1.png
index 57c6245b2..57c6245b2 100644
--- a/graphics/map_objects/pics/people/boy_1/1.png
+++ b/graphics/event_objects/pics/people/boy_1/1.png
diff --git a/graphics/map_objects/pics/people/boy_1/2.png b/graphics/event_objects/pics/people/boy_1/2.png
index cc0797ac8..cc0797ac8 100644
--- a/graphics/map_objects/pics/people/boy_1/2.png
+++ b/graphics/event_objects/pics/people/boy_1/2.png
diff --git a/graphics/map_objects/pics/people/boy_1/3.png b/graphics/event_objects/pics/people/boy_1/3.png
index aa08c6302..aa08c6302 100644
--- a/graphics/map_objects/pics/people/boy_1/3.png
+++ b/graphics/event_objects/pics/people/boy_1/3.png
diff --git a/graphics/map_objects/pics/people/boy_1/4.png b/graphics/event_objects/pics/people/boy_1/4.png
index d60c49f7e..d60c49f7e 100644
--- a/graphics/map_objects/pics/people/boy_1/4.png
+++ b/graphics/event_objects/pics/people/boy_1/4.png
diff --git a/graphics/map_objects/pics/people/boy_1/5.png b/graphics/event_objects/pics/people/boy_1/5.png
index e60d62e06..e60d62e06 100644
--- a/graphics/map_objects/pics/people/boy_1/5.png
+++ b/graphics/event_objects/pics/people/boy_1/5.png
diff --git a/graphics/map_objects/pics/people/boy_1/6.png b/graphics/event_objects/pics/people/boy_1/6.png
index 9c515fb2a..9c515fb2a 100644
--- a/graphics/map_objects/pics/people/boy_1/6.png
+++ b/graphics/event_objects/pics/people/boy_1/6.png
diff --git a/graphics/map_objects/pics/people/boy_1/7.png b/graphics/event_objects/pics/people/boy_1/7.png
index 422ce9d9c..422ce9d9c 100644
--- a/graphics/map_objects/pics/people/boy_1/7.png
+++ b/graphics/event_objects/pics/people/boy_1/7.png
diff --git a/graphics/map_objects/pics/people/boy_1/8.png b/graphics/event_objects/pics/people/boy_1/8.png
index 1fcff3113..1fcff3113 100644
--- a/graphics/map_objects/pics/people/boy_1/8.png
+++ b/graphics/event_objects/pics/people/boy_1/8.png
diff --git a/graphics/map_objects/pics/people/boy_2/0.png b/graphics/event_objects/pics/people/boy_2/0.png
index aefd58a96..aefd58a96 100644
--- a/graphics/map_objects/pics/people/boy_2/0.png
+++ b/graphics/event_objects/pics/people/boy_2/0.png
diff --git a/graphics/map_objects/pics/people/boy_2/1.png b/graphics/event_objects/pics/people/boy_2/1.png
index 8b0d448cb..8b0d448cb 100644
--- a/graphics/map_objects/pics/people/boy_2/1.png
+++ b/graphics/event_objects/pics/people/boy_2/1.png
diff --git a/graphics/map_objects/pics/people/boy_2/2.png b/graphics/event_objects/pics/people/boy_2/2.png
index cad6a6cda..cad6a6cda 100644
--- a/graphics/map_objects/pics/people/boy_2/2.png
+++ b/graphics/event_objects/pics/people/boy_2/2.png
diff --git a/graphics/map_objects/pics/people/boy_2/3.png b/graphics/event_objects/pics/people/boy_2/3.png
index 11dea03b8..11dea03b8 100644
--- a/graphics/map_objects/pics/people/boy_2/3.png
+++ b/graphics/event_objects/pics/people/boy_2/3.png
diff --git a/graphics/map_objects/pics/people/boy_2/4.png b/graphics/event_objects/pics/people/boy_2/4.png
index 7aa11f526..7aa11f526 100644
--- a/graphics/map_objects/pics/people/boy_2/4.png
+++ b/graphics/event_objects/pics/people/boy_2/4.png
diff --git a/graphics/map_objects/pics/people/boy_2/5.png b/graphics/event_objects/pics/people/boy_2/5.png
index 0ff4cc622..0ff4cc622 100644
--- a/graphics/map_objects/pics/people/boy_2/5.png
+++ b/graphics/event_objects/pics/people/boy_2/5.png
diff --git a/graphics/map_objects/pics/people/boy_2/6.png b/graphics/event_objects/pics/people/boy_2/6.png
index 5e7e98f4d..5e7e98f4d 100644
--- a/graphics/map_objects/pics/people/boy_2/6.png
+++ b/graphics/event_objects/pics/people/boy_2/6.png
diff --git a/graphics/map_objects/pics/people/boy_2/7.png b/graphics/event_objects/pics/people/boy_2/7.png
index 3b7188f3a..3b7188f3a 100644
--- a/graphics/map_objects/pics/people/boy_2/7.png
+++ b/graphics/event_objects/pics/people/boy_2/7.png
diff --git a/graphics/map_objects/pics/people/boy_2/8.png b/graphics/event_objects/pics/people/boy_2/8.png
index aea1fee46..aea1fee46 100644
--- a/graphics/map_objects/pics/people/boy_2/8.png
+++ b/graphics/event_objects/pics/people/boy_2/8.png
diff --git a/graphics/map_objects/pics/people/boy_3/0.png b/graphics/event_objects/pics/people/boy_3/0.png
index 6ac8b18c2..6ac8b18c2 100644
--- a/graphics/map_objects/pics/people/boy_3/0.png
+++ b/graphics/event_objects/pics/people/boy_3/0.png
diff --git a/graphics/map_objects/pics/people/boy_3/1.png b/graphics/event_objects/pics/people/boy_3/1.png
index e42abeb9f..e42abeb9f 100644
--- a/graphics/map_objects/pics/people/boy_3/1.png
+++ b/graphics/event_objects/pics/people/boy_3/1.png
diff --git a/graphics/map_objects/pics/people/boy_3/2.png b/graphics/event_objects/pics/people/boy_3/2.png
index f6fdc1f83..f6fdc1f83 100644
--- a/graphics/map_objects/pics/people/boy_3/2.png
+++ b/graphics/event_objects/pics/people/boy_3/2.png
diff --git a/graphics/map_objects/pics/people/boy_3/3.png b/graphics/event_objects/pics/people/boy_3/3.png
index 8edb25b0c..8edb25b0c 100644
--- a/graphics/map_objects/pics/people/boy_3/3.png
+++ b/graphics/event_objects/pics/people/boy_3/3.png
diff --git a/graphics/map_objects/pics/people/boy_3/4.png b/graphics/event_objects/pics/people/boy_3/4.png
index 016f12fd4..016f12fd4 100644
--- a/graphics/map_objects/pics/people/boy_3/4.png
+++ b/graphics/event_objects/pics/people/boy_3/4.png
diff --git a/graphics/map_objects/pics/people/boy_3/5.png b/graphics/event_objects/pics/people/boy_3/5.png
index b5d5bda85..b5d5bda85 100644
--- a/graphics/map_objects/pics/people/boy_3/5.png
+++ b/graphics/event_objects/pics/people/boy_3/5.png
diff --git a/graphics/map_objects/pics/people/boy_3/6.png b/graphics/event_objects/pics/people/boy_3/6.png
index 703bcdbbc..703bcdbbc 100644
--- a/graphics/map_objects/pics/people/boy_3/6.png
+++ b/graphics/event_objects/pics/people/boy_3/6.png
diff --git a/graphics/map_objects/pics/people/boy_3/7.png b/graphics/event_objects/pics/people/boy_3/7.png
index aeaf29942..aeaf29942 100644
--- a/graphics/map_objects/pics/people/boy_3/7.png
+++ b/graphics/event_objects/pics/people/boy_3/7.png
diff --git a/graphics/map_objects/pics/people/boy_3/8.png b/graphics/event_objects/pics/people/boy_3/8.png
index 26ef82fc3..26ef82fc3 100644
--- a/graphics/map_objects/pics/people/boy_3/8.png
+++ b/graphics/event_objects/pics/people/boy_3/8.png
diff --git a/graphics/map_objects/pics/people/boy_4/0.png b/graphics/event_objects/pics/people/boy_4/0.png
index a0b93b2f4..a0b93b2f4 100644
--- a/graphics/map_objects/pics/people/boy_4/0.png
+++ b/graphics/event_objects/pics/people/boy_4/0.png
diff --git a/graphics/map_objects/pics/people/boy_4/1.png b/graphics/event_objects/pics/people/boy_4/1.png
index 9c287e39d..9c287e39d 100644
--- a/graphics/map_objects/pics/people/boy_4/1.png
+++ b/graphics/event_objects/pics/people/boy_4/1.png
diff --git a/graphics/map_objects/pics/people/boy_4/2.png b/graphics/event_objects/pics/people/boy_4/2.png
index e1cead5ad..e1cead5ad 100644
--- a/graphics/map_objects/pics/people/boy_4/2.png
+++ b/graphics/event_objects/pics/people/boy_4/2.png
diff --git a/graphics/map_objects/pics/people/boy_4/3.png b/graphics/event_objects/pics/people/boy_4/3.png
index d64420afd..d64420afd 100644
--- a/graphics/map_objects/pics/people/boy_4/3.png
+++ b/graphics/event_objects/pics/people/boy_4/3.png
diff --git a/graphics/map_objects/pics/people/boy_4/4.png b/graphics/event_objects/pics/people/boy_4/4.png
index f7779a135..f7779a135 100644
--- a/graphics/map_objects/pics/people/boy_4/4.png
+++ b/graphics/event_objects/pics/people/boy_4/4.png
diff --git a/graphics/map_objects/pics/people/boy_4/5.png b/graphics/event_objects/pics/people/boy_4/5.png
index 76485893d..76485893d 100644
--- a/graphics/map_objects/pics/people/boy_4/5.png
+++ b/graphics/event_objects/pics/people/boy_4/5.png
diff --git a/graphics/map_objects/pics/people/boy_4/6.png b/graphics/event_objects/pics/people/boy_4/6.png
index 9f63aba4e..9f63aba4e 100644
--- a/graphics/map_objects/pics/people/boy_4/6.png
+++ b/graphics/event_objects/pics/people/boy_4/6.png
diff --git a/graphics/map_objects/pics/people/boy_4/7.png b/graphics/event_objects/pics/people/boy_4/7.png
index 40d19f455..40d19f455 100644
--- a/graphics/map_objects/pics/people/boy_4/7.png
+++ b/graphics/event_objects/pics/people/boy_4/7.png
diff --git a/graphics/map_objects/pics/people/boy_4/8.png b/graphics/event_objects/pics/people/boy_4/8.png
index 1ed4d0da0..1ed4d0da0 100644
--- a/graphics/map_objects/pics/people/boy_4/8.png
+++ b/graphics/event_objects/pics/people/boy_4/8.png
diff --git a/graphics/map_objects/pics/people/boy_5/0.png b/graphics/event_objects/pics/people/boy_5/0.png
index 2a0ab6a07..2a0ab6a07 100644
--- a/graphics/map_objects/pics/people/boy_5/0.png
+++ b/graphics/event_objects/pics/people/boy_5/0.png
diff --git a/graphics/map_objects/pics/people/boy_5/1.png b/graphics/event_objects/pics/people/boy_5/1.png
index 65f7f1dcf..65f7f1dcf 100644
--- a/graphics/map_objects/pics/people/boy_5/1.png
+++ b/graphics/event_objects/pics/people/boy_5/1.png
diff --git a/graphics/map_objects/pics/people/boy_5/2.png b/graphics/event_objects/pics/people/boy_5/2.png
index ece405a28..ece405a28 100644
--- a/graphics/map_objects/pics/people/boy_5/2.png
+++ b/graphics/event_objects/pics/people/boy_5/2.png
diff --git a/graphics/map_objects/pics/people/brawly/0.png b/graphics/event_objects/pics/people/brawly/0.png
index 1913b53c7..1913b53c7 100644
--- a/graphics/map_objects/pics/people/brawly/0.png
+++ b/graphics/event_objects/pics/people/brawly/0.png
diff --git a/graphics/map_objects/pics/people/brawly/1.png b/graphics/event_objects/pics/people/brawly/1.png
index f99f71ac2..f99f71ac2 100644
--- a/graphics/map_objects/pics/people/brawly/1.png
+++ b/graphics/event_objects/pics/people/brawly/1.png
diff --git a/graphics/map_objects/pics/people/brawly/2.png b/graphics/event_objects/pics/people/brawly/2.png
index e1a8df5e9..e1a8df5e9 100644
--- a/graphics/map_objects/pics/people/brawly/2.png
+++ b/graphics/event_objects/pics/people/brawly/2.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/00.png b/graphics/event_objects/pics/people/brendan/acro_bike/00.png
index 95606e81a..95606e81a 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/00.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/00.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/01.png b/graphics/event_objects/pics/people/brendan/acro_bike/01.png
index 0f188f3ad..0f188f3ad 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/01.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/01.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/02.png b/graphics/event_objects/pics/people/brendan/acro_bike/02.png
index dfb45c61e..dfb45c61e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/02.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/02.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/03.png b/graphics/event_objects/pics/people/brendan/acro_bike/03.png
index b3891b6f1..b3891b6f1 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/03.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/03.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/04.png b/graphics/event_objects/pics/people/brendan/acro_bike/04.png
index 6df515502..6df515502 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/04.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/04.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/05.png b/graphics/event_objects/pics/people/brendan/acro_bike/05.png
index b0436c325..b0436c325 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/05.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/05.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/06.png b/graphics/event_objects/pics/people/brendan/acro_bike/06.png
index 9e91f5b44..9e91f5b44 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/06.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/06.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/07.png b/graphics/event_objects/pics/people/brendan/acro_bike/07.png
index 516a7e4b5..516a7e4b5 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/07.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/07.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/08.png b/graphics/event_objects/pics/people/brendan/acro_bike/08.png
index 5cfa852ee..5cfa852ee 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/08.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/08.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/09.png b/graphics/event_objects/pics/people/brendan/acro_bike/09.png
index 1b0908c07..1b0908c07 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/09.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/09.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/10.png b/graphics/event_objects/pics/people/brendan/acro_bike/10.png
index 1178939e5..1178939e5 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/10.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/10.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/11.png b/graphics/event_objects/pics/people/brendan/acro_bike/11.png
index 788ce4e5c..788ce4e5c 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/11.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/11.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/12.png b/graphics/event_objects/pics/people/brendan/acro_bike/12.png
index 67d1892ef..67d1892ef 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/12.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/12.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/13.png b/graphics/event_objects/pics/people/brendan/acro_bike/13.png
index 8c4cf1ae8..8c4cf1ae8 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/13.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/13.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/14.png b/graphics/event_objects/pics/people/brendan/acro_bike/14.png
index f87f0da16..f87f0da16 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/14.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/14.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/15.png b/graphics/event_objects/pics/people/brendan/acro_bike/15.png
index da93aad5e..da93aad5e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/15.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/15.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/16.png b/graphics/event_objects/pics/people/brendan/acro_bike/16.png
index 2d6729fa0..2d6729fa0 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/16.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/16.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/17.png b/graphics/event_objects/pics/people/brendan/acro_bike/17.png
index b6192ef1d..b6192ef1d 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/17.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/17.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/18.png b/graphics/event_objects/pics/people/brendan/acro_bike/18.png
index c21c22806..c21c22806 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/18.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/18.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/19.png b/graphics/event_objects/pics/people/brendan/acro_bike/19.png
index 119d68761..119d68761 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/19.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/19.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/20.png b/graphics/event_objects/pics/people/brendan/acro_bike/20.png
index a02ee9600..a02ee9600 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/20.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/20.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/21.png b/graphics/event_objects/pics/people/brendan/acro_bike/21.png
index 2cce84cc4..2cce84cc4 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/21.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/21.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/22.png b/graphics/event_objects/pics/people/brendan/acro_bike/22.png
index fd1bb2c85..fd1bb2c85 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/22.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/22.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/23.png b/graphics/event_objects/pics/people/brendan/acro_bike/23.png
index 58aff383e..58aff383e 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/23.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/23.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/24.png b/graphics/event_objects/pics/people/brendan/acro_bike/24.png
index f380d8e5c..f380d8e5c 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/24.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/24.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/25.png b/graphics/event_objects/pics/people/brendan/acro_bike/25.png
index 5e07407d5..5e07407d5 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/25.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/25.png
diff --git a/graphics/map_objects/pics/people/brendan/acro_bike/26.png b/graphics/event_objects/pics/people/brendan/acro_bike/26.png
index eff56c059..eff56c059 100644
--- a/graphics/map_objects/pics/people/brendan/acro_bike/26.png
+++ b/graphics/event_objects/pics/people/brendan/acro_bike/26.png
diff --git a/graphics/map_objects/pics/people/brendan/decorating.png b/graphics/event_objects/pics/people/brendan/decorating.png
index 7045d6da3..7045d6da3 100644
--- a/graphics/map_objects/pics/people/brendan/decorating.png
+++ b/graphics/event_objects/pics/people/brendan/decorating.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/0.png b/graphics/event_objects/pics/people/brendan/field_move/0.png
index e0a2876a2..e0a2876a2 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/0.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/0.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/1.png b/graphics/event_objects/pics/people/brendan/field_move/1.png
index f19154b6f..f19154b6f 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/1.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/1.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/2.png b/graphics/event_objects/pics/people/brendan/field_move/2.png
index fea8469cb..fea8469cb 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/2.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/2.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/3.png b/graphics/event_objects/pics/people/brendan/field_move/3.png
index 7d394584d..7d394584d 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/3.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/3.png
diff --git a/graphics/map_objects/pics/people/brendan/field_move/4.png b/graphics/event_objects/pics/people/brendan/field_move/4.png
index 298e83d0f..298e83d0f 100644
--- a/graphics/map_objects/pics/people/brendan/field_move/4.png
+++ b/graphics/event_objects/pics/people/brendan/field_move/4.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/00.png b/graphics/event_objects/pics/people/brendan/fishing/00.png
index 6b8c0e202..6b8c0e202 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/00.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/00.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/01.png b/graphics/event_objects/pics/people/brendan/fishing/01.png
index 6938e7892..6938e7892 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/01.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/01.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/02.png b/graphics/event_objects/pics/people/brendan/fishing/02.png
index 2fd184fbd..2fd184fbd 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/02.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/02.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/03.png b/graphics/event_objects/pics/people/brendan/fishing/03.png
index 6dcc27682..6dcc27682 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/03.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/03.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/04.png b/graphics/event_objects/pics/people/brendan/fishing/04.png
index b7667b374..b7667b374 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/04.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/04.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/05.png b/graphics/event_objects/pics/people/brendan/fishing/05.png
index 41ad9bbf5..41ad9bbf5 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/05.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/05.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/06.png b/graphics/event_objects/pics/people/brendan/fishing/06.png
index ec546ea55..ec546ea55 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/06.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/06.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/07.png b/graphics/event_objects/pics/people/brendan/fishing/07.png
index ebe68dd24..ebe68dd24 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/07.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/07.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/08.png b/graphics/event_objects/pics/people/brendan/fishing/08.png
index e32beea65..e32beea65 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/08.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/08.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/09.png b/graphics/event_objects/pics/people/brendan/fishing/09.png
index b575fd9e4..b575fd9e4 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/09.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/09.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/10.png b/graphics/event_objects/pics/people/brendan/fishing/10.png
index 7182b32f1..7182b32f1 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/10.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/10.png
diff --git a/graphics/map_objects/pics/people/brendan/fishing/11.png b/graphics/event_objects/pics/people/brendan/fishing/11.png
index 308824fee..308824fee 100644
--- a/graphics/map_objects/pics/people/brendan/fishing/11.png
+++ b/graphics/event_objects/pics/people/brendan/fishing/11.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/0.png b/graphics/event_objects/pics/people/brendan/mach_bike/0.png
index 95606e81a..95606e81a 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/0.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/0.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/1.png b/graphics/event_objects/pics/people/brendan/mach_bike/1.png
index 0f188f3ad..0f188f3ad 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/1.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/1.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/2.png b/graphics/event_objects/pics/people/brendan/mach_bike/2.png
index dfb45c61e..dfb45c61e 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/2.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/2.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/3.png b/graphics/event_objects/pics/people/brendan/mach_bike/3.png
index b3891b6f1..b3891b6f1 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/3.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/3.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/4.png b/graphics/event_objects/pics/people/brendan/mach_bike/4.png
index 6df515502..6df515502 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/4.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/4.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/5.png b/graphics/event_objects/pics/people/brendan/mach_bike/5.png
index b0436c325..b0436c325 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/5.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/5.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/6.png b/graphics/event_objects/pics/people/brendan/mach_bike/6.png
index 9e91f5b44..9e91f5b44 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/6.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/6.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/7.png b/graphics/event_objects/pics/people/brendan/mach_bike/7.png
index 516a7e4b5..516a7e4b5 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/7.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/7.png
diff --git a/graphics/map_objects/pics/people/brendan/mach_bike/8.png b/graphics/event_objects/pics/people/brendan/mach_bike/8.png
index 5cfa852ee..5cfa852ee 100644
--- a/graphics/map_objects/pics/people/brendan/mach_bike/8.png
+++ b/graphics/event_objects/pics/people/brendan/mach_bike/8.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/00.png b/graphics/event_objects/pics/people/brendan/normal/00.png
index 780360c4f..780360c4f 100644
--- a/graphics/map_objects/pics/people/brendan/normal/00.png
+++ b/graphics/event_objects/pics/people/brendan/normal/00.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/01.png b/graphics/event_objects/pics/people/brendan/normal/01.png
index f83064047..f83064047 100644
--- a/graphics/map_objects/pics/people/brendan/normal/01.png
+++ b/graphics/event_objects/pics/people/brendan/normal/01.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/02.png b/graphics/event_objects/pics/people/brendan/normal/02.png
index ffb8ad34b..ffb8ad34b 100644
--- a/graphics/map_objects/pics/people/brendan/normal/02.png
+++ b/graphics/event_objects/pics/people/brendan/normal/02.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/03.png b/graphics/event_objects/pics/people/brendan/normal/03.png
index d0721bbb4..d0721bbb4 100644
--- a/graphics/map_objects/pics/people/brendan/normal/03.png
+++ b/graphics/event_objects/pics/people/brendan/normal/03.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/04.png b/graphics/event_objects/pics/people/brendan/normal/04.png
index 07817e55f..07817e55f 100644
--- a/graphics/map_objects/pics/people/brendan/normal/04.png
+++ b/graphics/event_objects/pics/people/brendan/normal/04.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/05.png b/graphics/event_objects/pics/people/brendan/normal/05.png
index afc322129..afc322129 100644
--- a/graphics/map_objects/pics/people/brendan/normal/05.png
+++ b/graphics/event_objects/pics/people/brendan/normal/05.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/06.png b/graphics/event_objects/pics/people/brendan/normal/06.png
index 84a8cceb1..84a8cceb1 100644
--- a/graphics/map_objects/pics/people/brendan/normal/06.png
+++ b/graphics/event_objects/pics/people/brendan/normal/06.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/07.png b/graphics/event_objects/pics/people/brendan/normal/07.png
index ca518d8a0..ca518d8a0 100644
--- a/graphics/map_objects/pics/people/brendan/normal/07.png
+++ b/graphics/event_objects/pics/people/brendan/normal/07.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/08.png b/graphics/event_objects/pics/people/brendan/normal/08.png
index 3430ff243..3430ff243 100644
--- a/graphics/map_objects/pics/people/brendan/normal/08.png
+++ b/graphics/event_objects/pics/people/brendan/normal/08.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/09.png b/graphics/event_objects/pics/people/brendan/normal/09.png
index 392f019e7..392f019e7 100644
--- a/graphics/map_objects/pics/people/brendan/normal/09.png
+++ b/graphics/event_objects/pics/people/brendan/normal/09.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/10.png b/graphics/event_objects/pics/people/brendan/normal/10.png
index 722f2d04d..722f2d04d 100644
--- a/graphics/map_objects/pics/people/brendan/normal/10.png
+++ b/graphics/event_objects/pics/people/brendan/normal/10.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/11.png b/graphics/event_objects/pics/people/brendan/normal/11.png
index eff0cbc5f..eff0cbc5f 100644
--- a/graphics/map_objects/pics/people/brendan/normal/11.png
+++ b/graphics/event_objects/pics/people/brendan/normal/11.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/12.png b/graphics/event_objects/pics/people/brendan/normal/12.png
index 0a5037d43..0a5037d43 100644
--- a/graphics/map_objects/pics/people/brendan/normal/12.png
+++ b/graphics/event_objects/pics/people/brendan/normal/12.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/13.png b/graphics/event_objects/pics/people/brendan/normal/13.png
index 8dc245c0e..8dc245c0e 100644
--- a/graphics/map_objects/pics/people/brendan/normal/13.png
+++ b/graphics/event_objects/pics/people/brendan/normal/13.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/14.png b/graphics/event_objects/pics/people/brendan/normal/14.png
index 53844c0c1..53844c0c1 100644
--- a/graphics/map_objects/pics/people/brendan/normal/14.png
+++ b/graphics/event_objects/pics/people/brendan/normal/14.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/15.png b/graphics/event_objects/pics/people/brendan/normal/15.png
index 34d73e7f6..34d73e7f6 100644
--- a/graphics/map_objects/pics/people/brendan/normal/15.png
+++ b/graphics/event_objects/pics/people/brendan/normal/15.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/16.png b/graphics/event_objects/pics/people/brendan/normal/16.png
index b324f5538..b324f5538 100644
--- a/graphics/map_objects/pics/people/brendan/normal/16.png
+++ b/graphics/event_objects/pics/people/brendan/normal/16.png
diff --git a/graphics/map_objects/pics/people/brendan/normal/17.png b/graphics/event_objects/pics/people/brendan/normal/17.png
index 9a736dc02..9a736dc02 100644
--- a/graphics/map_objects/pics/people/brendan/normal/17.png
+++ b/graphics/event_objects/pics/people/brendan/normal/17.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/0.png b/graphics/event_objects/pics/people/brendan/surfing/0.png
index 851640543..851640543 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/0.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/0.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/1.png b/graphics/event_objects/pics/people/brendan/surfing/1.png
index 434be47ea..434be47ea 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/1.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/1.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/2.png b/graphics/event_objects/pics/people/brendan/surfing/2.png
index 94979b4a3..94979b4a3 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/2.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/2.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/3.png b/graphics/event_objects/pics/people/brendan/surfing/3.png
index 70b6bf2a3..70b6bf2a3 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/3.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/3.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/4.png b/graphics/event_objects/pics/people/brendan/surfing/4.png
index fed2883fb..fed2883fb 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/4.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/4.png
diff --git a/graphics/map_objects/pics/people/brendan/surfing/5.png b/graphics/event_objects/pics/people/brendan/surfing/5.png
index ea1408694..ea1408694 100644
--- a/graphics/map_objects/pics/people/brendan/surfing/5.png
+++ b/graphics/event_objects/pics/people/brendan/surfing/5.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/0.png b/graphics/event_objects/pics/people/brendan/underwater/0.png
index 79951c29c..79951c29c 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/0.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/0.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/1.png b/graphics/event_objects/pics/people/brendan/underwater/1.png
index d7c3f0783..d7c3f0783 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/1.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/1.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/2.png b/graphics/event_objects/pics/people/brendan/underwater/2.png
index 628a2ac88..628a2ac88 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/2.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/2.png
diff --git a/graphics/map_objects/pics/people/brendan/underwater/3.png b/graphics/event_objects/pics/people/brendan/underwater/3.png
index 7756a96db..7756a96db 100644
--- a/graphics/map_objects/pics/people/brendan/underwater/3.png
+++ b/graphics/event_objects/pics/people/brendan/underwater/3.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/0.png b/graphics/event_objects/pics/people/brendan/watering/0.png
index 0e9c477fd..0e9c477fd 100644
--- a/graphics/map_objects/pics/people/brendan/watering/0.png
+++ b/graphics/event_objects/pics/people/brendan/watering/0.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/1.png b/graphics/event_objects/pics/people/brendan/watering/1.png
index d1b59baf8..d1b59baf8 100644
--- a/graphics/map_objects/pics/people/brendan/watering/1.png
+++ b/graphics/event_objects/pics/people/brendan/watering/1.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/2.png b/graphics/event_objects/pics/people/brendan/watering/2.png
index b35a92e15..b35a92e15 100644
--- a/graphics/map_objects/pics/people/brendan/watering/2.png
+++ b/graphics/event_objects/pics/people/brendan/watering/2.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/3.png b/graphics/event_objects/pics/people/brendan/watering/3.png
index be8cdbfe1..be8cdbfe1 100644
--- a/graphics/map_objects/pics/people/brendan/watering/3.png
+++ b/graphics/event_objects/pics/people/brendan/watering/3.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/4.png b/graphics/event_objects/pics/people/brendan/watering/4.png
index 762b9060c..762b9060c 100644
--- a/graphics/map_objects/pics/people/brendan/watering/4.png
+++ b/graphics/event_objects/pics/people/brendan/watering/4.png
diff --git a/graphics/map_objects/pics/people/brendan/watering/5.png b/graphics/event_objects/pics/people/brendan/watering/5.png
index cfed73765..cfed73765 100644
--- a/graphics/map_objects/pics/people/brendan/watering/5.png
+++ b/graphics/event_objects/pics/people/brendan/watering/5.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/0.png b/graphics/event_objects/pics/people/bug_catcher/0.png
index 860449379..860449379 100644
--- a/graphics/map_objects/pics/people/bug_catcher/0.png
+++ b/graphics/event_objects/pics/people/bug_catcher/0.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/1.png b/graphics/event_objects/pics/people/bug_catcher/1.png
index a0a3b3df1..a0a3b3df1 100644
--- a/graphics/map_objects/pics/people/bug_catcher/1.png
+++ b/graphics/event_objects/pics/people/bug_catcher/1.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/2.png b/graphics/event_objects/pics/people/bug_catcher/2.png
index 96363e4a8..96363e4a8 100644
--- a/graphics/map_objects/pics/people/bug_catcher/2.png
+++ b/graphics/event_objects/pics/people/bug_catcher/2.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/3.png b/graphics/event_objects/pics/people/bug_catcher/3.png
index 472fa42cb..472fa42cb 100644
--- a/graphics/map_objects/pics/people/bug_catcher/3.png
+++ b/graphics/event_objects/pics/people/bug_catcher/3.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/4.png b/graphics/event_objects/pics/people/bug_catcher/4.png
index f6da1bb97..f6da1bb97 100644
--- a/graphics/map_objects/pics/people/bug_catcher/4.png
+++ b/graphics/event_objects/pics/people/bug_catcher/4.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/5.png b/graphics/event_objects/pics/people/bug_catcher/5.png
index bd5aea560..bd5aea560 100644
--- a/graphics/map_objects/pics/people/bug_catcher/5.png
+++ b/graphics/event_objects/pics/people/bug_catcher/5.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/6.png b/graphics/event_objects/pics/people/bug_catcher/6.png
index 2a93fc6b7..2a93fc6b7 100644
--- a/graphics/map_objects/pics/people/bug_catcher/6.png
+++ b/graphics/event_objects/pics/people/bug_catcher/6.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/7.png b/graphics/event_objects/pics/people/bug_catcher/7.png
index fded025e3..fded025e3 100644
--- a/graphics/map_objects/pics/people/bug_catcher/7.png
+++ b/graphics/event_objects/pics/people/bug_catcher/7.png
diff --git a/graphics/map_objects/pics/people/bug_catcher/8.png b/graphics/event_objects/pics/people/bug_catcher/8.png
index df561597b..df561597b 100644
--- a/graphics/map_objects/pics/people/bug_catcher/8.png
+++ b/graphics/event_objects/pics/people/bug_catcher/8.png
diff --git a/graphics/map_objects/pics/people/cameraman/0.png b/graphics/event_objects/pics/people/cameraman/0.png
index af6ad2878..af6ad2878 100644
--- a/graphics/map_objects/pics/people/cameraman/0.png
+++ b/graphics/event_objects/pics/people/cameraman/0.png
diff --git a/graphics/map_objects/pics/people/cameraman/1.png b/graphics/event_objects/pics/people/cameraman/1.png
index 112ee86b4..112ee86b4 100644
--- a/graphics/map_objects/pics/people/cameraman/1.png
+++ b/graphics/event_objects/pics/people/cameraman/1.png
diff --git a/graphics/map_objects/pics/people/cameraman/2.png b/graphics/event_objects/pics/people/cameraman/2.png
index 6eaca8266..6eaca8266 100644
--- a/graphics/map_objects/pics/people/cameraman/2.png
+++ b/graphics/event_objects/pics/people/cameraman/2.png
diff --git a/graphics/map_objects/pics/people/cameraman/3.png b/graphics/event_objects/pics/people/cameraman/3.png
index 6f28f9ff4..6f28f9ff4 100644
--- a/graphics/map_objects/pics/people/cameraman/3.png
+++ b/graphics/event_objects/pics/people/cameraman/3.png
diff --git a/graphics/map_objects/pics/people/cameraman/4.png b/graphics/event_objects/pics/people/cameraman/4.png
index a74cd6c8c..a74cd6c8c 100644
--- a/graphics/map_objects/pics/people/cameraman/4.png
+++ b/graphics/event_objects/pics/people/cameraman/4.png
diff --git a/graphics/map_objects/pics/people/cameraman/5.png b/graphics/event_objects/pics/people/cameraman/5.png
index 44c1a768c..44c1a768c 100644
--- a/graphics/map_objects/pics/people/cameraman/5.png
+++ b/graphics/event_objects/pics/people/cameraman/5.png
diff --git a/graphics/map_objects/pics/people/cameraman/6.png b/graphics/event_objects/pics/people/cameraman/6.png
index e8c41883d..e8c41883d 100644
--- a/graphics/map_objects/pics/people/cameraman/6.png
+++ b/graphics/event_objects/pics/people/cameraman/6.png
diff --git a/graphics/map_objects/pics/people/cameraman/7.png b/graphics/event_objects/pics/people/cameraman/7.png
index 2ccfeae84..2ccfeae84 100644
--- a/graphics/map_objects/pics/people/cameraman/7.png
+++ b/graphics/event_objects/pics/people/cameraman/7.png
diff --git a/graphics/map_objects/pics/people/cameraman/8.png b/graphics/event_objects/pics/people/cameraman/8.png
index e2af57df1..e2af57df1 100644
--- a/graphics/map_objects/pics/people/cameraman/8.png
+++ b/graphics/event_objects/pics/people/cameraman/8.png
diff --git a/graphics/map_objects/pics/people/camper/0.png b/graphics/event_objects/pics/people/camper/0.png
index ffdea18b6..ffdea18b6 100644
--- a/graphics/map_objects/pics/people/camper/0.png
+++ b/graphics/event_objects/pics/people/camper/0.png
diff --git a/graphics/map_objects/pics/people/camper/1.png b/graphics/event_objects/pics/people/camper/1.png
index ea5ef4d86..ea5ef4d86 100644
--- a/graphics/map_objects/pics/people/camper/1.png
+++ b/graphics/event_objects/pics/people/camper/1.png
diff --git a/graphics/map_objects/pics/people/camper/2.png b/graphics/event_objects/pics/people/camper/2.png
index c25c51a78..c25c51a78 100644
--- a/graphics/map_objects/pics/people/camper/2.png
+++ b/graphics/event_objects/pics/people/camper/2.png
diff --git a/graphics/map_objects/pics/people/camper/3.png b/graphics/event_objects/pics/people/camper/3.png
index 451f9c469..451f9c469 100644
--- a/graphics/map_objects/pics/people/camper/3.png
+++ b/graphics/event_objects/pics/people/camper/3.png
diff --git a/graphics/map_objects/pics/people/camper/4.png b/graphics/event_objects/pics/people/camper/4.png
index b17781df4..b17781df4 100644
--- a/graphics/map_objects/pics/people/camper/4.png
+++ b/graphics/event_objects/pics/people/camper/4.png
diff --git a/graphics/map_objects/pics/people/camper/5.png b/graphics/event_objects/pics/people/camper/5.png
index ea79ad5d2..ea79ad5d2 100644
--- a/graphics/map_objects/pics/people/camper/5.png
+++ b/graphics/event_objects/pics/people/camper/5.png
diff --git a/graphics/map_objects/pics/people/camper/6.png b/graphics/event_objects/pics/people/camper/6.png
index 7f003b53f..7f003b53f 100644
--- a/graphics/map_objects/pics/people/camper/6.png
+++ b/graphics/event_objects/pics/people/camper/6.png
diff --git a/graphics/map_objects/pics/people/camper/7.png b/graphics/event_objects/pics/people/camper/7.png
index 4dcb217b3..4dcb217b3 100644
--- a/graphics/map_objects/pics/people/camper/7.png
+++ b/graphics/event_objects/pics/people/camper/7.png
diff --git a/graphics/map_objects/pics/people/camper/8.png b/graphics/event_objects/pics/people/camper/8.png
index 888a0d17f..888a0d17f 100644
--- a/graphics/map_objects/pics/people/camper/8.png
+++ b/graphics/event_objects/pics/people/camper/8.png
diff --git a/graphics/map_objects/pics/people/contest_judge/0.png b/graphics/event_objects/pics/people/contest_judge/0.png
index 118a34463..118a34463 100644
--- a/graphics/map_objects/pics/people/contest_judge/0.png
+++ b/graphics/event_objects/pics/people/contest_judge/0.png
diff --git a/graphics/map_objects/pics/people/contest_judge/1.png b/graphics/event_objects/pics/people/contest_judge/1.png
index 75f9010dd..75f9010dd 100644
--- a/graphics/map_objects/pics/people/contest_judge/1.png
+++ b/graphics/event_objects/pics/people/contest_judge/1.png
diff --git a/graphics/map_objects/pics/people/contest_judge/2.png b/graphics/event_objects/pics/people/contest_judge/2.png
index 8ca543cef..8ca543cef 100644
--- a/graphics/map_objects/pics/people/contest_judge/2.png
+++ b/graphics/event_objects/pics/people/contest_judge/2.png
diff --git a/graphics/map_objects/pics/people/contest_judge/3.png b/graphics/event_objects/pics/people/contest_judge/3.png
index 16015e53c..16015e53c 100644
--- a/graphics/map_objects/pics/people/contest_judge/3.png
+++ b/graphics/event_objects/pics/people/contest_judge/3.png
diff --git a/graphics/map_objects/pics/people/contest_judge/4.png b/graphics/event_objects/pics/people/contest_judge/4.png
index e4fdfcc13..e4fdfcc13 100644
--- a/graphics/map_objects/pics/people/contest_judge/4.png
+++ b/graphics/event_objects/pics/people/contest_judge/4.png
diff --git a/graphics/map_objects/pics/people/contest_judge/5.png b/graphics/event_objects/pics/people/contest_judge/5.png
index 5de4a6b80..5de4a6b80 100644
--- a/graphics/map_objects/pics/people/contest_judge/5.png
+++ b/graphics/event_objects/pics/people/contest_judge/5.png
diff --git a/graphics/map_objects/pics/people/contest_judge/6.png b/graphics/event_objects/pics/people/contest_judge/6.png
index ebcb577d4..ebcb577d4 100644
--- a/graphics/map_objects/pics/people/contest_judge/6.png
+++ b/graphics/event_objects/pics/people/contest_judge/6.png
diff --git a/graphics/map_objects/pics/people/contest_judge/7.png b/graphics/event_objects/pics/people/contest_judge/7.png
index d01f156c1..d01f156c1 100644
--- a/graphics/map_objects/pics/people/contest_judge/7.png
+++ b/graphics/event_objects/pics/people/contest_judge/7.png
diff --git a/graphics/map_objects/pics/people/contest_judge/8.png b/graphics/event_objects/pics/people/contest_judge/8.png
index 84e5690b7..84e5690b7 100644
--- a/graphics/map_objects/pics/people/contest_judge/8.png
+++ b/graphics/event_objects/pics/people/contest_judge/8.png
diff --git a/graphics/map_objects/pics/people/cook/0.png b/graphics/event_objects/pics/people/cook/0.png
index 1413ce869..1413ce869 100644
--- a/graphics/map_objects/pics/people/cook/0.png
+++ b/graphics/event_objects/pics/people/cook/0.png
diff --git a/graphics/map_objects/pics/people/cook/1.png b/graphics/event_objects/pics/people/cook/1.png
index 622e2b2d2..622e2b2d2 100644
--- a/graphics/map_objects/pics/people/cook/1.png
+++ b/graphics/event_objects/pics/people/cook/1.png
diff --git a/graphics/map_objects/pics/people/cook/2.png b/graphics/event_objects/pics/people/cook/2.png
index b2c2231a2..b2c2231a2 100644
--- a/graphics/map_objects/pics/people/cook/2.png
+++ b/graphics/event_objects/pics/people/cook/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png
index 452ba3daf..452ba3daf 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/0.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/0.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png
index e4c8c78cb..e4c8c78cb 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/1.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/1.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png
index 20986da62..20986da62 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/2.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png
index 5cfda5ff6..5cfda5ff6 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/3.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/3.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png
index e52cac84e..e52cac84e 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/4.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/4.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png
index 8376cc00e..8376cc00e 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/5.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/5.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png
index d99951529..d99951529 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/6.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/6.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png
index a1c953c83..a1c953c83 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/7.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/7.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png
index 63a6ebb0c..63a6ebb0c 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_f/8.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_f/8.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png
index 107589cbc..107589cbc 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/0.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/0.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png
index 39cf99a21..39cf99a21 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/1.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/1.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png
index f5ab76d10..f5ab76d10 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/2.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/2.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png
index d54d3fcdb..d54d3fcdb 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/3.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/3.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png
index b065a1294..b065a1294 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/4.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/4.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png
index bbb47a869..bbb47a869 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/5.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/5.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png
index 7f126858f..7f126858f 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/6.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/6.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png
index 43f2e2739..43f2e2739 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/7.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/7.png
diff --git a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png
index 1168c440b..1168c440b 100644
--- a/graphics/map_objects/pics/people/cycling_triathlete_m/8.png
+++ b/graphics/event_objects/pics/people/cycling_triathlete_m/8.png
diff --git a/graphics/map_objects/pics/people/drake/0.png b/graphics/event_objects/pics/people/drake/0.png
index 8c12cbe40..8c12cbe40 100644
--- a/graphics/map_objects/pics/people/drake/0.png
+++ b/graphics/event_objects/pics/people/drake/0.png
diff --git a/graphics/map_objects/pics/people/drake/1.png b/graphics/event_objects/pics/people/drake/1.png
index b401c3b14..b401c3b14 100644
--- a/graphics/map_objects/pics/people/drake/1.png
+++ b/graphics/event_objects/pics/people/drake/1.png
diff --git a/graphics/map_objects/pics/people/drake/2.png b/graphics/event_objects/pics/people/drake/2.png
index c116a283e..c116a283e 100644
--- a/graphics/map_objects/pics/people/drake/2.png
+++ b/graphics/event_objects/pics/people/drake/2.png
diff --git a/graphics/map_objects/pics/people/fat_man/0.png b/graphics/event_objects/pics/people/fat_man/0.png
index 290a7f9ed..290a7f9ed 100644
--- a/graphics/map_objects/pics/people/fat_man/0.png
+++ b/graphics/event_objects/pics/people/fat_man/0.png
diff --git a/graphics/map_objects/pics/people/fat_man/1.png b/graphics/event_objects/pics/people/fat_man/1.png
index d5d81dcdb..d5d81dcdb 100644
--- a/graphics/map_objects/pics/people/fat_man/1.png
+++ b/graphics/event_objects/pics/people/fat_man/1.png
diff --git a/graphics/map_objects/pics/people/fat_man/2.png b/graphics/event_objects/pics/people/fat_man/2.png
index 5b99f60da..5b99f60da 100644
--- a/graphics/map_objects/pics/people/fat_man/2.png
+++ b/graphics/event_objects/pics/people/fat_man/2.png
diff --git a/graphics/map_objects/pics/people/fat_man/3.png b/graphics/event_objects/pics/people/fat_man/3.png
index 2c6b5f0d1..2c6b5f0d1 100644
--- a/graphics/map_objects/pics/people/fat_man/3.png
+++ b/graphics/event_objects/pics/people/fat_man/3.png
diff --git a/graphics/map_objects/pics/people/fat_man/4.png b/graphics/event_objects/pics/people/fat_man/4.png
index 846d52b99..846d52b99 100644
--- a/graphics/map_objects/pics/people/fat_man/4.png
+++ b/graphics/event_objects/pics/people/fat_man/4.png
diff --git a/graphics/map_objects/pics/people/fat_man/5.png b/graphics/event_objects/pics/people/fat_man/5.png
index ee751217f..ee751217f 100644
--- a/graphics/map_objects/pics/people/fat_man/5.png
+++ b/graphics/event_objects/pics/people/fat_man/5.png
diff --git a/graphics/map_objects/pics/people/fat_man/6.png b/graphics/event_objects/pics/people/fat_man/6.png
index 8eb76d809..8eb76d809 100644
--- a/graphics/map_objects/pics/people/fat_man/6.png
+++ b/graphics/event_objects/pics/people/fat_man/6.png
diff --git a/graphics/map_objects/pics/people/fat_man/7.png b/graphics/event_objects/pics/people/fat_man/7.png
index 5694df27b..5694df27b 100644
--- a/graphics/map_objects/pics/people/fat_man/7.png
+++ b/graphics/event_objects/pics/people/fat_man/7.png
diff --git a/graphics/map_objects/pics/people/fat_man/8.png b/graphics/event_objects/pics/people/fat_man/8.png
index f3528f332..f3528f332 100644
--- a/graphics/map_objects/pics/people/fat_man/8.png
+++ b/graphics/event_objects/pics/people/fat_man/8.png
diff --git a/graphics/map_objects/pics/people/fisherman/0.png b/graphics/event_objects/pics/people/fisherman/0.png
index 5e963f889..5e963f889 100644
--- a/graphics/map_objects/pics/people/fisherman/0.png
+++ b/graphics/event_objects/pics/people/fisherman/0.png
diff --git a/graphics/map_objects/pics/people/fisherman/1.png b/graphics/event_objects/pics/people/fisherman/1.png
index 5bd83e7e1..5bd83e7e1 100644
--- a/graphics/map_objects/pics/people/fisherman/1.png
+++ b/graphics/event_objects/pics/people/fisherman/1.png
diff --git a/graphics/map_objects/pics/people/fisherman/2.png b/graphics/event_objects/pics/people/fisherman/2.png
index f587de8d9..f587de8d9 100644
--- a/graphics/map_objects/pics/people/fisherman/2.png
+++ b/graphics/event_objects/pics/people/fisherman/2.png
diff --git a/graphics/map_objects/pics/people/fisherman/3.png b/graphics/event_objects/pics/people/fisherman/3.png
index 5d79a1da8..5d79a1da8 100644
--- a/graphics/map_objects/pics/people/fisherman/3.png
+++ b/graphics/event_objects/pics/people/fisherman/3.png
diff --git a/graphics/map_objects/pics/people/fisherman/4.png b/graphics/event_objects/pics/people/fisherman/4.png
index dd3104436..dd3104436 100644
--- a/graphics/map_objects/pics/people/fisherman/4.png
+++ b/graphics/event_objects/pics/people/fisherman/4.png
diff --git a/graphics/map_objects/pics/people/fisherman/5.png b/graphics/event_objects/pics/people/fisherman/5.png
index 515f9c638..515f9c638 100644
--- a/graphics/map_objects/pics/people/fisherman/5.png
+++ b/graphics/event_objects/pics/people/fisherman/5.png
diff --git a/graphics/map_objects/pics/people/fisherman/6.png b/graphics/event_objects/pics/people/fisherman/6.png
index 83ea1ff57..83ea1ff57 100644
--- a/graphics/map_objects/pics/people/fisherman/6.png
+++ b/graphics/event_objects/pics/people/fisherman/6.png
diff --git a/graphics/map_objects/pics/people/fisherman/7.png b/graphics/event_objects/pics/people/fisherman/7.png
index 6f886b92e..6f886b92e 100644
--- a/graphics/map_objects/pics/people/fisherman/7.png
+++ b/graphics/event_objects/pics/people/fisherman/7.png
diff --git a/graphics/map_objects/pics/people/fisherman/8.png b/graphics/event_objects/pics/people/fisherman/8.png
index 26826b5e2..26826b5e2 100644
--- a/graphics/map_objects/pics/people/fisherman/8.png
+++ b/graphics/event_objects/pics/people/fisherman/8.png
diff --git a/graphics/map_objects/pics/people/flannery/0.png b/graphics/event_objects/pics/people/flannery/0.png
index 0c1fda0fe..0c1fda0fe 100644
--- a/graphics/map_objects/pics/people/flannery/0.png
+++ b/graphics/event_objects/pics/people/flannery/0.png
diff --git a/graphics/map_objects/pics/people/flannery/1.png b/graphics/event_objects/pics/people/flannery/1.png
index 17f6c4101..17f6c4101 100644
--- a/graphics/map_objects/pics/people/flannery/1.png
+++ b/graphics/event_objects/pics/people/flannery/1.png
diff --git a/graphics/map_objects/pics/people/flannery/2.png b/graphics/event_objects/pics/people/flannery/2.png
index 72e96c97d..72e96c97d 100644
--- a/graphics/map_objects/pics/people/flannery/2.png
+++ b/graphics/event_objects/pics/people/flannery/2.png
diff --git a/graphics/map_objects/pics/people/gentleman/0.png b/graphics/event_objects/pics/people/gentleman/0.png
index 356e5caa6..356e5caa6 100644
--- a/graphics/map_objects/pics/people/gentleman/0.png
+++ b/graphics/event_objects/pics/people/gentleman/0.png
diff --git a/graphics/map_objects/pics/people/gentleman/1.png b/graphics/event_objects/pics/people/gentleman/1.png
index dd615b27a..dd615b27a 100644
--- a/graphics/map_objects/pics/people/gentleman/1.png
+++ b/graphics/event_objects/pics/people/gentleman/1.png
diff --git a/graphics/map_objects/pics/people/gentleman/2.png b/graphics/event_objects/pics/people/gentleman/2.png
index 221a43b7b..221a43b7b 100644
--- a/graphics/map_objects/pics/people/gentleman/2.png
+++ b/graphics/event_objects/pics/people/gentleman/2.png
diff --git a/graphics/map_objects/pics/people/gentleman/3.png b/graphics/event_objects/pics/people/gentleman/3.png
index 0f262d088..0f262d088 100644
--- a/graphics/map_objects/pics/people/gentleman/3.png
+++ b/graphics/event_objects/pics/people/gentleman/3.png
diff --git a/graphics/map_objects/pics/people/gentleman/4.png b/graphics/event_objects/pics/people/gentleman/4.png
index 9d57f34cb..9d57f34cb 100644
--- a/graphics/map_objects/pics/people/gentleman/4.png
+++ b/graphics/event_objects/pics/people/gentleman/4.png
diff --git a/graphics/map_objects/pics/people/gentleman/5.png b/graphics/event_objects/pics/people/gentleman/5.png
index 78f7da03e..78f7da03e 100644
--- a/graphics/map_objects/pics/people/gentleman/5.png
+++ b/graphics/event_objects/pics/people/gentleman/5.png
diff --git a/graphics/map_objects/pics/people/gentleman/6.png b/graphics/event_objects/pics/people/gentleman/6.png
index 9aafe9f17..9aafe9f17 100644
--- a/graphics/map_objects/pics/people/gentleman/6.png
+++ b/graphics/event_objects/pics/people/gentleman/6.png
diff --git a/graphics/map_objects/pics/people/gentleman/7.png b/graphics/event_objects/pics/people/gentleman/7.png
index 56d80353d..56d80353d 100644
--- a/graphics/map_objects/pics/people/gentleman/7.png
+++ b/graphics/event_objects/pics/people/gentleman/7.png
diff --git a/graphics/map_objects/pics/people/gentleman/8.png b/graphics/event_objects/pics/people/gentleman/8.png
index d5571b4e8..d5571b4e8 100644
--- a/graphics/map_objects/pics/people/gentleman/8.png
+++ b/graphics/event_objects/pics/people/gentleman/8.png
diff --git a/graphics/map_objects/pics/people/girl_1/0.png b/graphics/event_objects/pics/people/girl_1/0.png
index 4b812ef41..4b812ef41 100644
--- a/graphics/map_objects/pics/people/girl_1/0.png
+++ b/graphics/event_objects/pics/people/girl_1/0.png
diff --git a/graphics/map_objects/pics/people/girl_1/1.png b/graphics/event_objects/pics/people/girl_1/1.png
index 3ec86b337..3ec86b337 100644
--- a/graphics/map_objects/pics/people/girl_1/1.png
+++ b/graphics/event_objects/pics/people/girl_1/1.png
diff --git a/graphics/map_objects/pics/people/girl_1/2.png b/graphics/event_objects/pics/people/girl_1/2.png
index 4bea7b7ca..4bea7b7ca 100644
--- a/graphics/map_objects/pics/people/girl_1/2.png
+++ b/graphics/event_objects/pics/people/girl_1/2.png
diff --git a/graphics/map_objects/pics/people/girl_1/3.png b/graphics/event_objects/pics/people/girl_1/3.png
index 06425c9eb..06425c9eb 100644
--- a/graphics/map_objects/pics/people/girl_1/3.png
+++ b/graphics/event_objects/pics/people/girl_1/3.png
diff --git a/graphics/map_objects/pics/people/girl_1/4.png b/graphics/event_objects/pics/people/girl_1/4.png
index fb940eadb..fb940eadb 100644
--- a/graphics/map_objects/pics/people/girl_1/4.png
+++ b/graphics/event_objects/pics/people/girl_1/4.png
diff --git a/graphics/map_objects/pics/people/girl_1/5.png b/graphics/event_objects/pics/people/girl_1/5.png
index 1bf4c2dc8..1bf4c2dc8 100644
--- a/graphics/map_objects/pics/people/girl_1/5.png
+++ b/graphics/event_objects/pics/people/girl_1/5.png
diff --git a/graphics/map_objects/pics/people/girl_1/6.png b/graphics/event_objects/pics/people/girl_1/6.png
index 256567cbf..256567cbf 100644
--- a/graphics/map_objects/pics/people/girl_1/6.png
+++ b/graphics/event_objects/pics/people/girl_1/6.png
diff --git a/graphics/map_objects/pics/people/girl_1/7.png b/graphics/event_objects/pics/people/girl_1/7.png
index 13bfe2af3..13bfe2af3 100644
--- a/graphics/map_objects/pics/people/girl_1/7.png
+++ b/graphics/event_objects/pics/people/girl_1/7.png
diff --git a/graphics/map_objects/pics/people/girl_1/8.png b/graphics/event_objects/pics/people/girl_1/8.png
index 5675d705d..5675d705d 100644
--- a/graphics/map_objects/pics/people/girl_1/8.png
+++ b/graphics/event_objects/pics/people/girl_1/8.png
diff --git a/graphics/map_objects/pics/people/girl_2/0.png b/graphics/event_objects/pics/people/girl_2/0.png
index 5f336f20f..5f336f20f 100644
--- a/graphics/map_objects/pics/people/girl_2/0.png
+++ b/graphics/event_objects/pics/people/girl_2/0.png
diff --git a/graphics/map_objects/pics/people/girl_2/1.png b/graphics/event_objects/pics/people/girl_2/1.png
index 3009e228c..3009e228c 100644
--- a/graphics/map_objects/pics/people/girl_2/1.png
+++ b/graphics/event_objects/pics/people/girl_2/1.png
diff --git a/graphics/map_objects/pics/people/girl_2/2.png b/graphics/event_objects/pics/people/girl_2/2.png
index 3f1c04b4b..3f1c04b4b 100644
--- a/graphics/map_objects/pics/people/girl_2/2.png
+++ b/graphics/event_objects/pics/people/girl_2/2.png
diff --git a/graphics/map_objects/pics/people/girl_2/3.png b/graphics/event_objects/pics/people/girl_2/3.png
index 4713b70dd..4713b70dd 100644
--- a/graphics/map_objects/pics/people/girl_2/3.png
+++ b/graphics/event_objects/pics/people/girl_2/3.png
diff --git a/graphics/map_objects/pics/people/girl_2/4.png b/graphics/event_objects/pics/people/girl_2/4.png
index 3a12aa48e..3a12aa48e 100644
--- a/graphics/map_objects/pics/people/girl_2/4.png
+++ b/graphics/event_objects/pics/people/girl_2/4.png
diff --git a/graphics/map_objects/pics/people/girl_2/5.png b/graphics/event_objects/pics/people/girl_2/5.png
index 885ee2de9..885ee2de9 100644
--- a/graphics/map_objects/pics/people/girl_2/5.png
+++ b/graphics/event_objects/pics/people/girl_2/5.png
diff --git a/graphics/map_objects/pics/people/girl_2/6.png b/graphics/event_objects/pics/people/girl_2/6.png
index 5ce644500..5ce644500 100644
--- a/graphics/map_objects/pics/people/girl_2/6.png
+++ b/graphics/event_objects/pics/people/girl_2/6.png
diff --git a/graphics/map_objects/pics/people/girl_2/7.png b/graphics/event_objects/pics/people/girl_2/7.png
index 28e8ed5a8..28e8ed5a8 100644
--- a/graphics/map_objects/pics/people/girl_2/7.png
+++ b/graphics/event_objects/pics/people/girl_2/7.png
diff --git a/graphics/map_objects/pics/people/girl_2/8.png b/graphics/event_objects/pics/people/girl_2/8.png
index e9b5e587e..e9b5e587e 100644
--- a/graphics/map_objects/pics/people/girl_2/8.png
+++ b/graphics/event_objects/pics/people/girl_2/8.png
diff --git a/graphics/map_objects/pics/people/girl_3/0.png b/graphics/event_objects/pics/people/girl_3/0.png
index 5927a264a..5927a264a 100644
--- a/graphics/map_objects/pics/people/girl_3/0.png
+++ b/graphics/event_objects/pics/people/girl_3/0.png
diff --git a/graphics/map_objects/pics/people/girl_3/1.png b/graphics/event_objects/pics/people/girl_3/1.png
index 6f3f32180..6f3f32180 100644
--- a/graphics/map_objects/pics/people/girl_3/1.png
+++ b/graphics/event_objects/pics/people/girl_3/1.png
diff --git a/graphics/map_objects/pics/people/girl_3/2.png b/graphics/event_objects/pics/people/girl_3/2.png
index 1a01b0031..1a01b0031 100644
--- a/graphics/map_objects/pics/people/girl_3/2.png
+++ b/graphics/event_objects/pics/people/girl_3/2.png
diff --git a/graphics/map_objects/pics/people/girl_3/3.png b/graphics/event_objects/pics/people/girl_3/3.png
index 2fb3db97b..2fb3db97b 100644
--- a/graphics/map_objects/pics/people/girl_3/3.png
+++ b/graphics/event_objects/pics/people/girl_3/3.png
diff --git a/graphics/map_objects/pics/people/girl_3/4.png b/graphics/event_objects/pics/people/girl_3/4.png
index 03287ab27..03287ab27 100644
--- a/graphics/map_objects/pics/people/girl_3/4.png
+++ b/graphics/event_objects/pics/people/girl_3/4.png
diff --git a/graphics/map_objects/pics/people/girl_3/5.png b/graphics/event_objects/pics/people/girl_3/5.png
index c30ead499..c30ead499 100644
--- a/graphics/map_objects/pics/people/girl_3/5.png
+++ b/graphics/event_objects/pics/people/girl_3/5.png
diff --git a/graphics/map_objects/pics/people/girl_3/6.png b/graphics/event_objects/pics/people/girl_3/6.png
index 10eb415ad..10eb415ad 100644
--- a/graphics/map_objects/pics/people/girl_3/6.png
+++ b/graphics/event_objects/pics/people/girl_3/6.png
diff --git a/graphics/map_objects/pics/people/girl_3/7.png b/graphics/event_objects/pics/people/girl_3/7.png
index 28fa0238b..28fa0238b 100644
--- a/graphics/map_objects/pics/people/girl_3/7.png
+++ b/graphics/event_objects/pics/people/girl_3/7.png
diff --git a/graphics/map_objects/pics/people/girl_3/8.png b/graphics/event_objects/pics/people/girl_3/8.png
index 8dc1a2fbc..8dc1a2fbc 100644
--- a/graphics/map_objects/pics/people/girl_3/8.png
+++ b/graphics/event_objects/pics/people/girl_3/8.png
diff --git a/graphics/map_objects/pics/people/glacia/0.png b/graphics/event_objects/pics/people/glacia/0.png
index 4ee3c3b3e..4ee3c3b3e 100644
--- a/graphics/map_objects/pics/people/glacia/0.png
+++ b/graphics/event_objects/pics/people/glacia/0.png
diff --git a/graphics/map_objects/pics/people/glacia/1.png b/graphics/event_objects/pics/people/glacia/1.png
index 866937df3..866937df3 100644
--- a/graphics/map_objects/pics/people/glacia/1.png
+++ b/graphics/event_objects/pics/people/glacia/1.png
diff --git a/graphics/map_objects/pics/people/glacia/2.png b/graphics/event_objects/pics/people/glacia/2.png
index 5d66ef03e..5d66ef03e 100644
--- a/graphics/map_objects/pics/people/glacia/2.png
+++ b/graphics/event_objects/pics/people/glacia/2.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/0.png b/graphics/event_objects/pics/people/hex_maniac/0.png
index da93178a0..da93178a0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/0.png
+++ b/graphics/event_objects/pics/people/hex_maniac/0.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/1.png b/graphics/event_objects/pics/people/hex_maniac/1.png
index 7925ac221..7925ac221 100644
--- a/graphics/map_objects/pics/people/hex_maniac/1.png
+++ b/graphics/event_objects/pics/people/hex_maniac/1.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/2.png b/graphics/event_objects/pics/people/hex_maniac/2.png
index 24598f0b0..24598f0b0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/2.png
+++ b/graphics/event_objects/pics/people/hex_maniac/2.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/3.png b/graphics/event_objects/pics/people/hex_maniac/3.png
index c3544aac1..c3544aac1 100644
--- a/graphics/map_objects/pics/people/hex_maniac/3.png
+++ b/graphics/event_objects/pics/people/hex_maniac/3.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/4.png b/graphics/event_objects/pics/people/hex_maniac/4.png
index f07338c7a..f07338c7a 100644
--- a/graphics/map_objects/pics/people/hex_maniac/4.png
+++ b/graphics/event_objects/pics/people/hex_maniac/4.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/5.png b/graphics/event_objects/pics/people/hex_maniac/5.png
index 925d6ccf9..925d6ccf9 100644
--- a/graphics/map_objects/pics/people/hex_maniac/5.png
+++ b/graphics/event_objects/pics/people/hex_maniac/5.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/6.png b/graphics/event_objects/pics/people/hex_maniac/6.png
index a41a7a72b..a41a7a72b 100644
--- a/graphics/map_objects/pics/people/hex_maniac/6.png
+++ b/graphics/event_objects/pics/people/hex_maniac/6.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/7.png b/graphics/event_objects/pics/people/hex_maniac/7.png
index 06bfa10d0..06bfa10d0 100644
--- a/graphics/map_objects/pics/people/hex_maniac/7.png
+++ b/graphics/event_objects/pics/people/hex_maniac/7.png
diff --git a/graphics/map_objects/pics/people/hex_maniac/8.png b/graphics/event_objects/pics/people/hex_maniac/8.png
index 1c3a57faf..1c3a57faf 100644
--- a/graphics/map_objects/pics/people/hex_maniac/8.png
+++ b/graphics/event_objects/pics/people/hex_maniac/8.png
diff --git a/graphics/map_objects/pics/people/hiker/0.png b/graphics/event_objects/pics/people/hiker/0.png
index 715cdc4f9..715cdc4f9 100644
--- a/graphics/map_objects/pics/people/hiker/0.png
+++ b/graphics/event_objects/pics/people/hiker/0.png
diff --git a/graphics/map_objects/pics/people/hiker/1.png b/graphics/event_objects/pics/people/hiker/1.png
index 7af8fb736..7af8fb736 100644
--- a/graphics/map_objects/pics/people/hiker/1.png
+++ b/graphics/event_objects/pics/people/hiker/1.png
diff --git a/graphics/map_objects/pics/people/hiker/2.png b/graphics/event_objects/pics/people/hiker/2.png
index 2b74ec3db..2b74ec3db 100644
--- a/graphics/map_objects/pics/people/hiker/2.png
+++ b/graphics/event_objects/pics/people/hiker/2.png
diff --git a/graphics/map_objects/pics/people/hiker/3.png b/graphics/event_objects/pics/people/hiker/3.png
index a7e0d91d5..a7e0d91d5 100644
--- a/graphics/map_objects/pics/people/hiker/3.png
+++ b/graphics/event_objects/pics/people/hiker/3.png
diff --git a/graphics/map_objects/pics/people/hiker/4.png b/graphics/event_objects/pics/people/hiker/4.png
index d0bb9fa9d..d0bb9fa9d 100644
--- a/graphics/map_objects/pics/people/hiker/4.png
+++ b/graphics/event_objects/pics/people/hiker/4.png
diff --git a/graphics/map_objects/pics/people/hiker/5.png b/graphics/event_objects/pics/people/hiker/5.png
index b405de51b..b405de51b 100644
--- a/graphics/map_objects/pics/people/hiker/5.png
+++ b/graphics/event_objects/pics/people/hiker/5.png
diff --git a/graphics/map_objects/pics/people/hiker/6.png b/graphics/event_objects/pics/people/hiker/6.png
index 7271f7d4d..7271f7d4d 100644
--- a/graphics/map_objects/pics/people/hiker/6.png
+++ b/graphics/event_objects/pics/people/hiker/6.png
diff --git a/graphics/map_objects/pics/people/hiker/7.png b/graphics/event_objects/pics/people/hiker/7.png
index 36db0a370..36db0a370 100644
--- a/graphics/map_objects/pics/people/hiker/7.png
+++ b/graphics/event_objects/pics/people/hiker/7.png
diff --git a/graphics/map_objects/pics/people/hiker/8.png b/graphics/event_objects/pics/people/hiker/8.png
index dbcfd8c41..dbcfd8c41 100644
--- a/graphics/map_objects/pics/people/hiker/8.png
+++ b/graphics/event_objects/pics/people/hiker/8.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png
index abb6cca16..abb6cca16 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/0.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/0.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png
index e45ab1ac4..e45ab1ac4 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/1.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/1.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png
index f5b9364b1..f5b9364b1 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/2.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/2.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png
index 8bd8dc9fb..8bd8dc9fb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/3.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/3.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png
index 8bd8dc9fb..8bd8dc9fb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/4.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/4.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png
index ee043baeb..ee043baeb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/5.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/5.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png
index ee043baeb..ee043baeb 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/6.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/6.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png
index f1498d71f..f1498d71f 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/7.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/7.png
diff --git a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png
index f1498d71f..f1498d71f 100644
--- a/graphics/map_objects/pics/people/hot_springs_old_woman/8.png
+++ b/graphics/event_objects/pics/people/hot_springs_old_woman/8.png
diff --git a/graphics/map_objects/pics/people/lass/0.png b/graphics/event_objects/pics/people/lass/0.png
index 602f557c7..602f557c7 100644
--- a/graphics/map_objects/pics/people/lass/0.png
+++ b/graphics/event_objects/pics/people/lass/0.png
diff --git a/graphics/map_objects/pics/people/lass/1.png b/graphics/event_objects/pics/people/lass/1.png
index c11380b4a..c11380b4a 100644
--- a/graphics/map_objects/pics/people/lass/1.png
+++ b/graphics/event_objects/pics/people/lass/1.png
diff --git a/graphics/map_objects/pics/people/lass/2.png b/graphics/event_objects/pics/people/lass/2.png
index 887cc834b..887cc834b 100644
--- a/graphics/map_objects/pics/people/lass/2.png
+++ b/graphics/event_objects/pics/people/lass/2.png
diff --git a/graphics/map_objects/pics/people/lass/3.png b/graphics/event_objects/pics/people/lass/3.png
index 510d0812c..510d0812c 100644
--- a/graphics/map_objects/pics/people/lass/3.png
+++ b/graphics/event_objects/pics/people/lass/3.png
diff --git a/graphics/map_objects/pics/people/lass/4.png b/graphics/event_objects/pics/people/lass/4.png
index 8929a426b..8929a426b 100644
--- a/graphics/map_objects/pics/people/lass/4.png
+++ b/graphics/event_objects/pics/people/lass/4.png
diff --git a/graphics/map_objects/pics/people/lass/5.png b/graphics/event_objects/pics/people/lass/5.png
index da422040c..da422040c 100644
--- a/graphics/map_objects/pics/people/lass/5.png
+++ b/graphics/event_objects/pics/people/lass/5.png
diff --git a/graphics/map_objects/pics/people/lass/6.png b/graphics/event_objects/pics/people/lass/6.png
index c9235c9aa..c9235c9aa 100644
--- a/graphics/map_objects/pics/people/lass/6.png
+++ b/graphics/event_objects/pics/people/lass/6.png
diff --git a/graphics/map_objects/pics/people/lass/7.png b/graphics/event_objects/pics/people/lass/7.png
index 1adfcd0ba..1adfcd0ba 100644
--- a/graphics/map_objects/pics/people/lass/7.png
+++ b/graphics/event_objects/pics/people/lass/7.png
diff --git a/graphics/map_objects/pics/people/lass/8.png b/graphics/event_objects/pics/people/lass/8.png
index 392d65f93..392d65f93 100644
--- a/graphics/map_objects/pics/people/lass/8.png
+++ b/graphics/event_objects/pics/people/lass/8.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/0.png b/graphics/event_objects/pics/people/little_boy_1/0.png
index b96c644fb..b96c644fb 100644
--- a/graphics/map_objects/pics/people/little_boy_1/0.png
+++ b/graphics/event_objects/pics/people/little_boy_1/0.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/1.png b/graphics/event_objects/pics/people/little_boy_1/1.png
index 01f7f13d0..01f7f13d0 100644
--- a/graphics/map_objects/pics/people/little_boy_1/1.png
+++ b/graphics/event_objects/pics/people/little_boy_1/1.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/2.png b/graphics/event_objects/pics/people/little_boy_1/2.png
index e080899f6..e080899f6 100644
--- a/graphics/map_objects/pics/people/little_boy_1/2.png
+++ b/graphics/event_objects/pics/people/little_boy_1/2.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/3.png b/graphics/event_objects/pics/people/little_boy_1/3.png
index 08dbedbff..08dbedbff 100644
--- a/graphics/map_objects/pics/people/little_boy_1/3.png
+++ b/graphics/event_objects/pics/people/little_boy_1/3.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/4.png b/graphics/event_objects/pics/people/little_boy_1/4.png
index ed0f1c791..ed0f1c791 100644
--- a/graphics/map_objects/pics/people/little_boy_1/4.png
+++ b/graphics/event_objects/pics/people/little_boy_1/4.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/5.png b/graphics/event_objects/pics/people/little_boy_1/5.png
index 761263392..761263392 100644
--- a/graphics/map_objects/pics/people/little_boy_1/5.png
+++ b/graphics/event_objects/pics/people/little_boy_1/5.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/6.png b/graphics/event_objects/pics/people/little_boy_1/6.png
index f8d72807f..f8d72807f 100644
--- a/graphics/map_objects/pics/people/little_boy_1/6.png
+++ b/graphics/event_objects/pics/people/little_boy_1/6.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/7.png b/graphics/event_objects/pics/people/little_boy_1/7.png
index 0f7c16ebb..0f7c16ebb 100644
--- a/graphics/map_objects/pics/people/little_boy_1/7.png
+++ b/graphics/event_objects/pics/people/little_boy_1/7.png
diff --git a/graphics/map_objects/pics/people/little_boy_1/8.png b/graphics/event_objects/pics/people/little_boy_1/8.png
index b3df6d38a..b3df6d38a 100644
--- a/graphics/map_objects/pics/people/little_boy_1/8.png
+++ b/graphics/event_objects/pics/people/little_boy_1/8.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/0.png b/graphics/event_objects/pics/people/little_boy_2/0.png
index 1cb5472fc..1cb5472fc 100644
--- a/graphics/map_objects/pics/people/little_boy_2/0.png
+++ b/graphics/event_objects/pics/people/little_boy_2/0.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/1.png b/graphics/event_objects/pics/people/little_boy_2/1.png
index 235933d0a..235933d0a 100644
--- a/graphics/map_objects/pics/people/little_boy_2/1.png
+++ b/graphics/event_objects/pics/people/little_boy_2/1.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/2.png b/graphics/event_objects/pics/people/little_boy_2/2.png
index ced688956..ced688956 100644
--- a/graphics/map_objects/pics/people/little_boy_2/2.png
+++ b/graphics/event_objects/pics/people/little_boy_2/2.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/3.png b/graphics/event_objects/pics/people/little_boy_2/3.png
index 8c743b2a3..8c743b2a3 100644
--- a/graphics/map_objects/pics/people/little_boy_2/3.png
+++ b/graphics/event_objects/pics/people/little_boy_2/3.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/4.png b/graphics/event_objects/pics/people/little_boy_2/4.png
index 7af7cdbaa..7af7cdbaa 100644
--- a/graphics/map_objects/pics/people/little_boy_2/4.png
+++ b/graphics/event_objects/pics/people/little_boy_2/4.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/5.png b/graphics/event_objects/pics/people/little_boy_2/5.png
index 1db5b13ba..1db5b13ba 100644
--- a/graphics/map_objects/pics/people/little_boy_2/5.png
+++ b/graphics/event_objects/pics/people/little_boy_2/5.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/6.png b/graphics/event_objects/pics/people/little_boy_2/6.png
index 00633ff85..00633ff85 100644
--- a/graphics/map_objects/pics/people/little_boy_2/6.png
+++ b/graphics/event_objects/pics/people/little_boy_2/6.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/7.png b/graphics/event_objects/pics/people/little_boy_2/7.png
index ac2697065..ac2697065 100644
--- a/graphics/map_objects/pics/people/little_boy_2/7.png
+++ b/graphics/event_objects/pics/people/little_boy_2/7.png
diff --git a/graphics/map_objects/pics/people/little_boy_2/8.png b/graphics/event_objects/pics/people/little_boy_2/8.png
index fd02ff7a6..fd02ff7a6 100644
--- a/graphics/map_objects/pics/people/little_boy_2/8.png
+++ b/graphics/event_objects/pics/people/little_boy_2/8.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/0.png b/graphics/event_objects/pics/people/little_boy_3/0.png
index fb4365f0e..fb4365f0e 100644
--- a/graphics/map_objects/pics/people/little_boy_3/0.png
+++ b/graphics/event_objects/pics/people/little_boy_3/0.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/1.png b/graphics/event_objects/pics/people/little_boy_3/1.png
index f681154dd..f681154dd 100644
--- a/graphics/map_objects/pics/people/little_boy_3/1.png
+++ b/graphics/event_objects/pics/people/little_boy_3/1.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/2.png b/graphics/event_objects/pics/people/little_boy_3/2.png
index 20f838bb2..20f838bb2 100644
--- a/graphics/map_objects/pics/people/little_boy_3/2.png
+++ b/graphics/event_objects/pics/people/little_boy_3/2.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/3.png b/graphics/event_objects/pics/people/little_boy_3/3.png
index 4a83b0c97..4a83b0c97 100644
--- a/graphics/map_objects/pics/people/little_boy_3/3.png
+++ b/graphics/event_objects/pics/people/little_boy_3/3.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/4.png b/graphics/event_objects/pics/people/little_boy_3/4.png
index b6573d454..b6573d454 100644
--- a/graphics/map_objects/pics/people/little_boy_3/4.png
+++ b/graphics/event_objects/pics/people/little_boy_3/4.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/5.png b/graphics/event_objects/pics/people/little_boy_3/5.png
index a1a9b08cf..a1a9b08cf 100644
--- a/graphics/map_objects/pics/people/little_boy_3/5.png
+++ b/graphics/event_objects/pics/people/little_boy_3/5.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/6.png b/graphics/event_objects/pics/people/little_boy_3/6.png
index 8f34c74e4..8f34c74e4 100644
--- a/graphics/map_objects/pics/people/little_boy_3/6.png
+++ b/graphics/event_objects/pics/people/little_boy_3/6.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/7.png b/graphics/event_objects/pics/people/little_boy_3/7.png
index 7d8d2c23c..7d8d2c23c 100644
--- a/graphics/map_objects/pics/people/little_boy_3/7.png
+++ b/graphics/event_objects/pics/people/little_boy_3/7.png
diff --git a/graphics/map_objects/pics/people/little_boy_3/8.png b/graphics/event_objects/pics/people/little_boy_3/8.png
index 4799db90c..4799db90c 100644
--- a/graphics/map_objects/pics/people/little_boy_3/8.png
+++ b/graphics/event_objects/pics/people/little_boy_3/8.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/0.png b/graphics/event_objects/pics/people/little_girl_1/0.png
index a4954285b..a4954285b 100644
--- a/graphics/map_objects/pics/people/little_girl_1/0.png
+++ b/graphics/event_objects/pics/people/little_girl_1/0.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/1.png b/graphics/event_objects/pics/people/little_girl_1/1.png
index 0c6b9d411..0c6b9d411 100644
--- a/graphics/map_objects/pics/people/little_girl_1/1.png
+++ b/graphics/event_objects/pics/people/little_girl_1/1.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/2.png b/graphics/event_objects/pics/people/little_girl_1/2.png
index 6e3b1e77d..6e3b1e77d 100644
--- a/graphics/map_objects/pics/people/little_girl_1/2.png
+++ b/graphics/event_objects/pics/people/little_girl_1/2.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/3.png b/graphics/event_objects/pics/people/little_girl_1/3.png
index b680b277a..b680b277a 100644
--- a/graphics/map_objects/pics/people/little_girl_1/3.png
+++ b/graphics/event_objects/pics/people/little_girl_1/3.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/4.png b/graphics/event_objects/pics/people/little_girl_1/4.png
index 3211eecbb..3211eecbb 100644
--- a/graphics/map_objects/pics/people/little_girl_1/4.png
+++ b/graphics/event_objects/pics/people/little_girl_1/4.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/5.png b/graphics/event_objects/pics/people/little_girl_1/5.png
index 182a1a416..182a1a416 100644
--- a/graphics/map_objects/pics/people/little_girl_1/5.png
+++ b/graphics/event_objects/pics/people/little_girl_1/5.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/6.png b/graphics/event_objects/pics/people/little_girl_1/6.png
index 1b0daa637..1b0daa637 100644
--- a/graphics/map_objects/pics/people/little_girl_1/6.png
+++ b/graphics/event_objects/pics/people/little_girl_1/6.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/7.png b/graphics/event_objects/pics/people/little_girl_1/7.png
index f91406654..f91406654 100644
--- a/graphics/map_objects/pics/people/little_girl_1/7.png
+++ b/graphics/event_objects/pics/people/little_girl_1/7.png
diff --git a/graphics/map_objects/pics/people/little_girl_1/8.png b/graphics/event_objects/pics/people/little_girl_1/8.png
index 5c5bcbc2a..5c5bcbc2a 100644
--- a/graphics/map_objects/pics/people/little_girl_1/8.png
+++ b/graphics/event_objects/pics/people/little_girl_1/8.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/0.png b/graphics/event_objects/pics/people/little_girl_2/0.png
index fadfdad57..fadfdad57 100644
--- a/graphics/map_objects/pics/people/little_girl_2/0.png
+++ b/graphics/event_objects/pics/people/little_girl_2/0.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/1.png b/graphics/event_objects/pics/people/little_girl_2/1.png
index df2b66187..df2b66187 100644
--- a/graphics/map_objects/pics/people/little_girl_2/1.png
+++ b/graphics/event_objects/pics/people/little_girl_2/1.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/2.png b/graphics/event_objects/pics/people/little_girl_2/2.png
index ac49cae9f..ac49cae9f 100644
--- a/graphics/map_objects/pics/people/little_girl_2/2.png
+++ b/graphics/event_objects/pics/people/little_girl_2/2.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/3.png b/graphics/event_objects/pics/people/little_girl_2/3.png
index 869c4a1b3..869c4a1b3 100644
--- a/graphics/map_objects/pics/people/little_girl_2/3.png
+++ b/graphics/event_objects/pics/people/little_girl_2/3.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/4.png b/graphics/event_objects/pics/people/little_girl_2/4.png
index b92551f18..b92551f18 100644
--- a/graphics/map_objects/pics/people/little_girl_2/4.png
+++ b/graphics/event_objects/pics/people/little_girl_2/4.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/5.png b/graphics/event_objects/pics/people/little_girl_2/5.png
index 778a644f2..778a644f2 100644
--- a/graphics/map_objects/pics/people/little_girl_2/5.png
+++ b/graphics/event_objects/pics/people/little_girl_2/5.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/6.png b/graphics/event_objects/pics/people/little_girl_2/6.png
index 1ca242176..1ca242176 100644
--- a/graphics/map_objects/pics/people/little_girl_2/6.png
+++ b/graphics/event_objects/pics/people/little_girl_2/6.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/7.png b/graphics/event_objects/pics/people/little_girl_2/7.png
index d71a37cec..d71a37cec 100644
--- a/graphics/map_objects/pics/people/little_girl_2/7.png
+++ b/graphics/event_objects/pics/people/little_girl_2/7.png
diff --git a/graphics/map_objects/pics/people/little_girl_2/8.png b/graphics/event_objects/pics/people/little_girl_2/8.png
index dd76b53e0..dd76b53e0 100644
--- a/graphics/map_objects/pics/people/little_girl_2/8.png
+++ b/graphics/event_objects/pics/people/little_girl_2/8.png
diff --git a/graphics/map_objects/pics/people/liza/0.png b/graphics/event_objects/pics/people/liza/0.png
index e85ea4c5b..e85ea4c5b 100644
--- a/graphics/map_objects/pics/people/liza/0.png
+++ b/graphics/event_objects/pics/people/liza/0.png
diff --git a/graphics/map_objects/pics/people/liza/1.png b/graphics/event_objects/pics/people/liza/1.png
index dd7c4b2a6..dd7c4b2a6 100644
--- a/graphics/map_objects/pics/people/liza/1.png
+++ b/graphics/event_objects/pics/people/liza/1.png
diff --git a/graphics/map_objects/pics/people/liza/2.png b/graphics/event_objects/pics/people/liza/2.png
index 96b4628fa..96b4628fa 100644
--- a/graphics/map_objects/pics/people/liza/2.png
+++ b/graphics/event_objects/pics/people/liza/2.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/0.png b/graphics/event_objects/pics/people/magma_member_f/0.png
index 2fe38a59e..2fe38a59e 100644
--- a/graphics/map_objects/pics/people/magma_member_f/0.png
+++ b/graphics/event_objects/pics/people/magma_member_f/0.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/1.png b/graphics/event_objects/pics/people/magma_member_f/1.png
index ee9260cfe..ee9260cfe 100644
--- a/graphics/map_objects/pics/people/magma_member_f/1.png
+++ b/graphics/event_objects/pics/people/magma_member_f/1.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/2.png b/graphics/event_objects/pics/people/magma_member_f/2.png
index 13e1d048a..13e1d048a 100644
--- a/graphics/map_objects/pics/people/magma_member_f/2.png
+++ b/graphics/event_objects/pics/people/magma_member_f/2.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/3.png b/graphics/event_objects/pics/people/magma_member_f/3.png
index d18d04f62..d18d04f62 100644
--- a/graphics/map_objects/pics/people/magma_member_f/3.png
+++ b/graphics/event_objects/pics/people/magma_member_f/3.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/4.png b/graphics/event_objects/pics/people/magma_member_f/4.png
index 27919c026..27919c026 100644
--- a/graphics/map_objects/pics/people/magma_member_f/4.png
+++ b/graphics/event_objects/pics/people/magma_member_f/4.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/5.png b/graphics/event_objects/pics/people/magma_member_f/5.png
index 62ae28188..62ae28188 100644
--- a/graphics/map_objects/pics/people/magma_member_f/5.png
+++ b/graphics/event_objects/pics/people/magma_member_f/5.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/6.png b/graphics/event_objects/pics/people/magma_member_f/6.png
index 660b48874..660b48874 100644
--- a/graphics/map_objects/pics/people/magma_member_f/6.png
+++ b/graphics/event_objects/pics/people/magma_member_f/6.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/7.png b/graphics/event_objects/pics/people/magma_member_f/7.png
index f641b9b4c..f641b9b4c 100644
--- a/graphics/map_objects/pics/people/magma_member_f/7.png
+++ b/graphics/event_objects/pics/people/magma_member_f/7.png
diff --git a/graphics/map_objects/pics/people/magma_member_f/8.png b/graphics/event_objects/pics/people/magma_member_f/8.png
index fb149e752..fb149e752 100644
--- a/graphics/map_objects/pics/people/magma_member_f/8.png
+++ b/graphics/event_objects/pics/people/magma_member_f/8.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/0.png b/graphics/event_objects/pics/people/magma_member_m/0.png
index 99cae3300..99cae3300 100644
--- a/graphics/map_objects/pics/people/magma_member_m/0.png
+++ b/graphics/event_objects/pics/people/magma_member_m/0.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/1.png b/graphics/event_objects/pics/people/magma_member_m/1.png
index 95e1c2f54..95e1c2f54 100644
--- a/graphics/map_objects/pics/people/magma_member_m/1.png
+++ b/graphics/event_objects/pics/people/magma_member_m/1.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/2.png b/graphics/event_objects/pics/people/magma_member_m/2.png
index 48b8a3647..48b8a3647 100644
--- a/graphics/map_objects/pics/people/magma_member_m/2.png
+++ b/graphics/event_objects/pics/people/magma_member_m/2.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/3.png b/graphics/event_objects/pics/people/magma_member_m/3.png
index ffa6f9b05..ffa6f9b05 100644
--- a/graphics/map_objects/pics/people/magma_member_m/3.png
+++ b/graphics/event_objects/pics/people/magma_member_m/3.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/4.png b/graphics/event_objects/pics/people/magma_member_m/4.png
index 16b756d19..16b756d19 100644
--- a/graphics/map_objects/pics/people/magma_member_m/4.png
+++ b/graphics/event_objects/pics/people/magma_member_m/4.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/5.png b/graphics/event_objects/pics/people/magma_member_m/5.png
index 6702f5442..6702f5442 100644
--- a/graphics/map_objects/pics/people/magma_member_m/5.png
+++ b/graphics/event_objects/pics/people/magma_member_m/5.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/6.png b/graphics/event_objects/pics/people/magma_member_m/6.png
index 4d344f8a9..4d344f8a9 100644
--- a/graphics/map_objects/pics/people/magma_member_m/6.png
+++ b/graphics/event_objects/pics/people/magma_member_m/6.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/7.png b/graphics/event_objects/pics/people/magma_member_m/7.png
index 2637b84ea..2637b84ea 100644
--- a/graphics/map_objects/pics/people/magma_member_m/7.png
+++ b/graphics/event_objects/pics/people/magma_member_m/7.png
diff --git a/graphics/map_objects/pics/people/magma_member_m/8.png b/graphics/event_objects/pics/people/magma_member_m/8.png
index b036d898b..b036d898b 100644
--- a/graphics/map_objects/pics/people/magma_member_m/8.png
+++ b/graphics/event_objects/pics/people/magma_member_m/8.png
diff --git a/graphics/map_objects/pics/people/man_1/0.png b/graphics/event_objects/pics/people/man_1/0.png
index 28e2f2b27..28e2f2b27 100644
--- a/graphics/map_objects/pics/people/man_1/0.png
+++ b/graphics/event_objects/pics/people/man_1/0.png
diff --git a/graphics/map_objects/pics/people/man_1/1.png b/graphics/event_objects/pics/people/man_1/1.png
index 0fc4824a3..0fc4824a3 100644
--- a/graphics/map_objects/pics/people/man_1/1.png
+++ b/graphics/event_objects/pics/people/man_1/1.png
diff --git a/graphics/map_objects/pics/people/man_1/2.png b/graphics/event_objects/pics/people/man_1/2.png
index ea35dbd1a..ea35dbd1a 100644
--- a/graphics/map_objects/pics/people/man_1/2.png
+++ b/graphics/event_objects/pics/people/man_1/2.png
diff --git a/graphics/map_objects/pics/people/man_1/3.png b/graphics/event_objects/pics/people/man_1/3.png
index d5c95f938..d5c95f938 100644
--- a/graphics/map_objects/pics/people/man_1/3.png
+++ b/graphics/event_objects/pics/people/man_1/3.png
diff --git a/graphics/map_objects/pics/people/man_1/4.png b/graphics/event_objects/pics/people/man_1/4.png
index 5903808ed..5903808ed 100644
--- a/graphics/map_objects/pics/people/man_1/4.png
+++ b/graphics/event_objects/pics/people/man_1/4.png
diff --git a/graphics/map_objects/pics/people/man_1/5.png b/graphics/event_objects/pics/people/man_1/5.png
index 5923e998d..5923e998d 100644
--- a/graphics/map_objects/pics/people/man_1/5.png
+++ b/graphics/event_objects/pics/people/man_1/5.png
diff --git a/graphics/map_objects/pics/people/man_1/6.png b/graphics/event_objects/pics/people/man_1/6.png
index 34f2c1d59..34f2c1d59 100644
--- a/graphics/map_objects/pics/people/man_1/6.png
+++ b/graphics/event_objects/pics/people/man_1/6.png
diff --git a/graphics/map_objects/pics/people/man_1/7.png b/graphics/event_objects/pics/people/man_1/7.png
index 9a7d59234..9a7d59234 100644
--- a/graphics/map_objects/pics/people/man_1/7.png
+++ b/graphics/event_objects/pics/people/man_1/7.png
diff --git a/graphics/map_objects/pics/people/man_1/8.png b/graphics/event_objects/pics/people/man_1/8.png
index 191bfbf85..191bfbf85 100644
--- a/graphics/map_objects/pics/people/man_1/8.png
+++ b/graphics/event_objects/pics/people/man_1/8.png
diff --git a/graphics/map_objects/pics/people/man_2/0.png b/graphics/event_objects/pics/people/man_2/0.png
index d8ef35173..d8ef35173 100644
--- a/graphics/map_objects/pics/people/man_2/0.png
+++ b/graphics/event_objects/pics/people/man_2/0.png
diff --git a/graphics/map_objects/pics/people/man_2/1.png b/graphics/event_objects/pics/people/man_2/1.png
index 63122436d..63122436d 100644
--- a/graphics/map_objects/pics/people/man_2/1.png
+++ b/graphics/event_objects/pics/people/man_2/1.png
diff --git a/graphics/map_objects/pics/people/man_2/2.png b/graphics/event_objects/pics/people/man_2/2.png
index 16471c084..16471c084 100644
--- a/graphics/map_objects/pics/people/man_2/2.png
+++ b/graphics/event_objects/pics/people/man_2/2.png
diff --git a/graphics/map_objects/pics/people/man_2/3.png b/graphics/event_objects/pics/people/man_2/3.png
index 9b11950ac..9b11950ac 100644
--- a/graphics/map_objects/pics/people/man_2/3.png
+++ b/graphics/event_objects/pics/people/man_2/3.png
diff --git a/graphics/map_objects/pics/people/man_2/4.png b/graphics/event_objects/pics/people/man_2/4.png
index 0fec0c524..0fec0c524 100644
--- a/graphics/map_objects/pics/people/man_2/4.png
+++ b/graphics/event_objects/pics/people/man_2/4.png
diff --git a/graphics/map_objects/pics/people/man_2/5.png b/graphics/event_objects/pics/people/man_2/5.png
index 6365daab3..6365daab3 100644
--- a/graphics/map_objects/pics/people/man_2/5.png
+++ b/graphics/event_objects/pics/people/man_2/5.png
diff --git a/graphics/map_objects/pics/people/man_2/6.png b/graphics/event_objects/pics/people/man_2/6.png
index f3d2db78a..f3d2db78a 100644
--- a/graphics/map_objects/pics/people/man_2/6.png
+++ b/graphics/event_objects/pics/people/man_2/6.png
diff --git a/graphics/map_objects/pics/people/man_2/7.png b/graphics/event_objects/pics/people/man_2/7.png
index 710afb6ab..710afb6ab 100644
--- a/graphics/map_objects/pics/people/man_2/7.png
+++ b/graphics/event_objects/pics/people/man_2/7.png
diff --git a/graphics/map_objects/pics/people/man_2/8.png b/graphics/event_objects/pics/people/man_2/8.png
index 3deb37967..3deb37967 100644
--- a/graphics/map_objects/pics/people/man_2/8.png
+++ b/graphics/event_objects/pics/people/man_2/8.png
diff --git a/graphics/map_objects/pics/people/man_3/0.png b/graphics/event_objects/pics/people/man_3/0.png
index 073e015f7..073e015f7 100644
--- a/graphics/map_objects/pics/people/man_3/0.png
+++ b/graphics/event_objects/pics/people/man_3/0.png
diff --git a/graphics/map_objects/pics/people/man_3/1.png b/graphics/event_objects/pics/people/man_3/1.png
index c0762c7ff..c0762c7ff 100644
--- a/graphics/map_objects/pics/people/man_3/1.png
+++ b/graphics/event_objects/pics/people/man_3/1.png
diff --git a/graphics/map_objects/pics/people/man_3/2.png b/graphics/event_objects/pics/people/man_3/2.png
index 21608c48a..21608c48a 100644
--- a/graphics/map_objects/pics/people/man_3/2.png
+++ b/graphics/event_objects/pics/people/man_3/2.png
diff --git a/graphics/map_objects/pics/people/man_3/3.png b/graphics/event_objects/pics/people/man_3/3.png
index 85b6765b0..85b6765b0 100644
--- a/graphics/map_objects/pics/people/man_3/3.png
+++ b/graphics/event_objects/pics/people/man_3/3.png
diff --git a/graphics/map_objects/pics/people/man_3/4.png b/graphics/event_objects/pics/people/man_3/4.png
index e47dbe0fe..e47dbe0fe 100644
--- a/graphics/map_objects/pics/people/man_3/4.png
+++ b/graphics/event_objects/pics/people/man_3/4.png
diff --git a/graphics/map_objects/pics/people/man_3/5.png b/graphics/event_objects/pics/people/man_3/5.png
index 9f30a6dad..9f30a6dad 100644
--- a/graphics/map_objects/pics/people/man_3/5.png
+++ b/graphics/event_objects/pics/people/man_3/5.png
diff --git a/graphics/map_objects/pics/people/man_3/6.png b/graphics/event_objects/pics/people/man_3/6.png
index 3f6144f1a..3f6144f1a 100644
--- a/graphics/map_objects/pics/people/man_3/6.png
+++ b/graphics/event_objects/pics/people/man_3/6.png
diff --git a/graphics/map_objects/pics/people/man_3/7.png b/graphics/event_objects/pics/people/man_3/7.png
index e70347dce..e70347dce 100644
--- a/graphics/map_objects/pics/people/man_3/7.png
+++ b/graphics/event_objects/pics/people/man_3/7.png
diff --git a/graphics/map_objects/pics/people/man_3/8.png b/graphics/event_objects/pics/people/man_3/8.png
index 274a02280..274a02280 100644
--- a/graphics/map_objects/pics/people/man_3/8.png
+++ b/graphics/event_objects/pics/people/man_3/8.png
diff --git a/graphics/map_objects/pics/people/man_4/0.png b/graphics/event_objects/pics/people/man_4/0.png
index 0297b592c..0297b592c 100644
--- a/graphics/map_objects/pics/people/man_4/0.png
+++ b/graphics/event_objects/pics/people/man_4/0.png
diff --git a/graphics/map_objects/pics/people/man_4/1.png b/graphics/event_objects/pics/people/man_4/1.png
index d73e6ed5c..d73e6ed5c 100644
--- a/graphics/map_objects/pics/people/man_4/1.png
+++ b/graphics/event_objects/pics/people/man_4/1.png
diff --git a/graphics/map_objects/pics/people/man_4/2.png b/graphics/event_objects/pics/people/man_4/2.png
index 6cd7f5798..6cd7f5798 100644
--- a/graphics/map_objects/pics/people/man_4/2.png
+++ b/graphics/event_objects/pics/people/man_4/2.png
diff --git a/graphics/map_objects/pics/people/man_4/3.png b/graphics/event_objects/pics/people/man_4/3.png
index 2486efd7f..2486efd7f 100644
--- a/graphics/map_objects/pics/people/man_4/3.png
+++ b/graphics/event_objects/pics/people/man_4/3.png
diff --git a/graphics/map_objects/pics/people/man_4/4.png b/graphics/event_objects/pics/people/man_4/4.png
index 732ff9c8d..732ff9c8d 100644
--- a/graphics/map_objects/pics/people/man_4/4.png
+++ b/graphics/event_objects/pics/people/man_4/4.png
diff --git a/graphics/map_objects/pics/people/man_4/5.png b/graphics/event_objects/pics/people/man_4/5.png
index 7e20d5af9..7e20d5af9 100644
--- a/graphics/map_objects/pics/people/man_4/5.png
+++ b/graphics/event_objects/pics/people/man_4/5.png
diff --git a/graphics/map_objects/pics/people/man_4/6.png b/graphics/event_objects/pics/people/man_4/6.png
index 3d4ae58f0..3d4ae58f0 100644
--- a/graphics/map_objects/pics/people/man_4/6.png
+++ b/graphics/event_objects/pics/people/man_4/6.png
diff --git a/graphics/map_objects/pics/people/man_4/7.png b/graphics/event_objects/pics/people/man_4/7.png
index 12a9d1fa8..12a9d1fa8 100644
--- a/graphics/map_objects/pics/people/man_4/7.png
+++ b/graphics/event_objects/pics/people/man_4/7.png
diff --git a/graphics/map_objects/pics/people/man_4/8.png b/graphics/event_objects/pics/people/man_4/8.png
index 43bea13ce..43bea13ce 100644
--- a/graphics/map_objects/pics/people/man_4/8.png
+++ b/graphics/event_objects/pics/people/man_4/8.png
diff --git a/graphics/map_objects/pics/people/man_5/0.png b/graphics/event_objects/pics/people/man_5/0.png
index f1da52790..f1da52790 100644
--- a/graphics/map_objects/pics/people/man_5/0.png
+++ b/graphics/event_objects/pics/people/man_5/0.png
diff --git a/graphics/map_objects/pics/people/man_5/1.png b/graphics/event_objects/pics/people/man_5/1.png
index 80dde6ec6..80dde6ec6 100644
--- a/graphics/map_objects/pics/people/man_5/1.png
+++ b/graphics/event_objects/pics/people/man_5/1.png
diff --git a/graphics/map_objects/pics/people/man_5/2.png b/graphics/event_objects/pics/people/man_5/2.png
index 95ee60f02..95ee60f02 100644
--- a/graphics/map_objects/pics/people/man_5/2.png
+++ b/graphics/event_objects/pics/people/man_5/2.png
diff --git a/graphics/map_objects/pics/people/man_5/3.png b/graphics/event_objects/pics/people/man_5/3.png
index 52d4e65f0..52d4e65f0 100644
--- a/graphics/map_objects/pics/people/man_5/3.png
+++ b/graphics/event_objects/pics/people/man_5/3.png
diff --git a/graphics/map_objects/pics/people/man_5/4.png b/graphics/event_objects/pics/people/man_5/4.png
index 23e440b88..23e440b88 100644
--- a/graphics/map_objects/pics/people/man_5/4.png
+++ b/graphics/event_objects/pics/people/man_5/4.png
diff --git a/graphics/map_objects/pics/people/man_5/5.png b/graphics/event_objects/pics/people/man_5/5.png
index c587b3762..c587b3762 100644
--- a/graphics/map_objects/pics/people/man_5/5.png
+++ b/graphics/event_objects/pics/people/man_5/5.png
diff --git a/graphics/map_objects/pics/people/man_5/6.png b/graphics/event_objects/pics/people/man_5/6.png
index 7ee45b6db..7ee45b6db 100644
--- a/graphics/map_objects/pics/people/man_5/6.png
+++ b/graphics/event_objects/pics/people/man_5/6.png
diff --git a/graphics/map_objects/pics/people/man_5/7.png b/graphics/event_objects/pics/people/man_5/7.png
index 24a578a34..24a578a34 100644
--- a/graphics/map_objects/pics/people/man_5/7.png
+++ b/graphics/event_objects/pics/people/man_5/7.png
diff --git a/graphics/map_objects/pics/people/man_5/8.png b/graphics/event_objects/pics/people/man_5/8.png
index 6040f6f4d..6040f6f4d 100644
--- a/graphics/map_objects/pics/people/man_5/8.png
+++ b/graphics/event_objects/pics/people/man_5/8.png
diff --git a/graphics/map_objects/pics/people/man_6/0.png b/graphics/event_objects/pics/people/man_6/0.png
index ddcd545aa..ddcd545aa 100644
--- a/graphics/map_objects/pics/people/man_6/0.png
+++ b/graphics/event_objects/pics/people/man_6/0.png
diff --git a/graphics/map_objects/pics/people/man_6/1.png b/graphics/event_objects/pics/people/man_6/1.png
index 0d7007e10..0d7007e10 100644
--- a/graphics/map_objects/pics/people/man_6/1.png
+++ b/graphics/event_objects/pics/people/man_6/1.png
diff --git a/graphics/map_objects/pics/people/man_6/2.png b/graphics/event_objects/pics/people/man_6/2.png
index 4daabc15d..4daabc15d 100644
--- a/graphics/map_objects/pics/people/man_6/2.png
+++ b/graphics/event_objects/pics/people/man_6/2.png
diff --git a/graphics/map_objects/pics/people/man_6/3.png b/graphics/event_objects/pics/people/man_6/3.png
index 0373f371d..0373f371d 100644
--- a/graphics/map_objects/pics/people/man_6/3.png
+++ b/graphics/event_objects/pics/people/man_6/3.png
diff --git a/graphics/map_objects/pics/people/man_6/4.png b/graphics/event_objects/pics/people/man_6/4.png
index b0d8ee814..b0d8ee814 100644
--- a/graphics/map_objects/pics/people/man_6/4.png
+++ b/graphics/event_objects/pics/people/man_6/4.png
diff --git a/graphics/map_objects/pics/people/man_6/5.png b/graphics/event_objects/pics/people/man_6/5.png
index 3f95859a1..3f95859a1 100644
--- a/graphics/map_objects/pics/people/man_6/5.png
+++ b/graphics/event_objects/pics/people/man_6/5.png
diff --git a/graphics/map_objects/pics/people/man_6/6.png b/graphics/event_objects/pics/people/man_6/6.png
index 5a89dfc33..5a89dfc33 100644
--- a/graphics/map_objects/pics/people/man_6/6.png
+++ b/graphics/event_objects/pics/people/man_6/6.png
diff --git a/graphics/map_objects/pics/people/man_6/7.png b/graphics/event_objects/pics/people/man_6/7.png
index 6c2e07884..6c2e07884 100644
--- a/graphics/map_objects/pics/people/man_6/7.png
+++ b/graphics/event_objects/pics/people/man_6/7.png
diff --git a/graphics/map_objects/pics/people/man_6/8.png b/graphics/event_objects/pics/people/man_6/8.png
index 3db124eab..3db124eab 100644
--- a/graphics/map_objects/pics/people/man_6/8.png
+++ b/graphics/event_objects/pics/people/man_6/8.png
diff --git a/graphics/map_objects/pics/people/man_7/0.png b/graphics/event_objects/pics/people/man_7/0.png
index 5012da446..5012da446 100644
--- a/graphics/map_objects/pics/people/man_7/0.png
+++ b/graphics/event_objects/pics/people/man_7/0.png
diff --git a/graphics/map_objects/pics/people/man_7/1.png b/graphics/event_objects/pics/people/man_7/1.png
index c44eb21bd..c44eb21bd 100644
--- a/graphics/map_objects/pics/people/man_7/1.png
+++ b/graphics/event_objects/pics/people/man_7/1.png
diff --git a/graphics/map_objects/pics/people/man_7/2.png b/graphics/event_objects/pics/people/man_7/2.png
index a9a654e80..a9a654e80 100644
--- a/graphics/map_objects/pics/people/man_7/2.png
+++ b/graphics/event_objects/pics/people/man_7/2.png
diff --git a/graphics/map_objects/pics/people/man_7/3.png b/graphics/event_objects/pics/people/man_7/3.png
index f71dda552..f71dda552 100644
--- a/graphics/map_objects/pics/people/man_7/3.png
+++ b/graphics/event_objects/pics/people/man_7/3.png
diff --git a/graphics/map_objects/pics/people/man_7/4.png b/graphics/event_objects/pics/people/man_7/4.png
index b2038c37e..b2038c37e 100644
--- a/graphics/map_objects/pics/people/man_7/4.png
+++ b/graphics/event_objects/pics/people/man_7/4.png
diff --git a/graphics/map_objects/pics/people/man_7/5.png b/graphics/event_objects/pics/people/man_7/5.png
index 286eba97f..286eba97f 100644
--- a/graphics/map_objects/pics/people/man_7/5.png
+++ b/graphics/event_objects/pics/people/man_7/5.png
diff --git a/graphics/map_objects/pics/people/man_7/6.png b/graphics/event_objects/pics/people/man_7/6.png
index 5d2549964..5d2549964 100644
--- a/graphics/map_objects/pics/people/man_7/6.png
+++ b/graphics/event_objects/pics/people/man_7/6.png
diff --git a/graphics/map_objects/pics/people/man_7/7.png b/graphics/event_objects/pics/people/man_7/7.png
index d93ade7b8..d93ade7b8 100644
--- a/graphics/map_objects/pics/people/man_7/7.png
+++ b/graphics/event_objects/pics/people/man_7/7.png
diff --git a/graphics/map_objects/pics/people/man_7/8.png b/graphics/event_objects/pics/people/man_7/8.png
index 84a62fe04..84a62fe04 100644
--- a/graphics/map_objects/pics/people/man_7/8.png
+++ b/graphics/event_objects/pics/people/man_7/8.png
diff --git a/graphics/map_objects/pics/people/maniac/0.png b/graphics/event_objects/pics/people/maniac/0.png
index 01f066910..01f066910 100644
--- a/graphics/map_objects/pics/people/maniac/0.png
+++ b/graphics/event_objects/pics/people/maniac/0.png
diff --git a/graphics/map_objects/pics/people/maniac/1.png b/graphics/event_objects/pics/people/maniac/1.png
index fc8efb1d4..fc8efb1d4 100644
--- a/graphics/map_objects/pics/people/maniac/1.png
+++ b/graphics/event_objects/pics/people/maniac/1.png
diff --git a/graphics/map_objects/pics/people/maniac/2.png b/graphics/event_objects/pics/people/maniac/2.png
index ea211288f..ea211288f 100644
--- a/graphics/map_objects/pics/people/maniac/2.png
+++ b/graphics/event_objects/pics/people/maniac/2.png
diff --git a/graphics/map_objects/pics/people/maniac/3.png b/graphics/event_objects/pics/people/maniac/3.png
index 7a0ab0ba1..7a0ab0ba1 100644
--- a/graphics/map_objects/pics/people/maniac/3.png
+++ b/graphics/event_objects/pics/people/maniac/3.png
diff --git a/graphics/map_objects/pics/people/maniac/4.png b/graphics/event_objects/pics/people/maniac/4.png
index 93083333d..93083333d 100644
--- a/graphics/map_objects/pics/people/maniac/4.png
+++ b/graphics/event_objects/pics/people/maniac/4.png
diff --git a/graphics/map_objects/pics/people/maniac/5.png b/graphics/event_objects/pics/people/maniac/5.png
index ac18fea6e..ac18fea6e 100644
--- a/graphics/map_objects/pics/people/maniac/5.png
+++ b/graphics/event_objects/pics/people/maniac/5.png
diff --git a/graphics/map_objects/pics/people/maniac/6.png b/graphics/event_objects/pics/people/maniac/6.png
index d8db27038..d8db27038 100644
--- a/graphics/map_objects/pics/people/maniac/6.png
+++ b/graphics/event_objects/pics/people/maniac/6.png
diff --git a/graphics/map_objects/pics/people/maniac/7.png b/graphics/event_objects/pics/people/maniac/7.png
index 647c69838..647c69838 100644
--- a/graphics/map_objects/pics/people/maniac/7.png
+++ b/graphics/event_objects/pics/people/maniac/7.png
diff --git a/graphics/map_objects/pics/people/maniac/8.png b/graphics/event_objects/pics/people/maniac/8.png
index 5d37c6d40..5d37c6d40 100644
--- a/graphics/map_objects/pics/people/maniac/8.png
+++ b/graphics/event_objects/pics/people/maniac/8.png
diff --git a/graphics/map_objects/pics/people/mart_employee/0.png b/graphics/event_objects/pics/people/mart_employee/0.png
index 4dfc880b7..4dfc880b7 100644
--- a/graphics/map_objects/pics/people/mart_employee/0.png
+++ b/graphics/event_objects/pics/people/mart_employee/0.png
diff --git a/graphics/map_objects/pics/people/mart_employee/1.png b/graphics/event_objects/pics/people/mart_employee/1.png
index 25320fff0..25320fff0 100644
--- a/graphics/map_objects/pics/people/mart_employee/1.png
+++ b/graphics/event_objects/pics/people/mart_employee/1.png
diff --git a/graphics/map_objects/pics/people/mart_employee/2.png b/graphics/event_objects/pics/people/mart_employee/2.png
index 31ad7d75b..31ad7d75b 100644
--- a/graphics/map_objects/pics/people/mart_employee/2.png
+++ b/graphics/event_objects/pics/people/mart_employee/2.png
diff --git a/graphics/map_objects/pics/people/mart_employee/3.png b/graphics/event_objects/pics/people/mart_employee/3.png
index 4e7e389d8..4e7e389d8 100644
--- a/graphics/map_objects/pics/people/mart_employee/3.png
+++ b/graphics/event_objects/pics/people/mart_employee/3.png
diff --git a/graphics/map_objects/pics/people/mart_employee/4.png b/graphics/event_objects/pics/people/mart_employee/4.png
index 4357a5946..4357a5946 100644
--- a/graphics/map_objects/pics/people/mart_employee/4.png
+++ b/graphics/event_objects/pics/people/mart_employee/4.png
diff --git a/graphics/map_objects/pics/people/mart_employee/5.png b/graphics/event_objects/pics/people/mart_employee/5.png
index 46ae73fd2..46ae73fd2 100644
--- a/graphics/map_objects/pics/people/mart_employee/5.png
+++ b/graphics/event_objects/pics/people/mart_employee/5.png
diff --git a/graphics/map_objects/pics/people/mart_employee/6.png b/graphics/event_objects/pics/people/mart_employee/6.png
index 9eb51a482..9eb51a482 100644
--- a/graphics/map_objects/pics/people/mart_employee/6.png
+++ b/graphics/event_objects/pics/people/mart_employee/6.png
diff --git a/graphics/map_objects/pics/people/mart_employee/7.png b/graphics/event_objects/pics/people/mart_employee/7.png
index b3ffb8036..b3ffb8036 100644
--- a/graphics/map_objects/pics/people/mart_employee/7.png
+++ b/graphics/event_objects/pics/people/mart_employee/7.png
diff --git a/graphics/map_objects/pics/people/mart_employee/8.png b/graphics/event_objects/pics/people/mart_employee/8.png
index b2268286c..b2268286c 100644
--- a/graphics/map_objects/pics/people/mart_employee/8.png
+++ b/graphics/event_objects/pics/people/mart_employee/8.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/0.png b/graphics/event_objects/pics/people/mauville_old_man_1/0.png
index 3e18501f2..3e18501f2 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/0.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/0.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/1.png b/graphics/event_objects/pics/people/mauville_old_man_1/1.png
index 323f17510..323f17510 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/1.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/1.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/2.png b/graphics/event_objects/pics/people/mauville_old_man_1/2.png
index 79fd38508..79fd38508 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/2.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/2.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/3.png b/graphics/event_objects/pics/people/mauville_old_man_1/3.png
index adc86db63..adc86db63 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/3.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/3.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/4.png b/graphics/event_objects/pics/people/mauville_old_man_1/4.png
index fc8eff4d9..fc8eff4d9 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/4.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/4.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/5.png b/graphics/event_objects/pics/people/mauville_old_man_1/5.png
index 38d073fd2..38d073fd2 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/5.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/5.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/6.png b/graphics/event_objects/pics/people/mauville_old_man_1/6.png
index 701059382..701059382 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/6.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/6.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/7.png b/graphics/event_objects/pics/people/mauville_old_man_1/7.png
index 14cad5679..14cad5679 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/7.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/7.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_1/8.png b/graphics/event_objects/pics/people/mauville_old_man_1/8.png
index 72522180b..72522180b 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_1/8.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_1/8.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/0.png b/graphics/event_objects/pics/people/mauville_old_man_2/0.png
index d913bcbdb..d913bcbdb 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/0.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/0.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/1.png b/graphics/event_objects/pics/people/mauville_old_man_2/1.png
index f98c0ecde..f98c0ecde 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/1.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/1.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/2.png b/graphics/event_objects/pics/people/mauville_old_man_2/2.png
index abe9050a0..abe9050a0 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/2.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/2.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/3.png b/graphics/event_objects/pics/people/mauville_old_man_2/3.png
index 4d71ce720..4d71ce720 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/3.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/3.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/4.png b/graphics/event_objects/pics/people/mauville_old_man_2/4.png
index 9e0330a61..9e0330a61 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/4.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/4.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/5.png b/graphics/event_objects/pics/people/mauville_old_man_2/5.png
index 92135f48a..92135f48a 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/5.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/5.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/6.png b/graphics/event_objects/pics/people/mauville_old_man_2/6.png
index 3a328ba04..3a328ba04 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/6.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/6.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/7.png b/graphics/event_objects/pics/people/mauville_old_man_2/7.png
index ea1b4d95b..ea1b4d95b 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/7.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/7.png
diff --git a/graphics/map_objects/pics/people/mauville_old_man_2/8.png b/graphics/event_objects/pics/people/mauville_old_man_2/8.png
index ac7a5e12d..ac7a5e12d 100644
--- a/graphics/map_objects/pics/people/mauville_old_man_2/8.png
+++ b/graphics/event_objects/pics/people/mauville_old_man_2/8.png
diff --git a/graphics/map_objects/pics/people/maxie/0.png b/graphics/event_objects/pics/people/maxie/0.png
index 21ca72fd2..21ca72fd2 100644
--- a/graphics/map_objects/pics/people/maxie/0.png
+++ b/graphics/event_objects/pics/people/maxie/0.png
diff --git a/graphics/map_objects/pics/people/maxie/1.png b/graphics/event_objects/pics/people/maxie/1.png
index d7347de17..d7347de17 100644
--- a/graphics/map_objects/pics/people/maxie/1.png
+++ b/graphics/event_objects/pics/people/maxie/1.png
diff --git a/graphics/map_objects/pics/people/maxie/2.png b/graphics/event_objects/pics/people/maxie/2.png
index f80bb07a5..f80bb07a5 100644
--- a/graphics/map_objects/pics/people/maxie/2.png
+++ b/graphics/event_objects/pics/people/maxie/2.png
diff --git a/graphics/map_objects/pics/people/maxie/3.png b/graphics/event_objects/pics/people/maxie/3.png
index 6cb101536..6cb101536 100644
--- a/graphics/map_objects/pics/people/maxie/3.png
+++ b/graphics/event_objects/pics/people/maxie/3.png
diff --git a/graphics/map_objects/pics/people/maxie/4.png b/graphics/event_objects/pics/people/maxie/4.png
index c513206a6..c513206a6 100644
--- a/graphics/map_objects/pics/people/maxie/4.png
+++ b/graphics/event_objects/pics/people/maxie/4.png
diff --git a/graphics/map_objects/pics/people/maxie/5.png b/graphics/event_objects/pics/people/maxie/5.png
index fd6a81dc5..fd6a81dc5 100644
--- a/graphics/map_objects/pics/people/maxie/5.png
+++ b/graphics/event_objects/pics/people/maxie/5.png
diff --git a/graphics/map_objects/pics/people/maxie/6.png b/graphics/event_objects/pics/people/maxie/6.png
index ac1564204..ac1564204 100644
--- a/graphics/map_objects/pics/people/maxie/6.png
+++ b/graphics/event_objects/pics/people/maxie/6.png
diff --git a/graphics/map_objects/pics/people/maxie/7.png b/graphics/event_objects/pics/people/maxie/7.png
index adb1aa235..adb1aa235 100644
--- a/graphics/map_objects/pics/people/maxie/7.png
+++ b/graphics/event_objects/pics/people/maxie/7.png
diff --git a/graphics/map_objects/pics/people/maxie/8.png b/graphics/event_objects/pics/people/maxie/8.png
index 765803561..765803561 100644
--- a/graphics/map_objects/pics/people/maxie/8.png
+++ b/graphics/event_objects/pics/people/maxie/8.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/00.png b/graphics/event_objects/pics/people/may/acro_bike/00.png
index 838b03c3f..838b03c3f 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/00.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/00.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/01.png b/graphics/event_objects/pics/people/may/acro_bike/01.png
index 5496c3288..5496c3288 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/01.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/01.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/02.png b/graphics/event_objects/pics/people/may/acro_bike/02.png
index 2b8e86165..2b8e86165 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/02.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/02.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/03.png b/graphics/event_objects/pics/people/may/acro_bike/03.png
index c9740c4d9..c9740c4d9 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/03.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/03.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/04.png b/graphics/event_objects/pics/people/may/acro_bike/04.png
index 959fbaec1..959fbaec1 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/04.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/04.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/05.png b/graphics/event_objects/pics/people/may/acro_bike/05.png
index 029c92f34..029c92f34 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/05.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/05.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/06.png b/graphics/event_objects/pics/people/may/acro_bike/06.png
index e3c069efe..e3c069efe 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/06.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/06.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/07.png b/graphics/event_objects/pics/people/may/acro_bike/07.png
index 43d747292..43d747292 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/07.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/07.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/08.png b/graphics/event_objects/pics/people/may/acro_bike/08.png
index a12425a1e..a12425a1e 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/08.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/08.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/09.png b/graphics/event_objects/pics/people/may/acro_bike/09.png
index 3c6e4b852..3c6e4b852 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/09.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/09.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/10.png b/graphics/event_objects/pics/people/may/acro_bike/10.png
index 2683b5990..2683b5990 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/10.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/10.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/11.png b/graphics/event_objects/pics/people/may/acro_bike/11.png
index 60858ec54..60858ec54 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/11.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/11.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/12.png b/graphics/event_objects/pics/people/may/acro_bike/12.png
index 2926a64c1..2926a64c1 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/12.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/12.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/13.png b/graphics/event_objects/pics/people/may/acro_bike/13.png
index ee2f1860b..ee2f1860b 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/13.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/13.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/14.png b/graphics/event_objects/pics/people/may/acro_bike/14.png
index e8c93b214..e8c93b214 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/14.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/14.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/15.png b/graphics/event_objects/pics/people/may/acro_bike/15.png
index 713a05eee..713a05eee 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/15.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/15.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/16.png b/graphics/event_objects/pics/people/may/acro_bike/16.png
index 30e065122..30e065122 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/16.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/16.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/17.png b/graphics/event_objects/pics/people/may/acro_bike/17.png
index be5ffcc5a..be5ffcc5a 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/17.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/17.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/18.png b/graphics/event_objects/pics/people/may/acro_bike/18.png
index 7d8757fc8..7d8757fc8 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/18.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/18.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/19.png b/graphics/event_objects/pics/people/may/acro_bike/19.png
index 2f66fc466..2f66fc466 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/19.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/19.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/20.png b/graphics/event_objects/pics/people/may/acro_bike/20.png
index 5c85fa463..5c85fa463 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/20.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/20.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/21.png b/graphics/event_objects/pics/people/may/acro_bike/21.png
index db4795213..db4795213 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/21.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/21.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/22.png b/graphics/event_objects/pics/people/may/acro_bike/22.png
index 0da29524b..0da29524b 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/22.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/22.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/23.png b/graphics/event_objects/pics/people/may/acro_bike/23.png
index fd77a607a..fd77a607a 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/23.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/23.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/24.png b/graphics/event_objects/pics/people/may/acro_bike/24.png
index 6a74a2dc1..6a74a2dc1 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/24.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/24.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/25.png b/graphics/event_objects/pics/people/may/acro_bike/25.png
index f1de9a530..f1de9a530 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/25.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/25.png
diff --git a/graphics/map_objects/pics/people/may/acro_bike/26.png b/graphics/event_objects/pics/people/may/acro_bike/26.png
index db55197e7..db55197e7 100644
--- a/graphics/map_objects/pics/people/may/acro_bike/26.png
+++ b/graphics/event_objects/pics/people/may/acro_bike/26.png
diff --git a/graphics/map_objects/pics/people/may/decorating.png b/graphics/event_objects/pics/people/may/decorating.png
index 1f20f1a52..1f20f1a52 100644
--- a/graphics/map_objects/pics/people/may/decorating.png
+++ b/graphics/event_objects/pics/people/may/decorating.png
diff --git a/graphics/map_objects/pics/people/may/field_move/0.png b/graphics/event_objects/pics/people/may/field_move/0.png
index 59d735b2b..59d735b2b 100644
--- a/graphics/map_objects/pics/people/may/field_move/0.png
+++ b/graphics/event_objects/pics/people/may/field_move/0.png
diff --git a/graphics/map_objects/pics/people/may/field_move/1.png b/graphics/event_objects/pics/people/may/field_move/1.png
index 3e2c7c38b..3e2c7c38b 100644
--- a/graphics/map_objects/pics/people/may/field_move/1.png
+++ b/graphics/event_objects/pics/people/may/field_move/1.png
diff --git a/graphics/map_objects/pics/people/may/field_move/2.png b/graphics/event_objects/pics/people/may/field_move/2.png
index 01d835f6b..01d835f6b 100644
--- a/graphics/map_objects/pics/people/may/field_move/2.png
+++ b/graphics/event_objects/pics/people/may/field_move/2.png
diff --git a/graphics/map_objects/pics/people/may/field_move/3.png b/graphics/event_objects/pics/people/may/field_move/3.png
index 05b057875..05b057875 100644
--- a/graphics/map_objects/pics/people/may/field_move/3.png
+++ b/graphics/event_objects/pics/people/may/field_move/3.png
diff --git a/graphics/map_objects/pics/people/may/field_move/4.png b/graphics/event_objects/pics/people/may/field_move/4.png
index 28d108c5f..28d108c5f 100644
--- a/graphics/map_objects/pics/people/may/field_move/4.png
+++ b/graphics/event_objects/pics/people/may/field_move/4.png
diff --git a/graphics/map_objects/pics/people/may/fishing/00.png b/graphics/event_objects/pics/people/may/fishing/00.png
index e279aeaee..e279aeaee 100644
--- a/graphics/map_objects/pics/people/may/fishing/00.png
+++ b/graphics/event_objects/pics/people/may/fishing/00.png
diff --git a/graphics/map_objects/pics/people/may/fishing/01.png b/graphics/event_objects/pics/people/may/fishing/01.png
index bdbc20487..bdbc20487 100644
--- a/graphics/map_objects/pics/people/may/fishing/01.png
+++ b/graphics/event_objects/pics/people/may/fishing/01.png
diff --git a/graphics/map_objects/pics/people/may/fishing/02.png b/graphics/event_objects/pics/people/may/fishing/02.png
index 7f49aae3f..7f49aae3f 100644
--- a/graphics/map_objects/pics/people/may/fishing/02.png
+++ b/graphics/event_objects/pics/people/may/fishing/02.png
diff --git a/graphics/map_objects/pics/people/may/fishing/03.png b/graphics/event_objects/pics/people/may/fishing/03.png
index ee84ffa20..ee84ffa20 100644
--- a/graphics/map_objects/pics/people/may/fishing/03.png
+++ b/graphics/event_objects/pics/people/may/fishing/03.png
diff --git a/graphics/map_objects/pics/people/may/fishing/04.png b/graphics/event_objects/pics/people/may/fishing/04.png
index 0a9fe3109..0a9fe3109 100644
--- a/graphics/map_objects/pics/people/may/fishing/04.png
+++ b/graphics/event_objects/pics/people/may/fishing/04.png
diff --git a/graphics/map_objects/pics/people/may/fishing/05.png b/graphics/event_objects/pics/people/may/fishing/05.png
index 460b4df5a..460b4df5a 100644
--- a/graphics/map_objects/pics/people/may/fishing/05.png
+++ b/graphics/event_objects/pics/people/may/fishing/05.png
diff --git a/graphics/map_objects/pics/people/may/fishing/06.png b/graphics/event_objects/pics/people/may/fishing/06.png
index 598da6cfc..598da6cfc 100644
--- a/graphics/map_objects/pics/people/may/fishing/06.png
+++ b/graphics/event_objects/pics/people/may/fishing/06.png
diff --git a/graphics/map_objects/pics/people/may/fishing/07.png b/graphics/event_objects/pics/people/may/fishing/07.png
index 5d410c6b4..5d410c6b4 100644
--- a/graphics/map_objects/pics/people/may/fishing/07.png
+++ b/graphics/event_objects/pics/people/may/fishing/07.png
diff --git a/graphics/map_objects/pics/people/may/fishing/08.png b/graphics/event_objects/pics/people/may/fishing/08.png
index b441380d4..b441380d4 100644
--- a/graphics/map_objects/pics/people/may/fishing/08.png
+++ b/graphics/event_objects/pics/people/may/fishing/08.png
diff --git a/graphics/map_objects/pics/people/may/fishing/09.png b/graphics/event_objects/pics/people/may/fishing/09.png
index 7f7de260f..7f7de260f 100644
--- a/graphics/map_objects/pics/people/may/fishing/09.png
+++ b/graphics/event_objects/pics/people/may/fishing/09.png
diff --git a/graphics/map_objects/pics/people/may/fishing/10.png b/graphics/event_objects/pics/people/may/fishing/10.png
index b6fc1ee12..b6fc1ee12 100644
--- a/graphics/map_objects/pics/people/may/fishing/10.png
+++ b/graphics/event_objects/pics/people/may/fishing/10.png
diff --git a/graphics/map_objects/pics/people/may/fishing/11.png b/graphics/event_objects/pics/people/may/fishing/11.png
index 304cb7344..304cb7344 100644
--- a/graphics/map_objects/pics/people/may/fishing/11.png
+++ b/graphics/event_objects/pics/people/may/fishing/11.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/0.png b/graphics/event_objects/pics/people/may/mach_bike/0.png
index 838b03c3f..838b03c3f 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/0.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/0.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/1.png b/graphics/event_objects/pics/people/may/mach_bike/1.png
index 5496c3288..5496c3288 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/1.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/1.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/2.png b/graphics/event_objects/pics/people/may/mach_bike/2.png
index 2b8e86165..2b8e86165 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/2.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/2.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/3.png b/graphics/event_objects/pics/people/may/mach_bike/3.png
index c9740c4d9..c9740c4d9 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/3.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/3.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/4.png b/graphics/event_objects/pics/people/may/mach_bike/4.png
index 959fbaec1..959fbaec1 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/4.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/4.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/5.png b/graphics/event_objects/pics/people/may/mach_bike/5.png
index 029c92f34..029c92f34 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/5.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/5.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/6.png b/graphics/event_objects/pics/people/may/mach_bike/6.png
index e3c069efe..e3c069efe 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/6.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/6.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/7.png b/graphics/event_objects/pics/people/may/mach_bike/7.png
index 43d747292..43d747292 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/7.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/7.png
diff --git a/graphics/map_objects/pics/people/may/mach_bike/8.png b/graphics/event_objects/pics/people/may/mach_bike/8.png
index a12425a1e..a12425a1e 100644
--- a/graphics/map_objects/pics/people/may/mach_bike/8.png
+++ b/graphics/event_objects/pics/people/may/mach_bike/8.png
diff --git a/graphics/map_objects/pics/people/may/normal/00.png b/graphics/event_objects/pics/people/may/normal/00.png
index 2ccd3399a..2ccd3399a 100644
--- a/graphics/map_objects/pics/people/may/normal/00.png
+++ b/graphics/event_objects/pics/people/may/normal/00.png
diff --git a/graphics/map_objects/pics/people/may/normal/01.png b/graphics/event_objects/pics/people/may/normal/01.png
index 94aad9ac7..94aad9ac7 100644
--- a/graphics/map_objects/pics/people/may/normal/01.png
+++ b/graphics/event_objects/pics/people/may/normal/01.png
diff --git a/graphics/map_objects/pics/people/may/normal/02.png b/graphics/event_objects/pics/people/may/normal/02.png
index e61943fbb..e61943fbb 100644
--- a/graphics/map_objects/pics/people/may/normal/02.png
+++ b/graphics/event_objects/pics/people/may/normal/02.png
diff --git a/graphics/map_objects/pics/people/may/normal/03.png b/graphics/event_objects/pics/people/may/normal/03.png
index b8d1255d5..b8d1255d5 100644
--- a/graphics/map_objects/pics/people/may/normal/03.png
+++ b/graphics/event_objects/pics/people/may/normal/03.png
diff --git a/graphics/map_objects/pics/people/may/normal/04.png b/graphics/event_objects/pics/people/may/normal/04.png
index 7d3cac765..7d3cac765 100644
--- a/graphics/map_objects/pics/people/may/normal/04.png
+++ b/graphics/event_objects/pics/people/may/normal/04.png
diff --git a/graphics/map_objects/pics/people/may/normal/05.png b/graphics/event_objects/pics/people/may/normal/05.png
index d5a4ab94e..d5a4ab94e 100644
--- a/graphics/map_objects/pics/people/may/normal/05.png
+++ b/graphics/event_objects/pics/people/may/normal/05.png
diff --git a/graphics/map_objects/pics/people/may/normal/06.png b/graphics/event_objects/pics/people/may/normal/06.png
index d22684057..d22684057 100644
--- a/graphics/map_objects/pics/people/may/normal/06.png
+++ b/graphics/event_objects/pics/people/may/normal/06.png
diff --git a/graphics/map_objects/pics/people/may/normal/07.png b/graphics/event_objects/pics/people/may/normal/07.png
index d0f0c3716..d0f0c3716 100644
--- a/graphics/map_objects/pics/people/may/normal/07.png
+++ b/graphics/event_objects/pics/people/may/normal/07.png
diff --git a/graphics/map_objects/pics/people/may/normal/08.png b/graphics/event_objects/pics/people/may/normal/08.png
index dbb26c4e7..dbb26c4e7 100644
--- a/graphics/map_objects/pics/people/may/normal/08.png
+++ b/graphics/event_objects/pics/people/may/normal/08.png
diff --git a/graphics/map_objects/pics/people/may/normal/09.png b/graphics/event_objects/pics/people/may/normal/09.png
index 714316485..714316485 100644
--- a/graphics/map_objects/pics/people/may/normal/09.png
+++ b/graphics/event_objects/pics/people/may/normal/09.png
diff --git a/graphics/map_objects/pics/people/may/normal/10.png b/graphics/event_objects/pics/people/may/normal/10.png
index 07897594f..07897594f 100644
--- a/graphics/map_objects/pics/people/may/normal/10.png
+++ b/graphics/event_objects/pics/people/may/normal/10.png
diff --git a/graphics/map_objects/pics/people/may/normal/11.png b/graphics/event_objects/pics/people/may/normal/11.png
index e4583aa91..e4583aa91 100644
--- a/graphics/map_objects/pics/people/may/normal/11.png
+++ b/graphics/event_objects/pics/people/may/normal/11.png
diff --git a/graphics/map_objects/pics/people/may/normal/12.png b/graphics/event_objects/pics/people/may/normal/12.png
index 34405b837..34405b837 100644
--- a/graphics/map_objects/pics/people/may/normal/12.png
+++ b/graphics/event_objects/pics/people/may/normal/12.png
diff --git a/graphics/map_objects/pics/people/may/normal/13.png b/graphics/event_objects/pics/people/may/normal/13.png
index 3b0ec86b3..3b0ec86b3 100644
--- a/graphics/map_objects/pics/people/may/normal/13.png
+++ b/graphics/event_objects/pics/people/may/normal/13.png
diff --git a/graphics/map_objects/pics/people/may/normal/14.png b/graphics/event_objects/pics/people/may/normal/14.png
index 18ee35cb9..18ee35cb9 100644
--- a/graphics/map_objects/pics/people/may/normal/14.png
+++ b/graphics/event_objects/pics/people/may/normal/14.png
diff --git a/graphics/map_objects/pics/people/may/normal/15.png b/graphics/event_objects/pics/people/may/normal/15.png
index ea5e0fd5f..ea5e0fd5f 100644
--- a/graphics/map_objects/pics/people/may/normal/15.png
+++ b/graphics/event_objects/pics/people/may/normal/15.png
diff --git a/graphics/map_objects/pics/people/may/normal/16.png b/graphics/event_objects/pics/people/may/normal/16.png
index c7e9dd58b..c7e9dd58b 100644
--- a/graphics/map_objects/pics/people/may/normal/16.png
+++ b/graphics/event_objects/pics/people/may/normal/16.png
diff --git a/graphics/map_objects/pics/people/may/normal/17.png b/graphics/event_objects/pics/people/may/normal/17.png
index e79de8152..e79de8152 100644
--- a/graphics/map_objects/pics/people/may/normal/17.png
+++ b/graphics/event_objects/pics/people/may/normal/17.png
diff --git a/graphics/map_objects/pics/people/may/surfing/0.png b/graphics/event_objects/pics/people/may/surfing/0.png
index 5f9dfbeb5..5f9dfbeb5 100644
--- a/graphics/map_objects/pics/people/may/surfing/0.png
+++ b/graphics/event_objects/pics/people/may/surfing/0.png
diff --git a/graphics/map_objects/pics/people/may/surfing/1.png b/graphics/event_objects/pics/people/may/surfing/1.png
index 0e0bf6f7b..0e0bf6f7b 100644
--- a/graphics/map_objects/pics/people/may/surfing/1.png
+++ b/graphics/event_objects/pics/people/may/surfing/1.png
diff --git a/graphics/map_objects/pics/people/may/surfing/2.png b/graphics/event_objects/pics/people/may/surfing/2.png
index 2af51190c..2af51190c 100644
--- a/graphics/map_objects/pics/people/may/surfing/2.png
+++ b/graphics/event_objects/pics/people/may/surfing/2.png
diff --git a/graphics/map_objects/pics/people/may/surfing/3.png b/graphics/event_objects/pics/people/may/surfing/3.png
index 66e52fdaf..66e52fdaf 100644
--- a/graphics/map_objects/pics/people/may/surfing/3.png
+++ b/graphics/event_objects/pics/people/may/surfing/3.png
diff --git a/graphics/map_objects/pics/people/may/surfing/4.png b/graphics/event_objects/pics/people/may/surfing/4.png
index 85c545d86..85c545d86 100644
--- a/graphics/map_objects/pics/people/may/surfing/4.png
+++ b/graphics/event_objects/pics/people/may/surfing/4.png
diff --git a/graphics/map_objects/pics/people/may/surfing/5.png b/graphics/event_objects/pics/people/may/surfing/5.png
index 10b009954..10b009954 100644
--- a/graphics/map_objects/pics/people/may/surfing/5.png
+++ b/graphics/event_objects/pics/people/may/surfing/5.png
diff --git a/graphics/map_objects/pics/people/may/underwater/0.png b/graphics/event_objects/pics/people/may/underwater/0.png
index 678dc4bb6..678dc4bb6 100644
--- a/graphics/map_objects/pics/people/may/underwater/0.png
+++ b/graphics/event_objects/pics/people/may/underwater/0.png
diff --git a/graphics/map_objects/pics/people/may/underwater/1.png b/graphics/event_objects/pics/people/may/underwater/1.png
index 697cec2d1..697cec2d1 100644
--- a/graphics/map_objects/pics/people/may/underwater/1.png
+++ b/graphics/event_objects/pics/people/may/underwater/1.png
diff --git a/graphics/map_objects/pics/people/may/underwater/2.png b/graphics/event_objects/pics/people/may/underwater/2.png
index 423f01f88..423f01f88 100644
--- a/graphics/map_objects/pics/people/may/underwater/2.png
+++ b/graphics/event_objects/pics/people/may/underwater/2.png
diff --git a/graphics/map_objects/pics/people/may/underwater/3.png b/graphics/event_objects/pics/people/may/underwater/3.png
index 4118573a3..4118573a3 100644
--- a/graphics/map_objects/pics/people/may/underwater/3.png
+++ b/graphics/event_objects/pics/people/may/underwater/3.png
diff --git a/graphics/map_objects/pics/people/may/watering/0.png b/graphics/event_objects/pics/people/may/watering/0.png
index e3bde143f..e3bde143f 100644
--- a/graphics/map_objects/pics/people/may/watering/0.png
+++ b/graphics/event_objects/pics/people/may/watering/0.png
diff --git a/graphics/map_objects/pics/people/may/watering/1.png b/graphics/event_objects/pics/people/may/watering/1.png
index d41fe3561..d41fe3561 100644
--- a/graphics/map_objects/pics/people/may/watering/1.png
+++ b/graphics/event_objects/pics/people/may/watering/1.png
diff --git a/graphics/map_objects/pics/people/may/watering/2.png b/graphics/event_objects/pics/people/may/watering/2.png
index 15f1e5fa4..15f1e5fa4 100644
--- a/graphics/map_objects/pics/people/may/watering/2.png
+++ b/graphics/event_objects/pics/people/may/watering/2.png
diff --git a/graphics/map_objects/pics/people/may/watering/3.png b/graphics/event_objects/pics/people/may/watering/3.png
index 9ac0b2a2a..9ac0b2a2a 100644
--- a/graphics/map_objects/pics/people/may/watering/3.png
+++ b/graphics/event_objects/pics/people/may/watering/3.png
diff --git a/graphics/map_objects/pics/people/may/watering/4.png b/graphics/event_objects/pics/people/may/watering/4.png
index 11e6b0e3a..11e6b0e3a 100644
--- a/graphics/map_objects/pics/people/may/watering/4.png
+++ b/graphics/event_objects/pics/people/may/watering/4.png
diff --git a/graphics/map_objects/pics/people/may/watering/5.png b/graphics/event_objects/pics/people/may/watering/5.png
index d4fe7b838..d4fe7b838 100644
--- a/graphics/map_objects/pics/people/may/watering/5.png
+++ b/graphics/event_objects/pics/people/may/watering/5.png
diff --git a/graphics/map_objects/pics/people/mom/0.png b/graphics/event_objects/pics/people/mom/0.png
index c2b592c9f..c2b592c9f 100644
--- a/graphics/map_objects/pics/people/mom/0.png
+++ b/graphics/event_objects/pics/people/mom/0.png
diff --git a/graphics/map_objects/pics/people/mom/1.png b/graphics/event_objects/pics/people/mom/1.png
index e1d1797cb..e1d1797cb 100644
--- a/graphics/map_objects/pics/people/mom/1.png
+++ b/graphics/event_objects/pics/people/mom/1.png
diff --git a/graphics/map_objects/pics/people/mom/2.png b/graphics/event_objects/pics/people/mom/2.png
index 8cd0c1d72..8cd0c1d72 100644
--- a/graphics/map_objects/pics/people/mom/2.png
+++ b/graphics/event_objects/pics/people/mom/2.png
diff --git a/graphics/map_objects/pics/people/mom/3.png b/graphics/event_objects/pics/people/mom/3.png
index 3a682f892..3a682f892 100644
--- a/graphics/map_objects/pics/people/mom/3.png
+++ b/graphics/event_objects/pics/people/mom/3.png
diff --git a/graphics/map_objects/pics/people/mom/4.png b/graphics/event_objects/pics/people/mom/4.png
index 96de53b7b..96de53b7b 100644
--- a/graphics/map_objects/pics/people/mom/4.png
+++ b/graphics/event_objects/pics/people/mom/4.png
diff --git a/graphics/map_objects/pics/people/mom/5.png b/graphics/event_objects/pics/people/mom/5.png
index 567e8fb53..567e8fb53 100644
--- a/graphics/map_objects/pics/people/mom/5.png
+++ b/graphics/event_objects/pics/people/mom/5.png
diff --git a/graphics/map_objects/pics/people/mom/6.png b/graphics/event_objects/pics/people/mom/6.png
index 4dfaed492..4dfaed492 100644
--- a/graphics/map_objects/pics/people/mom/6.png
+++ b/graphics/event_objects/pics/people/mom/6.png
diff --git a/graphics/map_objects/pics/people/mom/7.png b/graphics/event_objects/pics/people/mom/7.png
index 3ce984e75..3ce984e75 100644
--- a/graphics/map_objects/pics/people/mom/7.png
+++ b/graphics/event_objects/pics/people/mom/7.png
diff --git a/graphics/map_objects/pics/people/mom/8.png b/graphics/event_objects/pics/people/mom/8.png
index 6a3da67d1..6a3da67d1 100644
--- a/graphics/map_objects/pics/people/mom/8.png
+++ b/graphics/event_objects/pics/people/mom/8.png
diff --git a/graphics/map_objects/pics/people/norman/0.png b/graphics/event_objects/pics/people/norman/0.png
index 5f0bd1686..5f0bd1686 100644
--- a/graphics/map_objects/pics/people/norman/0.png
+++ b/graphics/event_objects/pics/people/norman/0.png
diff --git a/graphics/map_objects/pics/people/norman/1.png b/graphics/event_objects/pics/people/norman/1.png
index 88ea12ada..88ea12ada 100644
--- a/graphics/map_objects/pics/people/norman/1.png
+++ b/graphics/event_objects/pics/people/norman/1.png
diff --git a/graphics/map_objects/pics/people/norman/2.png b/graphics/event_objects/pics/people/norman/2.png
index 04d8694ef..04d8694ef 100644
--- a/graphics/map_objects/pics/people/norman/2.png
+++ b/graphics/event_objects/pics/people/norman/2.png
diff --git a/graphics/map_objects/pics/people/norman/3.png b/graphics/event_objects/pics/people/norman/3.png
index 90d16f675..90d16f675 100644
--- a/graphics/map_objects/pics/people/norman/3.png
+++ b/graphics/event_objects/pics/people/norman/3.png
diff --git a/graphics/map_objects/pics/people/norman/4.png b/graphics/event_objects/pics/people/norman/4.png
index 0df4412fb..0df4412fb 100644
--- a/graphics/map_objects/pics/people/norman/4.png
+++ b/graphics/event_objects/pics/people/norman/4.png
diff --git a/graphics/map_objects/pics/people/norman/5.png b/graphics/event_objects/pics/people/norman/5.png
index ea68e0952..ea68e0952 100644
--- a/graphics/map_objects/pics/people/norman/5.png
+++ b/graphics/event_objects/pics/people/norman/5.png
diff --git a/graphics/map_objects/pics/people/norman/6.png b/graphics/event_objects/pics/people/norman/6.png
index 45f8e5119..45f8e5119 100644
--- a/graphics/map_objects/pics/people/norman/6.png
+++ b/graphics/event_objects/pics/people/norman/6.png
diff --git a/graphics/map_objects/pics/people/norman/7.png b/graphics/event_objects/pics/people/norman/7.png
index 27ff65ec0..27ff65ec0 100644
--- a/graphics/map_objects/pics/people/norman/7.png
+++ b/graphics/event_objects/pics/people/norman/7.png
diff --git a/graphics/map_objects/pics/people/norman/8.png b/graphics/event_objects/pics/people/norman/8.png
index aa18f3d73..aa18f3d73 100644
--- a/graphics/map_objects/pics/people/norman/8.png
+++ b/graphics/event_objects/pics/people/norman/8.png
diff --git a/graphics/map_objects/pics/people/nurse/0.png b/graphics/event_objects/pics/people/nurse/0.png
index 4d4245884..4d4245884 100644
--- a/graphics/map_objects/pics/people/nurse/0.png
+++ b/graphics/event_objects/pics/people/nurse/0.png
diff --git a/graphics/map_objects/pics/people/nurse/1.png b/graphics/event_objects/pics/people/nurse/1.png
index 11b60d2c1..11b60d2c1 100644
--- a/graphics/map_objects/pics/people/nurse/1.png
+++ b/graphics/event_objects/pics/people/nurse/1.png
diff --git a/graphics/map_objects/pics/people/nurse/2.png b/graphics/event_objects/pics/people/nurse/2.png
index 5953352b7..5953352b7 100644
--- a/graphics/map_objects/pics/people/nurse/2.png
+++ b/graphics/event_objects/pics/people/nurse/2.png
diff --git a/graphics/map_objects/pics/people/nurse/3.png b/graphics/event_objects/pics/people/nurse/3.png
index 99598a966..99598a966 100644
--- a/graphics/map_objects/pics/people/nurse/3.png
+++ b/graphics/event_objects/pics/people/nurse/3.png
diff --git a/graphics/map_objects/pics/people/nurse/4.png b/graphics/event_objects/pics/people/nurse/4.png
index 4cfa6b408..4cfa6b408 100644
--- a/graphics/map_objects/pics/people/nurse/4.png
+++ b/graphics/event_objects/pics/people/nurse/4.png
diff --git a/graphics/map_objects/pics/people/nurse/5.png b/graphics/event_objects/pics/people/nurse/5.png
index 98a3cbe65..98a3cbe65 100644
--- a/graphics/map_objects/pics/people/nurse/5.png
+++ b/graphics/event_objects/pics/people/nurse/5.png
diff --git a/graphics/map_objects/pics/people/nurse/6.png b/graphics/event_objects/pics/people/nurse/6.png
index 3fe9ac785..3fe9ac785 100644
--- a/graphics/map_objects/pics/people/nurse/6.png
+++ b/graphics/event_objects/pics/people/nurse/6.png
diff --git a/graphics/map_objects/pics/people/nurse/7.png b/graphics/event_objects/pics/people/nurse/7.png
index 4989ec83d..4989ec83d 100644
--- a/graphics/map_objects/pics/people/nurse/7.png
+++ b/graphics/event_objects/pics/people/nurse/7.png
diff --git a/graphics/map_objects/pics/people/nurse/8.png b/graphics/event_objects/pics/people/nurse/8.png
index 6fa3fbfcc..6fa3fbfcc 100644
--- a/graphics/map_objects/pics/people/nurse/8.png
+++ b/graphics/event_objects/pics/people/nurse/8.png
diff --git a/graphics/map_objects/pics/people/nurse/9.png b/graphics/event_objects/pics/people/nurse/9.png
index cd8066ddf..cd8066ddf 100644
--- a/graphics/map_objects/pics/people/nurse/9.png
+++ b/graphics/event_objects/pics/people/nurse/9.png
diff --git a/graphics/map_objects/pics/people/old_man_1/0.png b/graphics/event_objects/pics/people/old_man_1/0.png
index a73cc5877..a73cc5877 100644
--- a/graphics/map_objects/pics/people/old_man_1/0.png
+++ b/graphics/event_objects/pics/people/old_man_1/0.png
diff --git a/graphics/map_objects/pics/people/old_man_1/1.png b/graphics/event_objects/pics/people/old_man_1/1.png
index a0f7bbe64..a0f7bbe64 100644
--- a/graphics/map_objects/pics/people/old_man_1/1.png
+++ b/graphics/event_objects/pics/people/old_man_1/1.png
diff --git a/graphics/map_objects/pics/people/old_man_1/2.png b/graphics/event_objects/pics/people/old_man_1/2.png
index 9b8a3060b..9b8a3060b 100644
--- a/graphics/map_objects/pics/people/old_man_1/2.png
+++ b/graphics/event_objects/pics/people/old_man_1/2.png
diff --git a/graphics/map_objects/pics/people/old_man_1/3.png b/graphics/event_objects/pics/people/old_man_1/3.png
index db0462886..db0462886 100644
--- a/graphics/map_objects/pics/people/old_man_1/3.png
+++ b/graphics/event_objects/pics/people/old_man_1/3.png
diff --git a/graphics/map_objects/pics/people/old_man_1/4.png b/graphics/event_objects/pics/people/old_man_1/4.png
index 9fb0a1c55..9fb0a1c55 100644
--- a/graphics/map_objects/pics/people/old_man_1/4.png
+++ b/graphics/event_objects/pics/people/old_man_1/4.png
diff --git a/graphics/map_objects/pics/people/old_man_1/5.png b/graphics/event_objects/pics/people/old_man_1/5.png
index bac4bfd20..bac4bfd20 100644
--- a/graphics/map_objects/pics/people/old_man_1/5.png
+++ b/graphics/event_objects/pics/people/old_man_1/5.png
diff --git a/graphics/map_objects/pics/people/old_man_1/6.png b/graphics/event_objects/pics/people/old_man_1/6.png
index 8fa8bd93b..8fa8bd93b 100644
--- a/graphics/map_objects/pics/people/old_man_1/6.png
+++ b/graphics/event_objects/pics/people/old_man_1/6.png
diff --git a/graphics/map_objects/pics/people/old_man_1/7.png b/graphics/event_objects/pics/people/old_man_1/7.png
index 72ee8b1b7..72ee8b1b7 100644
--- a/graphics/map_objects/pics/people/old_man_1/7.png
+++ b/graphics/event_objects/pics/people/old_man_1/7.png
diff --git a/graphics/map_objects/pics/people/old_man_1/8.png b/graphics/event_objects/pics/people/old_man_1/8.png
index 47d81e333..47d81e333 100644
--- a/graphics/map_objects/pics/people/old_man_1/8.png
+++ b/graphics/event_objects/pics/people/old_man_1/8.png
diff --git a/graphics/map_objects/pics/people/old_man_2/0.png b/graphics/event_objects/pics/people/old_man_2/0.png
index 095c0e936..095c0e936 100644
--- a/graphics/map_objects/pics/people/old_man_2/0.png
+++ b/graphics/event_objects/pics/people/old_man_2/0.png
diff --git a/graphics/map_objects/pics/people/old_man_2/1.png b/graphics/event_objects/pics/people/old_man_2/1.png
index 683cecc20..683cecc20 100644
--- a/graphics/map_objects/pics/people/old_man_2/1.png
+++ b/graphics/event_objects/pics/people/old_man_2/1.png
diff --git a/graphics/map_objects/pics/people/old_man_2/2.png b/graphics/event_objects/pics/people/old_man_2/2.png
index 31ccdbd11..31ccdbd11 100644
--- a/graphics/map_objects/pics/people/old_man_2/2.png
+++ b/graphics/event_objects/pics/people/old_man_2/2.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/0.png b/graphics/event_objects/pics/people/old_woman_1/0.png
index 8498de6cd..8498de6cd 100644
--- a/graphics/map_objects/pics/people/old_woman_1/0.png
+++ b/graphics/event_objects/pics/people/old_woman_1/0.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/1.png b/graphics/event_objects/pics/people/old_woman_1/1.png
index bb90a3425..bb90a3425 100644
--- a/graphics/map_objects/pics/people/old_woman_1/1.png
+++ b/graphics/event_objects/pics/people/old_woman_1/1.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/2.png b/graphics/event_objects/pics/people/old_woman_1/2.png
index a85d926f9..a85d926f9 100644
--- a/graphics/map_objects/pics/people/old_woman_1/2.png
+++ b/graphics/event_objects/pics/people/old_woman_1/2.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/3.png b/graphics/event_objects/pics/people/old_woman_1/3.png
index 40fc7f909..40fc7f909 100644
--- a/graphics/map_objects/pics/people/old_woman_1/3.png
+++ b/graphics/event_objects/pics/people/old_woman_1/3.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/4.png b/graphics/event_objects/pics/people/old_woman_1/4.png
index 6b0df84d6..6b0df84d6 100644
--- a/graphics/map_objects/pics/people/old_woman_1/4.png
+++ b/graphics/event_objects/pics/people/old_woman_1/4.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/5.png b/graphics/event_objects/pics/people/old_woman_1/5.png
index 1355af05f..1355af05f 100644
--- a/graphics/map_objects/pics/people/old_woman_1/5.png
+++ b/graphics/event_objects/pics/people/old_woman_1/5.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/6.png b/graphics/event_objects/pics/people/old_woman_1/6.png
index 27c5656a3..27c5656a3 100644
--- a/graphics/map_objects/pics/people/old_woman_1/6.png
+++ b/graphics/event_objects/pics/people/old_woman_1/6.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/7.png b/graphics/event_objects/pics/people/old_woman_1/7.png
index 642aba402..642aba402 100644
--- a/graphics/map_objects/pics/people/old_woman_1/7.png
+++ b/graphics/event_objects/pics/people/old_woman_1/7.png
diff --git a/graphics/map_objects/pics/people/old_woman_1/8.png b/graphics/event_objects/pics/people/old_woman_1/8.png
index 641ed8234..641ed8234 100644
--- a/graphics/map_objects/pics/people/old_woman_1/8.png
+++ b/graphics/event_objects/pics/people/old_woman_1/8.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/0.png b/graphics/event_objects/pics/people/old_woman_2/0.png
index 5547acfa7..5547acfa7 100644
--- a/graphics/map_objects/pics/people/old_woman_2/0.png
+++ b/graphics/event_objects/pics/people/old_woman_2/0.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/1.png b/graphics/event_objects/pics/people/old_woman_2/1.png
index d3ed6c11a..d3ed6c11a 100644
--- a/graphics/map_objects/pics/people/old_woman_2/1.png
+++ b/graphics/event_objects/pics/people/old_woman_2/1.png
diff --git a/graphics/map_objects/pics/people/old_woman_2/2.png b/graphics/event_objects/pics/people/old_woman_2/2.png
index d99d91ddd..d99d91ddd 100644
--- a/graphics/map_objects/pics/people/old_woman_2/2.png
+++ b/graphics/event_objects/pics/people/old_woman_2/2.png
diff --git a/graphics/map_objects/pics/people/phoebe/0.png b/graphics/event_objects/pics/people/phoebe/0.png
index 06188b539..06188b539 100644
--- a/graphics/map_objects/pics/people/phoebe/0.png
+++ b/graphics/event_objects/pics/people/phoebe/0.png
diff --git a/graphics/map_objects/pics/people/phoebe/1.png b/graphics/event_objects/pics/people/phoebe/1.png
index 505190902..505190902 100644
--- a/graphics/map_objects/pics/people/phoebe/1.png
+++ b/graphics/event_objects/pics/people/phoebe/1.png
diff --git a/graphics/map_objects/pics/people/phoebe/2.png b/graphics/event_objects/pics/people/phoebe/2.png
index a5f66cdbf..a5f66cdbf 100644
--- a/graphics/map_objects/pics/people/phoebe/2.png
+++ b/graphics/event_objects/pics/people/phoebe/2.png
diff --git a/graphics/map_objects/pics/people/picnicker/0.png b/graphics/event_objects/pics/people/picnicker/0.png
index 310170def..310170def 100644
--- a/graphics/map_objects/pics/people/picnicker/0.png
+++ b/graphics/event_objects/pics/people/picnicker/0.png
diff --git a/graphics/map_objects/pics/people/picnicker/1.png b/graphics/event_objects/pics/people/picnicker/1.png
index 9caeb6de2..9caeb6de2 100644
--- a/graphics/map_objects/pics/people/picnicker/1.png
+++ b/graphics/event_objects/pics/people/picnicker/1.png
diff --git a/graphics/map_objects/pics/people/picnicker/2.png b/graphics/event_objects/pics/people/picnicker/2.png
index 17ca91044..17ca91044 100644
--- a/graphics/map_objects/pics/people/picnicker/2.png
+++ b/graphics/event_objects/pics/people/picnicker/2.png
diff --git a/graphics/map_objects/pics/people/picnicker/3.png b/graphics/event_objects/pics/people/picnicker/3.png
index e80ca4b4e..e80ca4b4e 100644
--- a/graphics/map_objects/pics/people/picnicker/3.png
+++ b/graphics/event_objects/pics/people/picnicker/3.png
diff --git a/graphics/map_objects/pics/people/picnicker/4.png b/graphics/event_objects/pics/people/picnicker/4.png
index 1c2ad0709..1c2ad0709 100644
--- a/graphics/map_objects/pics/people/picnicker/4.png
+++ b/graphics/event_objects/pics/people/picnicker/4.png
diff --git a/graphics/map_objects/pics/people/picnicker/5.png b/graphics/event_objects/pics/people/picnicker/5.png
index a5dce80dd..a5dce80dd 100644
--- a/graphics/map_objects/pics/people/picnicker/5.png
+++ b/graphics/event_objects/pics/people/picnicker/5.png
diff --git a/graphics/map_objects/pics/people/picnicker/6.png b/graphics/event_objects/pics/people/picnicker/6.png
index 1895ff667..1895ff667 100644
--- a/graphics/map_objects/pics/people/picnicker/6.png
+++ b/graphics/event_objects/pics/people/picnicker/6.png
diff --git a/graphics/map_objects/pics/people/picnicker/7.png b/graphics/event_objects/pics/people/picnicker/7.png
index 62d0c2f68..62d0c2f68 100644
--- a/graphics/map_objects/pics/people/picnicker/7.png
+++ b/graphics/event_objects/pics/people/picnicker/7.png
diff --git a/graphics/map_objects/pics/people/picnicker/8.png b/graphics/event_objects/pics/people/picnicker/8.png
index 076c2c32b..076c2c32b 100644
--- a/graphics/map_objects/pics/people/picnicker/8.png
+++ b/graphics/event_objects/pics/people/picnicker/8.png
diff --git a/graphics/map_objects/pics/people/prof_birch/0.png b/graphics/event_objects/pics/people/prof_birch/0.png
index 2dbe3bef5..2dbe3bef5 100644
--- a/graphics/map_objects/pics/people/prof_birch/0.png
+++ b/graphics/event_objects/pics/people/prof_birch/0.png
diff --git a/graphics/map_objects/pics/people/prof_birch/1.png b/graphics/event_objects/pics/people/prof_birch/1.png
index b27c2174a..b27c2174a 100644
--- a/graphics/map_objects/pics/people/prof_birch/1.png
+++ b/graphics/event_objects/pics/people/prof_birch/1.png
diff --git a/graphics/map_objects/pics/people/prof_birch/2.png b/graphics/event_objects/pics/people/prof_birch/2.png
index 195a3da01..195a3da01 100644
--- a/graphics/map_objects/pics/people/prof_birch/2.png
+++ b/graphics/event_objects/pics/people/prof_birch/2.png
diff --git a/graphics/map_objects/pics/people/prof_birch/3.png b/graphics/event_objects/pics/people/prof_birch/3.png
index 5f9d2750e..5f9d2750e 100644
--- a/graphics/map_objects/pics/people/prof_birch/3.png
+++ b/graphics/event_objects/pics/people/prof_birch/3.png
diff --git a/graphics/map_objects/pics/people/prof_birch/4.png b/graphics/event_objects/pics/people/prof_birch/4.png
index a44244f15..a44244f15 100644
--- a/graphics/map_objects/pics/people/prof_birch/4.png
+++ b/graphics/event_objects/pics/people/prof_birch/4.png
diff --git a/graphics/map_objects/pics/people/prof_birch/5.png b/graphics/event_objects/pics/people/prof_birch/5.png
index 3c6c16ff1..3c6c16ff1 100644
--- a/graphics/map_objects/pics/people/prof_birch/5.png
+++ b/graphics/event_objects/pics/people/prof_birch/5.png
diff --git a/graphics/map_objects/pics/people/prof_birch/6.png b/graphics/event_objects/pics/people/prof_birch/6.png
index 802b89fd6..802b89fd6 100644
--- a/graphics/map_objects/pics/people/prof_birch/6.png
+++ b/graphics/event_objects/pics/people/prof_birch/6.png
diff --git a/graphics/map_objects/pics/people/prof_birch/7.png b/graphics/event_objects/pics/people/prof_birch/7.png
index 59af318a2..59af318a2 100644
--- a/graphics/map_objects/pics/people/prof_birch/7.png
+++ b/graphics/event_objects/pics/people/prof_birch/7.png
diff --git a/graphics/map_objects/pics/people/prof_birch/8.png b/graphics/event_objects/pics/people/prof_birch/8.png
index 0a936308a..0a936308a 100644
--- a/graphics/map_objects/pics/people/prof_birch/8.png
+++ b/graphics/event_objects/pics/people/prof_birch/8.png
diff --git a/graphics/map_objects/pics/people/psychic_m/0.png b/graphics/event_objects/pics/people/psychic_m/0.png
index 099e65aa1..099e65aa1 100644
--- a/graphics/map_objects/pics/people/psychic_m/0.png
+++ b/graphics/event_objects/pics/people/psychic_m/0.png
diff --git a/graphics/map_objects/pics/people/psychic_m/1.png b/graphics/event_objects/pics/people/psychic_m/1.png
index 6203b8f3a..6203b8f3a 100644
--- a/graphics/map_objects/pics/people/psychic_m/1.png
+++ b/graphics/event_objects/pics/people/psychic_m/1.png
diff --git a/graphics/map_objects/pics/people/psychic_m/2.png b/graphics/event_objects/pics/people/psychic_m/2.png
index 00f19c8c3..00f19c8c3 100644
--- a/graphics/map_objects/pics/people/psychic_m/2.png
+++ b/graphics/event_objects/pics/people/psychic_m/2.png
diff --git a/graphics/map_objects/pics/people/psychic_m/3.png b/graphics/event_objects/pics/people/psychic_m/3.png
index ec8733d45..ec8733d45 100644
--- a/graphics/map_objects/pics/people/psychic_m/3.png
+++ b/graphics/event_objects/pics/people/psychic_m/3.png
diff --git a/graphics/map_objects/pics/people/psychic_m/4.png b/graphics/event_objects/pics/people/psychic_m/4.png
index 7a2f06947..7a2f06947 100644
--- a/graphics/map_objects/pics/people/psychic_m/4.png
+++ b/graphics/event_objects/pics/people/psychic_m/4.png
diff --git a/graphics/map_objects/pics/people/psychic_m/5.png b/graphics/event_objects/pics/people/psychic_m/5.png
index 64133327d..64133327d 100644
--- a/graphics/map_objects/pics/people/psychic_m/5.png
+++ b/graphics/event_objects/pics/people/psychic_m/5.png
diff --git a/graphics/map_objects/pics/people/psychic_m/6.png b/graphics/event_objects/pics/people/psychic_m/6.png
index 7c55b4f4d..7c55b4f4d 100644
--- a/graphics/map_objects/pics/people/psychic_m/6.png
+++ b/graphics/event_objects/pics/people/psychic_m/6.png
diff --git a/graphics/map_objects/pics/people/psychic_m/7.png b/graphics/event_objects/pics/people/psychic_m/7.png
index 134953f5c..134953f5c 100644
--- a/graphics/map_objects/pics/people/psychic_m/7.png
+++ b/graphics/event_objects/pics/people/psychic_m/7.png
diff --git a/graphics/map_objects/pics/people/psychic_m/8.png b/graphics/event_objects/pics/people/psychic_m/8.png
index 79ea167fe..79ea167fe 100644
--- a/graphics/map_objects/pics/people/psychic_m/8.png
+++ b/graphics/event_objects/pics/people/psychic_m/8.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/0.png b/graphics/event_objects/pics/people/quinty_plump/0.png
index 7a29230f4..7a29230f4 100644
--- a/graphics/map_objects/pics/people/quinty_plump/0.png
+++ b/graphics/event_objects/pics/people/quinty_plump/0.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/1.png b/graphics/event_objects/pics/people/quinty_plump/1.png
index 6fbd85a26..6fbd85a26 100644
--- a/graphics/map_objects/pics/people/quinty_plump/1.png
+++ b/graphics/event_objects/pics/people/quinty_plump/1.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/2.png b/graphics/event_objects/pics/people/quinty_plump/2.png
index 238f0a55c..238f0a55c 100644
--- a/graphics/map_objects/pics/people/quinty_plump/2.png
+++ b/graphics/event_objects/pics/people/quinty_plump/2.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/3.png b/graphics/event_objects/pics/people/quinty_plump/3.png
index d1cb5d7e7..d1cb5d7e7 100644
--- a/graphics/map_objects/pics/people/quinty_plump/3.png
+++ b/graphics/event_objects/pics/people/quinty_plump/3.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/4.png b/graphics/event_objects/pics/people/quinty_plump/4.png
index 4afac2056..4afac2056 100644
--- a/graphics/map_objects/pics/people/quinty_plump/4.png
+++ b/graphics/event_objects/pics/people/quinty_plump/4.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/5.png b/graphics/event_objects/pics/people/quinty_plump/5.png
index 9f9404aef..9f9404aef 100644
--- a/graphics/map_objects/pics/people/quinty_plump/5.png
+++ b/graphics/event_objects/pics/people/quinty_plump/5.png
diff --git a/graphics/map_objects/pics/people/quinty_plump/6.png b/graphics/event_objects/pics/people/quinty_plump/6.png
index 11316499c..11316499c 100644
--- a/graphics/map_objects/pics/people/quinty_plump/6.png
+++ b/graphics/event_objects/pics/people/quinty_plump/6.png
diff --git a/graphics/map_objects/pics/people/reporter_f/0.png b/graphics/event_objects/pics/people/reporter_f/0.png
index d22968ddd..d22968ddd 100644
--- a/graphics/map_objects/pics/people/reporter_f/0.png
+++ b/graphics/event_objects/pics/people/reporter_f/0.png
diff --git a/graphics/map_objects/pics/people/reporter_f/1.png b/graphics/event_objects/pics/people/reporter_f/1.png
index fb29ac66f..fb29ac66f 100644
--- a/graphics/map_objects/pics/people/reporter_f/1.png
+++ b/graphics/event_objects/pics/people/reporter_f/1.png
diff --git a/graphics/map_objects/pics/people/reporter_f/2.png b/graphics/event_objects/pics/people/reporter_f/2.png
index 4ac633368..4ac633368 100644
--- a/graphics/map_objects/pics/people/reporter_f/2.png
+++ b/graphics/event_objects/pics/people/reporter_f/2.png
diff --git a/graphics/map_objects/pics/people/reporter_f/3.png b/graphics/event_objects/pics/people/reporter_f/3.png
index 3fc93ee7f..3fc93ee7f 100644
--- a/graphics/map_objects/pics/people/reporter_f/3.png
+++ b/graphics/event_objects/pics/people/reporter_f/3.png
diff --git a/graphics/map_objects/pics/people/reporter_f/4.png b/graphics/event_objects/pics/people/reporter_f/4.png
index fa20a54c8..fa20a54c8 100644
--- a/graphics/map_objects/pics/people/reporter_f/4.png
+++ b/graphics/event_objects/pics/people/reporter_f/4.png
diff --git a/graphics/map_objects/pics/people/reporter_f/5.png b/graphics/event_objects/pics/people/reporter_f/5.png
index 015575483..015575483 100644
--- a/graphics/map_objects/pics/people/reporter_f/5.png
+++ b/graphics/event_objects/pics/people/reporter_f/5.png
diff --git a/graphics/map_objects/pics/people/reporter_f/6.png b/graphics/event_objects/pics/people/reporter_f/6.png
index e2c9d3d11..e2c9d3d11 100644
--- a/graphics/map_objects/pics/people/reporter_f/6.png
+++ b/graphics/event_objects/pics/people/reporter_f/6.png
diff --git a/graphics/map_objects/pics/people/reporter_f/7.png b/graphics/event_objects/pics/people/reporter_f/7.png
index 1b986e616..1b986e616 100644
--- a/graphics/map_objects/pics/people/reporter_f/7.png
+++ b/graphics/event_objects/pics/people/reporter_f/7.png
diff --git a/graphics/map_objects/pics/people/reporter_f/8.png b/graphics/event_objects/pics/people/reporter_f/8.png
index d1dfc31a6..d1dfc31a6 100644
--- a/graphics/map_objects/pics/people/reporter_f/8.png
+++ b/graphics/event_objects/pics/people/reporter_f/8.png
diff --git a/graphics/map_objects/pics/people/reporter_m/0.png b/graphics/event_objects/pics/people/reporter_m/0.png
index b052abfee..b052abfee 100644
--- a/graphics/map_objects/pics/people/reporter_m/0.png
+++ b/graphics/event_objects/pics/people/reporter_m/0.png
diff --git a/graphics/map_objects/pics/people/reporter_m/1.png b/graphics/event_objects/pics/people/reporter_m/1.png
index 0a273f5aa..0a273f5aa 100644
--- a/graphics/map_objects/pics/people/reporter_m/1.png
+++ b/graphics/event_objects/pics/people/reporter_m/1.png
diff --git a/graphics/map_objects/pics/people/reporter_m/2.png b/graphics/event_objects/pics/people/reporter_m/2.png
index a47cef17b..a47cef17b 100644
--- a/graphics/map_objects/pics/people/reporter_m/2.png
+++ b/graphics/event_objects/pics/people/reporter_m/2.png
diff --git a/graphics/map_objects/pics/people/reporter_m/3.png b/graphics/event_objects/pics/people/reporter_m/3.png
index 780f128b3..780f128b3 100644
--- a/graphics/map_objects/pics/people/reporter_m/3.png
+++ b/graphics/event_objects/pics/people/reporter_m/3.png
diff --git a/graphics/map_objects/pics/people/reporter_m/4.png b/graphics/event_objects/pics/people/reporter_m/4.png
index cb57002ab..cb57002ab 100644
--- a/graphics/map_objects/pics/people/reporter_m/4.png
+++ b/graphics/event_objects/pics/people/reporter_m/4.png
diff --git a/graphics/map_objects/pics/people/reporter_m/5.png b/graphics/event_objects/pics/people/reporter_m/5.png
index 6f488296c..6f488296c 100644
--- a/graphics/map_objects/pics/people/reporter_m/5.png
+++ b/graphics/event_objects/pics/people/reporter_m/5.png
diff --git a/graphics/map_objects/pics/people/reporter_m/6.png b/graphics/event_objects/pics/people/reporter_m/6.png
index 4aad5d2c6..4aad5d2c6 100644
--- a/graphics/map_objects/pics/people/reporter_m/6.png
+++ b/graphics/event_objects/pics/people/reporter_m/6.png
diff --git a/graphics/map_objects/pics/people/reporter_m/7.png b/graphics/event_objects/pics/people/reporter_m/7.png
index 7ac1d360d..7ac1d360d 100644
--- a/graphics/map_objects/pics/people/reporter_m/7.png
+++ b/graphics/event_objects/pics/people/reporter_m/7.png
diff --git a/graphics/map_objects/pics/people/reporter_m/8.png b/graphics/event_objects/pics/people/reporter_m/8.png
index 25b07efb4..25b07efb4 100644
--- a/graphics/map_objects/pics/people/reporter_m/8.png
+++ b/graphics/event_objects/pics/people/reporter_m/8.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png
index f73f91631..f73f91631 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/0.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/0.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png
index 855079988..855079988 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/1.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/1.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png
index 643eb4eb2..643eb4eb2 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/2.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/2.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png
index dbea9b53c..dbea9b53c 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/3.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/3.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png
index d6bbc98b8..d6bbc98b8 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/4.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/4.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png
index bd99cf10f..bd99cf10f 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/5.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/5.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png
index c5c447997..c5c447997 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/6.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/6.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png
index 64b7691c4..64b7691c4 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/7.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/7.png
diff --git a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png
index b588d2b26..b588d2b26 100644
--- a/graphics/map_objects/pics/people/rooftop_sale_woman/8.png
+++ b/graphics/event_objects/pics/people/rooftop_sale_woman/8.png
diff --git a/graphics/map_objects/pics/people/roxanne/0.png b/graphics/event_objects/pics/people/roxanne/0.png
index 0a73a0723..0a73a0723 100644
--- a/graphics/map_objects/pics/people/roxanne/0.png
+++ b/graphics/event_objects/pics/people/roxanne/0.png
diff --git a/graphics/map_objects/pics/people/roxanne/1.png b/graphics/event_objects/pics/people/roxanne/1.png
index 133f097bf..133f097bf 100644
--- a/graphics/map_objects/pics/people/roxanne/1.png
+++ b/graphics/event_objects/pics/people/roxanne/1.png
diff --git a/graphics/map_objects/pics/people/roxanne/2.png b/graphics/event_objects/pics/people/roxanne/2.png
index 946765eb2..946765eb2 100644
--- a/graphics/map_objects/pics/people/roxanne/2.png
+++ b/graphics/event_objects/pics/people/roxanne/2.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/0.png b/graphics/event_objects/pics/people/running_triathlete_f/0.png
index 195edef7b..195edef7b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/0.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/0.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/1.png b/graphics/event_objects/pics/people/running_triathlete_f/1.png
index 1a7069621..1a7069621 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/1.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/1.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/2.png b/graphics/event_objects/pics/people/running_triathlete_f/2.png
index aab9ca24b..aab9ca24b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/2.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/2.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/3.png b/graphics/event_objects/pics/people/running_triathlete_f/3.png
index 909fc0f60..909fc0f60 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/3.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/3.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/4.png b/graphics/event_objects/pics/people/running_triathlete_f/4.png
index 301d13d09..301d13d09 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/4.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/4.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/5.png b/graphics/event_objects/pics/people/running_triathlete_f/5.png
index 84914d619..84914d619 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/5.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/5.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/6.png b/graphics/event_objects/pics/people/running_triathlete_f/6.png
index 9ee690631..9ee690631 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/6.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/6.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/7.png b/graphics/event_objects/pics/people/running_triathlete_f/7.png
index 2441def63..2441def63 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/7.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/7.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_f/8.png b/graphics/event_objects/pics/people/running_triathlete_f/8.png
index a96d1e221..a96d1e221 100644
--- a/graphics/map_objects/pics/people/running_triathlete_f/8.png
+++ b/graphics/event_objects/pics/people/running_triathlete_f/8.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/0.png b/graphics/event_objects/pics/people/running_triathlete_m/0.png
index 0d02be87e..0d02be87e 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/0.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/0.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/1.png b/graphics/event_objects/pics/people/running_triathlete_m/1.png
index 21e2fdf11..21e2fdf11 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/1.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/1.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/2.png b/graphics/event_objects/pics/people/running_triathlete_m/2.png
index d571938e3..d571938e3 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/2.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/2.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/3.png b/graphics/event_objects/pics/people/running_triathlete_m/3.png
index f60cc6b5b..f60cc6b5b 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/3.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/3.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/4.png b/graphics/event_objects/pics/people/running_triathlete_m/4.png
index 6ec60997a..6ec60997a 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/4.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/4.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/5.png b/graphics/event_objects/pics/people/running_triathlete_m/5.png
index 4f5742f1a..4f5742f1a 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/5.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/5.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/6.png b/graphics/event_objects/pics/people/running_triathlete_m/6.png
index be048ac7e..be048ac7e 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/6.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/6.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/7.png b/graphics/event_objects/pics/people/running_triathlete_m/7.png
index 9a972be67..9a972be67 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/7.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/7.png
diff --git a/graphics/map_objects/pics/people/running_triathlete_m/8.png b/graphics/event_objects/pics/people/running_triathlete_m/8.png
index 18ea0d178..18ea0d178 100644
--- a/graphics/map_objects/pics/people/running_triathlete_m/8.png
+++ b/graphics/event_objects/pics/people/running_triathlete_m/8.png
diff --git a/graphics/map_objects/pics/people/sailor/0.png b/graphics/event_objects/pics/people/sailor/0.png
index 8dc44669a..8dc44669a 100644
--- a/graphics/map_objects/pics/people/sailor/0.png
+++ b/graphics/event_objects/pics/people/sailor/0.png
diff --git a/graphics/map_objects/pics/people/sailor/1.png b/graphics/event_objects/pics/people/sailor/1.png
index 8cb9ba620..8cb9ba620 100644
--- a/graphics/map_objects/pics/people/sailor/1.png
+++ b/graphics/event_objects/pics/people/sailor/1.png
diff --git a/graphics/map_objects/pics/people/sailor/2.png b/graphics/event_objects/pics/people/sailor/2.png
index 34a832cbf..34a832cbf 100644
--- a/graphics/map_objects/pics/people/sailor/2.png
+++ b/graphics/event_objects/pics/people/sailor/2.png
diff --git a/graphics/map_objects/pics/people/sailor/3.png b/graphics/event_objects/pics/people/sailor/3.png
index 1ad0918a8..1ad0918a8 100644
--- a/graphics/map_objects/pics/people/sailor/3.png
+++ b/graphics/event_objects/pics/people/sailor/3.png
diff --git a/graphics/map_objects/pics/people/sailor/4.png b/graphics/event_objects/pics/people/sailor/4.png
index 623c42211..623c42211 100644
--- a/graphics/map_objects/pics/people/sailor/4.png
+++ b/graphics/event_objects/pics/people/sailor/4.png
diff --git a/graphics/map_objects/pics/people/sailor/5.png b/graphics/event_objects/pics/people/sailor/5.png
index 01795d75f..01795d75f 100644
--- a/graphics/map_objects/pics/people/sailor/5.png
+++ b/graphics/event_objects/pics/people/sailor/5.png
diff --git a/graphics/map_objects/pics/people/sailor/6.png b/graphics/event_objects/pics/people/sailor/6.png
index a3babaa42..a3babaa42 100644
--- a/graphics/map_objects/pics/people/sailor/6.png
+++ b/graphics/event_objects/pics/people/sailor/6.png
diff --git a/graphics/map_objects/pics/people/sailor/7.png b/graphics/event_objects/pics/people/sailor/7.png
index 08abf8a71..08abf8a71 100644
--- a/graphics/map_objects/pics/people/sailor/7.png
+++ b/graphics/event_objects/pics/people/sailor/7.png
diff --git a/graphics/map_objects/pics/people/sailor/8.png b/graphics/event_objects/pics/people/sailor/8.png
index f7d2ec655..f7d2ec655 100644
--- a/graphics/map_objects/pics/people/sailor/8.png
+++ b/graphics/event_objects/pics/people/sailor/8.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/0.png b/graphics/event_objects/pics/people/school_kid_m/0.png
index 3f700ffaf..3f700ffaf 100644
--- a/graphics/map_objects/pics/people/school_kid_m/0.png
+++ b/graphics/event_objects/pics/people/school_kid_m/0.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/1.png b/graphics/event_objects/pics/people/school_kid_m/1.png
index c47d69d34..c47d69d34 100644
--- a/graphics/map_objects/pics/people/school_kid_m/1.png
+++ b/graphics/event_objects/pics/people/school_kid_m/1.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/2.png b/graphics/event_objects/pics/people/school_kid_m/2.png
index b4116862b..b4116862b 100644
--- a/graphics/map_objects/pics/people/school_kid_m/2.png
+++ b/graphics/event_objects/pics/people/school_kid_m/2.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/3.png b/graphics/event_objects/pics/people/school_kid_m/3.png
index 078ce5bc4..078ce5bc4 100644
--- a/graphics/map_objects/pics/people/school_kid_m/3.png
+++ b/graphics/event_objects/pics/people/school_kid_m/3.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/4.png b/graphics/event_objects/pics/people/school_kid_m/4.png
index 330979128..330979128 100644
--- a/graphics/map_objects/pics/people/school_kid_m/4.png
+++ b/graphics/event_objects/pics/people/school_kid_m/4.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/5.png b/graphics/event_objects/pics/people/school_kid_m/5.png
index 44ab9e8aa..44ab9e8aa 100644
--- a/graphics/map_objects/pics/people/school_kid_m/5.png
+++ b/graphics/event_objects/pics/people/school_kid_m/5.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/6.png b/graphics/event_objects/pics/people/school_kid_m/6.png
index ba20fc113..ba20fc113 100644
--- a/graphics/map_objects/pics/people/school_kid_m/6.png
+++ b/graphics/event_objects/pics/people/school_kid_m/6.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/7.png b/graphics/event_objects/pics/people/school_kid_m/7.png
index c4a5444e0..c4a5444e0 100644
--- a/graphics/map_objects/pics/people/school_kid_m/7.png
+++ b/graphics/event_objects/pics/people/school_kid_m/7.png
diff --git a/graphics/map_objects/pics/people/school_kid_m/8.png b/graphics/event_objects/pics/people/school_kid_m/8.png
index 047b340fb..047b340fb 100644
--- a/graphics/map_objects/pics/people/school_kid_m/8.png
+++ b/graphics/event_objects/pics/people/school_kid_m/8.png
diff --git a/graphics/map_objects/pics/people/scientist_1/0.png b/graphics/event_objects/pics/people/scientist_1/0.png
index ef85b5985..ef85b5985 100644
--- a/graphics/map_objects/pics/people/scientist_1/0.png
+++ b/graphics/event_objects/pics/people/scientist_1/0.png
diff --git a/graphics/map_objects/pics/people/scientist_1/1.png b/graphics/event_objects/pics/people/scientist_1/1.png
index 2a2ade370..2a2ade370 100644
--- a/graphics/map_objects/pics/people/scientist_1/1.png
+++ b/graphics/event_objects/pics/people/scientist_1/1.png
diff --git a/graphics/map_objects/pics/people/scientist_1/2.png b/graphics/event_objects/pics/people/scientist_1/2.png
index 6d3e31618..6d3e31618 100644
--- a/graphics/map_objects/pics/people/scientist_1/2.png
+++ b/graphics/event_objects/pics/people/scientist_1/2.png
diff --git a/graphics/map_objects/pics/people/scientist_1/3.png b/graphics/event_objects/pics/people/scientist_1/3.png
index 433dd879d..433dd879d 100644
--- a/graphics/map_objects/pics/people/scientist_1/3.png
+++ b/graphics/event_objects/pics/people/scientist_1/3.png
diff --git a/graphics/map_objects/pics/people/scientist_1/4.png b/graphics/event_objects/pics/people/scientist_1/4.png
index 3c0594e4f..3c0594e4f 100644
--- a/graphics/map_objects/pics/people/scientist_1/4.png
+++ b/graphics/event_objects/pics/people/scientist_1/4.png
diff --git a/graphics/map_objects/pics/people/scientist_1/5.png b/graphics/event_objects/pics/people/scientist_1/5.png
index 12fdc5c84..12fdc5c84 100644
--- a/graphics/map_objects/pics/people/scientist_1/5.png
+++ b/graphics/event_objects/pics/people/scientist_1/5.png
diff --git a/graphics/map_objects/pics/people/scientist_1/6.png b/graphics/event_objects/pics/people/scientist_1/6.png
index 6ea4c5577..6ea4c5577 100644
--- a/graphics/map_objects/pics/people/scientist_1/6.png
+++ b/graphics/event_objects/pics/people/scientist_1/6.png
diff --git a/graphics/map_objects/pics/people/scientist_1/7.png b/graphics/event_objects/pics/people/scientist_1/7.png
index 7496fcc98..7496fcc98 100644
--- a/graphics/map_objects/pics/people/scientist_1/7.png
+++ b/graphics/event_objects/pics/people/scientist_1/7.png
diff --git a/graphics/map_objects/pics/people/scientist_1/8.png b/graphics/event_objects/pics/people/scientist_1/8.png
index 7487b1b46..7487b1b46 100644
--- a/graphics/map_objects/pics/people/scientist_1/8.png
+++ b/graphics/event_objects/pics/people/scientist_1/8.png
diff --git a/graphics/map_objects/pics/people/scientist_2/0.png b/graphics/event_objects/pics/people/scientist_2/0.png
index 0a2f65a81..0a2f65a81 100644
--- a/graphics/map_objects/pics/people/scientist_2/0.png
+++ b/graphics/event_objects/pics/people/scientist_2/0.png
diff --git a/graphics/map_objects/pics/people/scientist_2/1.png b/graphics/event_objects/pics/people/scientist_2/1.png
index c7ef46ca1..c7ef46ca1 100644
--- a/graphics/map_objects/pics/people/scientist_2/1.png
+++ b/graphics/event_objects/pics/people/scientist_2/1.png
diff --git a/graphics/map_objects/pics/people/scientist_2/2.png b/graphics/event_objects/pics/people/scientist_2/2.png
index 3e8d2f530..3e8d2f530 100644
--- a/graphics/map_objects/pics/people/scientist_2/2.png
+++ b/graphics/event_objects/pics/people/scientist_2/2.png
diff --git a/graphics/map_objects/pics/people/scientist_2/3.png b/graphics/event_objects/pics/people/scientist_2/3.png
index 9c3f70989..9c3f70989 100644
--- a/graphics/map_objects/pics/people/scientist_2/3.png
+++ b/graphics/event_objects/pics/people/scientist_2/3.png
diff --git a/graphics/map_objects/pics/people/scientist_2/4.png b/graphics/event_objects/pics/people/scientist_2/4.png
index 28ac9b4cb..28ac9b4cb 100644
--- a/graphics/map_objects/pics/people/scientist_2/4.png
+++ b/graphics/event_objects/pics/people/scientist_2/4.png
diff --git a/graphics/map_objects/pics/people/scientist_2/5.png b/graphics/event_objects/pics/people/scientist_2/5.png
index 836241dc9..836241dc9 100644
--- a/graphics/map_objects/pics/people/scientist_2/5.png
+++ b/graphics/event_objects/pics/people/scientist_2/5.png
diff --git a/graphics/map_objects/pics/people/scientist_2/6.png b/graphics/event_objects/pics/people/scientist_2/6.png
index 894ba989e..894ba989e 100644
--- a/graphics/map_objects/pics/people/scientist_2/6.png
+++ b/graphics/event_objects/pics/people/scientist_2/6.png
diff --git a/graphics/map_objects/pics/people/scientist_2/7.png b/graphics/event_objects/pics/people/scientist_2/7.png
index b3176d10e..b3176d10e 100644
--- a/graphics/map_objects/pics/people/scientist_2/7.png
+++ b/graphics/event_objects/pics/people/scientist_2/7.png
diff --git a/graphics/map_objects/pics/people/scientist_2/8.png b/graphics/event_objects/pics/people/scientist_2/8.png
index 4666c2f9a..4666c2f9a 100644
--- a/graphics/map_objects/pics/people/scientist_2/8.png
+++ b/graphics/event_objects/pics/people/scientist_2/8.png
diff --git a/graphics/map_objects/pics/people/sidney/0.png b/graphics/event_objects/pics/people/sidney/0.png
index abbbcd3fb..abbbcd3fb 100644
--- a/graphics/map_objects/pics/people/sidney/0.png
+++ b/graphics/event_objects/pics/people/sidney/0.png
diff --git a/graphics/map_objects/pics/people/sidney/1.png b/graphics/event_objects/pics/people/sidney/1.png
index e13e8ef32..e13e8ef32 100644
--- a/graphics/map_objects/pics/people/sidney/1.png
+++ b/graphics/event_objects/pics/people/sidney/1.png
diff --git a/graphics/map_objects/pics/people/sidney/2.png b/graphics/event_objects/pics/people/sidney/2.png
index 8c6d51434..8c6d51434 100644
--- a/graphics/map_objects/pics/people/sidney/2.png
+++ b/graphics/event_objects/pics/people/sidney/2.png
diff --git a/graphics/map_objects/pics/people/steven/0.png b/graphics/event_objects/pics/people/steven/0.png
index 35cc4d404..35cc4d404 100644
--- a/graphics/map_objects/pics/people/steven/0.png
+++ b/graphics/event_objects/pics/people/steven/0.png
diff --git a/graphics/map_objects/pics/people/steven/1.png b/graphics/event_objects/pics/people/steven/1.png
index 37a8367ea..37a8367ea 100644
--- a/graphics/map_objects/pics/people/steven/1.png
+++ b/graphics/event_objects/pics/people/steven/1.png
diff --git a/graphics/map_objects/pics/people/steven/2.png b/graphics/event_objects/pics/people/steven/2.png
index 4d0447529..4d0447529 100644
--- a/graphics/map_objects/pics/people/steven/2.png
+++ b/graphics/event_objects/pics/people/steven/2.png
diff --git a/graphics/map_objects/pics/people/steven/3.png b/graphics/event_objects/pics/people/steven/3.png
index b2094c8b6..b2094c8b6 100644
--- a/graphics/map_objects/pics/people/steven/3.png
+++ b/graphics/event_objects/pics/people/steven/3.png
diff --git a/graphics/map_objects/pics/people/steven/4.png b/graphics/event_objects/pics/people/steven/4.png
index d47448bc8..d47448bc8 100644
--- a/graphics/map_objects/pics/people/steven/4.png
+++ b/graphics/event_objects/pics/people/steven/4.png
diff --git a/graphics/map_objects/pics/people/steven/5.png b/graphics/event_objects/pics/people/steven/5.png
index e023078ee..e023078ee 100644
--- a/graphics/map_objects/pics/people/steven/5.png
+++ b/graphics/event_objects/pics/people/steven/5.png
diff --git a/graphics/map_objects/pics/people/steven/6.png b/graphics/event_objects/pics/people/steven/6.png
index fb885a1bd..fb885a1bd 100644
--- a/graphics/map_objects/pics/people/steven/6.png
+++ b/graphics/event_objects/pics/people/steven/6.png
diff --git a/graphics/map_objects/pics/people/steven/7.png b/graphics/event_objects/pics/people/steven/7.png
index ee2fbbb5f..ee2fbbb5f 100644
--- a/graphics/map_objects/pics/people/steven/7.png
+++ b/graphics/event_objects/pics/people/steven/7.png
diff --git a/graphics/map_objects/pics/people/steven/8.png b/graphics/event_objects/pics/people/steven/8.png
index e140731cd..e140731cd 100644
--- a/graphics/map_objects/pics/people/steven/8.png
+++ b/graphics/event_objects/pics/people/steven/8.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/0.png b/graphics/event_objects/pics/people/swimmer_f/0.png
index e34972cc7..e34972cc7 100644
--- a/graphics/map_objects/pics/people/swimmer_f/0.png
+++ b/graphics/event_objects/pics/people/swimmer_f/0.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/1.png b/graphics/event_objects/pics/people/swimmer_f/1.png
index 64c3c79e5..64c3c79e5 100644
--- a/graphics/map_objects/pics/people/swimmer_f/1.png
+++ b/graphics/event_objects/pics/people/swimmer_f/1.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/2.png b/graphics/event_objects/pics/people/swimmer_f/2.png
index cf4d17d5d..cf4d17d5d 100644
--- a/graphics/map_objects/pics/people/swimmer_f/2.png
+++ b/graphics/event_objects/pics/people/swimmer_f/2.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/3.png b/graphics/event_objects/pics/people/swimmer_f/3.png
index e8edbc9a6..e8edbc9a6 100644
--- a/graphics/map_objects/pics/people/swimmer_f/3.png
+++ b/graphics/event_objects/pics/people/swimmer_f/3.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/4.png b/graphics/event_objects/pics/people/swimmer_f/4.png
index 1f5abf77e..1f5abf77e 100644
--- a/graphics/map_objects/pics/people/swimmer_f/4.png
+++ b/graphics/event_objects/pics/people/swimmer_f/4.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/5.png b/graphics/event_objects/pics/people/swimmer_f/5.png
index 5e19861cb..5e19861cb 100644
--- a/graphics/map_objects/pics/people/swimmer_f/5.png
+++ b/graphics/event_objects/pics/people/swimmer_f/5.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/6.png b/graphics/event_objects/pics/people/swimmer_f/6.png
index c4b602391..c4b602391 100644
--- a/graphics/map_objects/pics/people/swimmer_f/6.png
+++ b/graphics/event_objects/pics/people/swimmer_f/6.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/7.png b/graphics/event_objects/pics/people/swimmer_f/7.png
index beb17704a..beb17704a 100644
--- a/graphics/map_objects/pics/people/swimmer_f/7.png
+++ b/graphics/event_objects/pics/people/swimmer_f/7.png
diff --git a/graphics/map_objects/pics/people/swimmer_f/8.png b/graphics/event_objects/pics/people/swimmer_f/8.png
index db5588f7c..db5588f7c 100644
--- a/graphics/map_objects/pics/people/swimmer_f/8.png
+++ b/graphics/event_objects/pics/people/swimmer_f/8.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/0.png b/graphics/event_objects/pics/people/swimmer_m/0.png
index 51d63bb26..51d63bb26 100644
--- a/graphics/map_objects/pics/people/swimmer_m/0.png
+++ b/graphics/event_objects/pics/people/swimmer_m/0.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/1.png b/graphics/event_objects/pics/people/swimmer_m/1.png
index d1f976558..d1f976558 100644
--- a/graphics/map_objects/pics/people/swimmer_m/1.png
+++ b/graphics/event_objects/pics/people/swimmer_m/1.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/2.png b/graphics/event_objects/pics/people/swimmer_m/2.png
index b4087efb5..b4087efb5 100644
--- a/graphics/map_objects/pics/people/swimmer_m/2.png
+++ b/graphics/event_objects/pics/people/swimmer_m/2.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/3.png b/graphics/event_objects/pics/people/swimmer_m/3.png
index 4f445b8a8..4f445b8a8 100644
--- a/graphics/map_objects/pics/people/swimmer_m/3.png
+++ b/graphics/event_objects/pics/people/swimmer_m/3.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/4.png b/graphics/event_objects/pics/people/swimmer_m/4.png
index 940e8cf5d..940e8cf5d 100644
--- a/graphics/map_objects/pics/people/swimmer_m/4.png
+++ b/graphics/event_objects/pics/people/swimmer_m/4.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/5.png b/graphics/event_objects/pics/people/swimmer_m/5.png
index d6be697b0..d6be697b0 100644
--- a/graphics/map_objects/pics/people/swimmer_m/5.png
+++ b/graphics/event_objects/pics/people/swimmer_m/5.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/6.png b/graphics/event_objects/pics/people/swimmer_m/6.png
index cb2de823b..cb2de823b 100644
--- a/graphics/map_objects/pics/people/swimmer_m/6.png
+++ b/graphics/event_objects/pics/people/swimmer_m/6.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/7.png b/graphics/event_objects/pics/people/swimmer_m/7.png
index b17892261..b17892261 100644
--- a/graphics/map_objects/pics/people/swimmer_m/7.png
+++ b/graphics/event_objects/pics/people/swimmer_m/7.png
diff --git a/graphics/map_objects/pics/people/swimmer_m/8.png b/graphics/event_objects/pics/people/swimmer_m/8.png
index 1f3fd48d0..1f3fd48d0 100644
--- a/graphics/map_objects/pics/people/swimmer_m/8.png
+++ b/graphics/event_objects/pics/people/swimmer_m/8.png
diff --git a/graphics/map_objects/pics/people/tate/0.png b/graphics/event_objects/pics/people/tate/0.png
index f2481f1e2..f2481f1e2 100644
--- a/graphics/map_objects/pics/people/tate/0.png
+++ b/graphics/event_objects/pics/people/tate/0.png
diff --git a/graphics/map_objects/pics/people/tate/1.png b/graphics/event_objects/pics/people/tate/1.png
index ff1608cf2..ff1608cf2 100644
--- a/graphics/map_objects/pics/people/tate/1.png
+++ b/graphics/event_objects/pics/people/tate/1.png
diff --git a/graphics/map_objects/pics/people/tate/2.png b/graphics/event_objects/pics/people/tate/2.png
index 9fba8459d..9fba8459d 100644
--- a/graphics/map_objects/pics/people/tate/2.png
+++ b/graphics/event_objects/pics/people/tate/2.png
diff --git a/graphics/map_objects/pics/people/teala/0.png b/graphics/event_objects/pics/people/teala/0.png
index 173152306..173152306 100644
--- a/graphics/map_objects/pics/people/teala/0.png
+++ b/graphics/event_objects/pics/people/teala/0.png
diff --git a/graphics/map_objects/pics/people/teala/1.png b/graphics/event_objects/pics/people/teala/1.png
index 2340f3262..2340f3262 100644
--- a/graphics/map_objects/pics/people/teala/1.png
+++ b/graphics/event_objects/pics/people/teala/1.png
diff --git a/graphics/map_objects/pics/people/teala/2.png b/graphics/event_objects/pics/people/teala/2.png
index 1900d9e8d..1900d9e8d 100644
--- a/graphics/map_objects/pics/people/teala/2.png
+++ b/graphics/event_objects/pics/people/teala/2.png
diff --git a/graphics/map_objects/pics/people/teala/3.png b/graphics/event_objects/pics/people/teala/3.png
index f3d46c920..f3d46c920 100644
--- a/graphics/map_objects/pics/people/teala/3.png
+++ b/graphics/event_objects/pics/people/teala/3.png
diff --git a/graphics/map_objects/pics/people/teala/4.png b/graphics/event_objects/pics/people/teala/4.png
index 5b70939b2..5b70939b2 100644
--- a/graphics/map_objects/pics/people/teala/4.png
+++ b/graphics/event_objects/pics/people/teala/4.png
diff --git a/graphics/map_objects/pics/people/teala/5.png b/graphics/event_objects/pics/people/teala/5.png
index fcba35792..fcba35792 100644
--- a/graphics/map_objects/pics/people/teala/5.png
+++ b/graphics/event_objects/pics/people/teala/5.png
diff --git a/graphics/map_objects/pics/people/teala/6.png b/graphics/event_objects/pics/people/teala/6.png
index 85a574bb8..85a574bb8 100644
--- a/graphics/map_objects/pics/people/teala/6.png
+++ b/graphics/event_objects/pics/people/teala/6.png
diff --git a/graphics/map_objects/pics/people/teala/7.png b/graphics/event_objects/pics/people/teala/7.png
index 882d7adca..882d7adca 100644
--- a/graphics/map_objects/pics/people/teala/7.png
+++ b/graphics/event_objects/pics/people/teala/7.png
diff --git a/graphics/map_objects/pics/people/teala/8.png b/graphics/event_objects/pics/people/teala/8.png
index 4366d38f9..4366d38f9 100644
--- a/graphics/map_objects/pics/people/teala/8.png
+++ b/graphics/event_objects/pics/people/teala/8.png
diff --git a/graphics/map_objects/pics/people/tuber_f/0.png b/graphics/event_objects/pics/people/tuber_f/0.png
index 34081dbad..34081dbad 100644
--- a/graphics/map_objects/pics/people/tuber_f/0.png
+++ b/graphics/event_objects/pics/people/tuber_f/0.png
diff --git a/graphics/map_objects/pics/people/tuber_f/1.png b/graphics/event_objects/pics/people/tuber_f/1.png
index 5ad154c38..5ad154c38 100644
--- a/graphics/map_objects/pics/people/tuber_f/1.png
+++ b/graphics/event_objects/pics/people/tuber_f/1.png
diff --git a/graphics/map_objects/pics/people/tuber_f/2.png b/graphics/event_objects/pics/people/tuber_f/2.png
index d87de1307..d87de1307 100644
--- a/graphics/map_objects/pics/people/tuber_f/2.png
+++ b/graphics/event_objects/pics/people/tuber_f/2.png
diff --git a/graphics/map_objects/pics/people/tuber_f/3.png b/graphics/event_objects/pics/people/tuber_f/3.png
index 17ffb8845..17ffb8845 100644
--- a/graphics/map_objects/pics/people/tuber_f/3.png
+++ b/graphics/event_objects/pics/people/tuber_f/3.png
diff --git a/graphics/map_objects/pics/people/tuber_f/4.png b/graphics/event_objects/pics/people/tuber_f/4.png
index 9de7aa0ab..9de7aa0ab 100644
--- a/graphics/map_objects/pics/people/tuber_f/4.png
+++ b/graphics/event_objects/pics/people/tuber_f/4.png
diff --git a/graphics/map_objects/pics/people/tuber_f/5.png b/graphics/event_objects/pics/people/tuber_f/5.png
index 16bd9c685..16bd9c685 100644
--- a/graphics/map_objects/pics/people/tuber_f/5.png
+++ b/graphics/event_objects/pics/people/tuber_f/5.png
diff --git a/graphics/map_objects/pics/people/tuber_f/6.png b/graphics/event_objects/pics/people/tuber_f/6.png
index e026ea45d..e026ea45d 100644
--- a/graphics/map_objects/pics/people/tuber_f/6.png
+++ b/graphics/event_objects/pics/people/tuber_f/6.png
diff --git a/graphics/map_objects/pics/people/tuber_f/7.png b/graphics/event_objects/pics/people/tuber_f/7.png
index fbabc200d..fbabc200d 100644
--- a/graphics/map_objects/pics/people/tuber_f/7.png
+++ b/graphics/event_objects/pics/people/tuber_f/7.png
diff --git a/graphics/map_objects/pics/people/tuber_f/8.png b/graphics/event_objects/pics/people/tuber_f/8.png
index ad08f016b..ad08f016b 100644
--- a/graphics/map_objects/pics/people/tuber_f/8.png
+++ b/graphics/event_objects/pics/people/tuber_f/8.png
diff --git a/graphics/map_objects/pics/people/tuber_m/0.png b/graphics/event_objects/pics/people/tuber_m/0.png
index 323439703..323439703 100644
--- a/graphics/map_objects/pics/people/tuber_m/0.png
+++ b/graphics/event_objects/pics/people/tuber_m/0.png
diff --git a/graphics/map_objects/pics/people/tuber_m/1.png b/graphics/event_objects/pics/people/tuber_m/1.png
index dfce73bbc..dfce73bbc 100644
--- a/graphics/map_objects/pics/people/tuber_m/1.png
+++ b/graphics/event_objects/pics/people/tuber_m/1.png
diff --git a/graphics/map_objects/pics/people/tuber_m/2.png b/graphics/event_objects/pics/people/tuber_m/2.png
index 1b1de564f..1b1de564f 100644
--- a/graphics/map_objects/pics/people/tuber_m/2.png
+++ b/graphics/event_objects/pics/people/tuber_m/2.png
diff --git a/graphics/map_objects/pics/people/tuber_m/3.png b/graphics/event_objects/pics/people/tuber_m/3.png
index 39f37a19b..39f37a19b 100644
--- a/graphics/map_objects/pics/people/tuber_m/3.png
+++ b/graphics/event_objects/pics/people/tuber_m/3.png
diff --git a/graphics/map_objects/pics/people/tuber_m/4.png b/graphics/event_objects/pics/people/tuber_m/4.png
index 78fae1160..78fae1160 100644
--- a/graphics/map_objects/pics/people/tuber_m/4.png
+++ b/graphics/event_objects/pics/people/tuber_m/4.png
diff --git a/graphics/map_objects/pics/people/tuber_m/5.png b/graphics/event_objects/pics/people/tuber_m/5.png
index 690add8ad..690add8ad 100644
--- a/graphics/map_objects/pics/people/tuber_m/5.png
+++ b/graphics/event_objects/pics/people/tuber_m/5.png
diff --git a/graphics/map_objects/pics/people/tuber_m/6.png b/graphics/event_objects/pics/people/tuber_m/6.png
index ff61406b9..ff61406b9 100644
--- a/graphics/map_objects/pics/people/tuber_m/6.png
+++ b/graphics/event_objects/pics/people/tuber_m/6.png
diff --git a/graphics/map_objects/pics/people/tuber_m/7.png b/graphics/event_objects/pics/people/tuber_m/7.png
index d8c7b98cf..d8c7b98cf 100644
--- a/graphics/map_objects/pics/people/tuber_m/7.png
+++ b/graphics/event_objects/pics/people/tuber_m/7.png
diff --git a/graphics/map_objects/pics/people/tuber_m/8.png b/graphics/event_objects/pics/people/tuber_m/8.png
index 4ec4b5599..4ec4b5599 100644
--- a/graphics/map_objects/pics/people/tuber_m/8.png
+++ b/graphics/event_objects/pics/people/tuber_m/8.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/0.png b/graphics/event_objects/pics/people/tuber_m_swimming/0.png
index c6ba83d87..c6ba83d87 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/0.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/0.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/1.png b/graphics/event_objects/pics/people/tuber_m_swimming/1.png
index 85eb42650..85eb42650 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/1.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/1.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/2.png b/graphics/event_objects/pics/people/tuber_m_swimming/2.png
index 1cca717b0..1cca717b0 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/2.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/2.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/3.png b/graphics/event_objects/pics/people/tuber_m_swimming/3.png
index 253d75ed0..253d75ed0 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/3.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/3.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/4.png b/graphics/event_objects/pics/people/tuber_m_swimming/4.png
index d64c9033f..d64c9033f 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/4.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/4.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/5.png b/graphics/event_objects/pics/people/tuber_m_swimming/5.png
index 2a8e7d67d..2a8e7d67d 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/5.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/5.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/6.png b/graphics/event_objects/pics/people/tuber_m_swimming/6.png
index c55acdf29..c55acdf29 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/6.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/6.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/7.png b/graphics/event_objects/pics/people/tuber_m_swimming/7.png
index 7a203920f..7a203920f 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/7.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/7.png
diff --git a/graphics/map_objects/pics/people/tuber_m_swimming/8.png b/graphics/event_objects/pics/people/tuber_m_swimming/8.png
index 321f8acca..321f8acca 100644
--- a/graphics/map_objects/pics/people/tuber_m_swimming/8.png
+++ b/graphics/event_objects/pics/people/tuber_m_swimming/8.png
diff --git a/graphics/map_objects/pics/people/wallace/0.png b/graphics/event_objects/pics/people/wallace/0.png
index a3b4bd5bf..a3b4bd5bf 100644
--- a/graphics/map_objects/pics/people/wallace/0.png
+++ b/graphics/event_objects/pics/people/wallace/0.png
diff --git a/graphics/map_objects/pics/people/wallace/1.png b/graphics/event_objects/pics/people/wallace/1.png
index 583f2a807..583f2a807 100644
--- a/graphics/map_objects/pics/people/wallace/1.png
+++ b/graphics/event_objects/pics/people/wallace/1.png
diff --git a/graphics/map_objects/pics/people/wallace/2.png b/graphics/event_objects/pics/people/wallace/2.png
index 31249d0cd..31249d0cd 100644
--- a/graphics/map_objects/pics/people/wallace/2.png
+++ b/graphics/event_objects/pics/people/wallace/2.png
diff --git a/graphics/map_objects/pics/people/wallace/3.png b/graphics/event_objects/pics/people/wallace/3.png
index 850ec7250..850ec7250 100644
--- a/graphics/map_objects/pics/people/wallace/3.png
+++ b/graphics/event_objects/pics/people/wallace/3.png
diff --git a/graphics/map_objects/pics/people/wallace/4.png b/graphics/event_objects/pics/people/wallace/4.png
index 99e2dd897..99e2dd897 100644
--- a/graphics/map_objects/pics/people/wallace/4.png
+++ b/graphics/event_objects/pics/people/wallace/4.png
diff --git a/graphics/map_objects/pics/people/wallace/5.png b/graphics/event_objects/pics/people/wallace/5.png
index 5923b1b5b..5923b1b5b 100644
--- a/graphics/map_objects/pics/people/wallace/5.png
+++ b/graphics/event_objects/pics/people/wallace/5.png
diff --git a/graphics/map_objects/pics/people/wallace/6.png b/graphics/event_objects/pics/people/wallace/6.png
index 1f2b655c0..1f2b655c0 100644
--- a/graphics/map_objects/pics/people/wallace/6.png
+++ b/graphics/event_objects/pics/people/wallace/6.png
diff --git a/graphics/map_objects/pics/people/wallace/7.png b/graphics/event_objects/pics/people/wallace/7.png
index a56ab6d58..a56ab6d58 100644
--- a/graphics/map_objects/pics/people/wallace/7.png
+++ b/graphics/event_objects/pics/people/wallace/7.png
diff --git a/graphics/map_objects/pics/people/wallace/8.png b/graphics/event_objects/pics/people/wallace/8.png
index b76c611cc..b76c611cc 100644
--- a/graphics/map_objects/pics/people/wallace/8.png
+++ b/graphics/event_objects/pics/people/wallace/8.png
diff --git a/graphics/map_objects/pics/people/wally/0.png b/graphics/event_objects/pics/people/wally/0.png
index b185bc294..b185bc294 100644
--- a/graphics/map_objects/pics/people/wally/0.png
+++ b/graphics/event_objects/pics/people/wally/0.png
diff --git a/graphics/map_objects/pics/people/wally/1.png b/graphics/event_objects/pics/people/wally/1.png
index 42f5a3f0a..42f5a3f0a 100644
--- a/graphics/map_objects/pics/people/wally/1.png
+++ b/graphics/event_objects/pics/people/wally/1.png
diff --git a/graphics/map_objects/pics/people/wally/2.png b/graphics/event_objects/pics/people/wally/2.png
index ed32f1f41..ed32f1f41 100644
--- a/graphics/map_objects/pics/people/wally/2.png
+++ b/graphics/event_objects/pics/people/wally/2.png
diff --git a/graphics/map_objects/pics/people/wally/3.png b/graphics/event_objects/pics/people/wally/3.png
index 5d2213b2c..5d2213b2c 100644
--- a/graphics/map_objects/pics/people/wally/3.png
+++ b/graphics/event_objects/pics/people/wally/3.png
diff --git a/graphics/map_objects/pics/people/wally/4.png b/graphics/event_objects/pics/people/wally/4.png
index af996a72a..af996a72a 100644
--- a/graphics/map_objects/pics/people/wally/4.png
+++ b/graphics/event_objects/pics/people/wally/4.png
diff --git a/graphics/map_objects/pics/people/wally/5.png b/graphics/event_objects/pics/people/wally/5.png
index de23077ce..de23077ce 100644
--- a/graphics/map_objects/pics/people/wally/5.png
+++ b/graphics/event_objects/pics/people/wally/5.png
diff --git a/graphics/map_objects/pics/people/wally/6.png b/graphics/event_objects/pics/people/wally/6.png
index 42397e95e..42397e95e 100644
--- a/graphics/map_objects/pics/people/wally/6.png
+++ b/graphics/event_objects/pics/people/wally/6.png
diff --git a/graphics/map_objects/pics/people/wally/7.png b/graphics/event_objects/pics/people/wally/7.png
index 46dbdfa3b..46dbdfa3b 100644
--- a/graphics/map_objects/pics/people/wally/7.png
+++ b/graphics/event_objects/pics/people/wally/7.png
diff --git a/graphics/map_objects/pics/people/wally/8.png b/graphics/event_objects/pics/people/wally/8.png
index 5b7038b44..5b7038b44 100644
--- a/graphics/map_objects/pics/people/wally/8.png
+++ b/graphics/event_objects/pics/people/wally/8.png
diff --git a/graphics/map_objects/pics/people/wattson/0.png b/graphics/event_objects/pics/people/wattson/0.png
index 28eaa1bf2..28eaa1bf2 100644
--- a/graphics/map_objects/pics/people/wattson/0.png
+++ b/graphics/event_objects/pics/people/wattson/0.png
diff --git a/graphics/map_objects/pics/people/wattson/1.png b/graphics/event_objects/pics/people/wattson/1.png
index b26ab83f4..b26ab83f4 100644
--- a/graphics/map_objects/pics/people/wattson/1.png
+++ b/graphics/event_objects/pics/people/wattson/1.png
diff --git a/graphics/map_objects/pics/people/wattson/2.png b/graphics/event_objects/pics/people/wattson/2.png
index 2d7fe024b..2d7fe024b 100644
--- a/graphics/map_objects/pics/people/wattson/2.png
+++ b/graphics/event_objects/pics/people/wattson/2.png
diff --git a/graphics/map_objects/pics/people/winona/0.png b/graphics/event_objects/pics/people/winona/0.png
index 4df463363..4df463363 100644
--- a/graphics/map_objects/pics/people/winona/0.png
+++ b/graphics/event_objects/pics/people/winona/0.png
diff --git a/graphics/map_objects/pics/people/winona/1.png b/graphics/event_objects/pics/people/winona/1.png
index 75d255c7a..75d255c7a 100644
--- a/graphics/map_objects/pics/people/winona/1.png
+++ b/graphics/event_objects/pics/people/winona/1.png
diff --git a/graphics/map_objects/pics/people/winona/2.png b/graphics/event_objects/pics/people/winona/2.png
index 569dea105..569dea105 100644
--- a/graphics/map_objects/pics/people/winona/2.png
+++ b/graphics/event_objects/pics/people/winona/2.png
diff --git a/graphics/map_objects/pics/people/woman_1/0.png b/graphics/event_objects/pics/people/woman_1/0.png
index cb2949038..cb2949038 100644
--- a/graphics/map_objects/pics/people/woman_1/0.png
+++ b/graphics/event_objects/pics/people/woman_1/0.png
diff --git a/graphics/map_objects/pics/people/woman_1/1.png b/graphics/event_objects/pics/people/woman_1/1.png
index ea8dc9119..ea8dc9119 100644
--- a/graphics/map_objects/pics/people/woman_1/1.png
+++ b/graphics/event_objects/pics/people/woman_1/1.png
diff --git a/graphics/map_objects/pics/people/woman_1/2.png b/graphics/event_objects/pics/people/woman_1/2.png
index b0bd3e1b1..b0bd3e1b1 100644
--- a/graphics/map_objects/pics/people/woman_1/2.png
+++ b/graphics/event_objects/pics/people/woman_1/2.png
diff --git a/graphics/map_objects/pics/people/woman_1/3.png b/graphics/event_objects/pics/people/woman_1/3.png
index e7ed6c112..e7ed6c112 100644
--- a/graphics/map_objects/pics/people/woman_1/3.png
+++ b/graphics/event_objects/pics/people/woman_1/3.png
diff --git a/graphics/map_objects/pics/people/woman_1/4.png b/graphics/event_objects/pics/people/woman_1/4.png
index 05f7e7839..05f7e7839 100644
--- a/graphics/map_objects/pics/people/woman_1/4.png
+++ b/graphics/event_objects/pics/people/woman_1/4.png
diff --git a/graphics/map_objects/pics/people/woman_1/5.png b/graphics/event_objects/pics/people/woman_1/5.png
index e23e364cd..e23e364cd 100644
--- a/graphics/map_objects/pics/people/woman_1/5.png
+++ b/graphics/event_objects/pics/people/woman_1/5.png
diff --git a/graphics/map_objects/pics/people/woman_1/6.png b/graphics/event_objects/pics/people/woman_1/6.png
index a1e6f69ab..a1e6f69ab 100644
--- a/graphics/map_objects/pics/people/woman_1/6.png
+++ b/graphics/event_objects/pics/people/woman_1/6.png
diff --git a/graphics/map_objects/pics/people/woman_1/7.png b/graphics/event_objects/pics/people/woman_1/7.png
index 985172d52..985172d52 100644
--- a/graphics/map_objects/pics/people/woman_1/7.png
+++ b/graphics/event_objects/pics/people/woman_1/7.png
diff --git a/graphics/map_objects/pics/people/woman_1/8.png b/graphics/event_objects/pics/people/woman_1/8.png
index f5e560b59..f5e560b59 100644
--- a/graphics/map_objects/pics/people/woman_1/8.png
+++ b/graphics/event_objects/pics/people/woman_1/8.png
diff --git a/graphics/map_objects/pics/people/woman_2/0.png b/graphics/event_objects/pics/people/woman_2/0.png
index d9656ce73..d9656ce73 100644
--- a/graphics/map_objects/pics/people/woman_2/0.png
+++ b/graphics/event_objects/pics/people/woman_2/0.png
diff --git a/graphics/map_objects/pics/people/woman_2/1.png b/graphics/event_objects/pics/people/woman_2/1.png
index 23d97812b..23d97812b 100644
--- a/graphics/map_objects/pics/people/woman_2/1.png
+++ b/graphics/event_objects/pics/people/woman_2/1.png
diff --git a/graphics/map_objects/pics/people/woman_2/2.png b/graphics/event_objects/pics/people/woman_2/2.png
index f298e6eea..f298e6eea 100644
--- a/graphics/map_objects/pics/people/woman_2/2.png
+++ b/graphics/event_objects/pics/people/woman_2/2.png
diff --git a/graphics/map_objects/pics/people/woman_2/3.png b/graphics/event_objects/pics/people/woman_2/3.png
index 53809fd32..53809fd32 100644
--- a/graphics/map_objects/pics/people/woman_2/3.png
+++ b/graphics/event_objects/pics/people/woman_2/3.png
diff --git a/graphics/map_objects/pics/people/woman_2/4.png b/graphics/event_objects/pics/people/woman_2/4.png
index 8f3fbe35f..8f3fbe35f 100644
--- a/graphics/map_objects/pics/people/woman_2/4.png
+++ b/graphics/event_objects/pics/people/woman_2/4.png
diff --git a/graphics/map_objects/pics/people/woman_2/5.png b/graphics/event_objects/pics/people/woman_2/5.png
index d02680904..d02680904 100644
--- a/graphics/map_objects/pics/people/woman_2/5.png
+++ b/graphics/event_objects/pics/people/woman_2/5.png
diff --git a/graphics/map_objects/pics/people/woman_2/6.png b/graphics/event_objects/pics/people/woman_2/6.png
index 4999cf1b1..4999cf1b1 100644
--- a/graphics/map_objects/pics/people/woman_2/6.png
+++ b/graphics/event_objects/pics/people/woman_2/6.png
diff --git a/graphics/map_objects/pics/people/woman_2/7.png b/graphics/event_objects/pics/people/woman_2/7.png
index 17e669531..17e669531 100644
--- a/graphics/map_objects/pics/people/woman_2/7.png
+++ b/graphics/event_objects/pics/people/woman_2/7.png
diff --git a/graphics/map_objects/pics/people/woman_2/8.png b/graphics/event_objects/pics/people/woman_2/8.png
index f59199574..f59199574 100644
--- a/graphics/map_objects/pics/people/woman_2/8.png
+++ b/graphics/event_objects/pics/people/woman_2/8.png
diff --git a/graphics/map_objects/pics/people/woman_3/0.png b/graphics/event_objects/pics/people/woman_3/0.png
index ac9ed557e..ac9ed557e 100644
--- a/graphics/map_objects/pics/people/woman_3/0.png
+++ b/graphics/event_objects/pics/people/woman_3/0.png
diff --git a/graphics/map_objects/pics/people/woman_3/1.png b/graphics/event_objects/pics/people/woman_3/1.png
index a7dbe7ec3..a7dbe7ec3 100644
--- a/graphics/map_objects/pics/people/woman_3/1.png
+++ b/graphics/event_objects/pics/people/woman_3/1.png
diff --git a/graphics/map_objects/pics/people/woman_3/2.png b/graphics/event_objects/pics/people/woman_3/2.png
index 23852c71b..23852c71b 100644
--- a/graphics/map_objects/pics/people/woman_3/2.png
+++ b/graphics/event_objects/pics/people/woman_3/2.png
diff --git a/graphics/map_objects/pics/people/woman_3/3.png b/graphics/event_objects/pics/people/woman_3/3.png
index 525958cbb..525958cbb 100644
--- a/graphics/map_objects/pics/people/woman_3/3.png
+++ b/graphics/event_objects/pics/people/woman_3/3.png
diff --git a/graphics/map_objects/pics/people/woman_3/4.png b/graphics/event_objects/pics/people/woman_3/4.png
index 6feabedd0..6feabedd0 100644
--- a/graphics/map_objects/pics/people/woman_3/4.png
+++ b/graphics/event_objects/pics/people/woman_3/4.png
diff --git a/graphics/map_objects/pics/people/woman_3/5.png b/graphics/event_objects/pics/people/woman_3/5.png
index f174b0184..f174b0184 100644
--- a/graphics/map_objects/pics/people/woman_3/5.png
+++ b/graphics/event_objects/pics/people/woman_3/5.png
diff --git a/graphics/map_objects/pics/people/woman_3/6.png b/graphics/event_objects/pics/people/woman_3/6.png
index 1b4b6d08a..1b4b6d08a 100644
--- a/graphics/map_objects/pics/people/woman_3/6.png
+++ b/graphics/event_objects/pics/people/woman_3/6.png
diff --git a/graphics/map_objects/pics/people/woman_3/7.png b/graphics/event_objects/pics/people/woman_3/7.png
index d8c2bfd99..d8c2bfd99 100644
--- a/graphics/map_objects/pics/people/woman_3/7.png
+++ b/graphics/event_objects/pics/people/woman_3/7.png
diff --git a/graphics/map_objects/pics/people/woman_3/8.png b/graphics/event_objects/pics/people/woman_3/8.png
index 0517b9993..0517b9993 100644
--- a/graphics/map_objects/pics/people/woman_3/8.png
+++ b/graphics/event_objects/pics/people/woman_3/8.png
diff --git a/graphics/map_objects/pics/people/woman_4/0.png b/graphics/event_objects/pics/people/woman_4/0.png
index 88489b6a6..88489b6a6 100644
--- a/graphics/map_objects/pics/people/woman_4/0.png
+++ b/graphics/event_objects/pics/people/woman_4/0.png
diff --git a/graphics/map_objects/pics/people/woman_4/1.png b/graphics/event_objects/pics/people/woman_4/1.png
index 1cc24ca36..1cc24ca36 100644
--- a/graphics/map_objects/pics/people/woman_4/1.png
+++ b/graphics/event_objects/pics/people/woman_4/1.png
diff --git a/graphics/map_objects/pics/people/woman_4/2.png b/graphics/event_objects/pics/people/woman_4/2.png
index efedc4a01..efedc4a01 100644
--- a/graphics/map_objects/pics/people/woman_4/2.png
+++ b/graphics/event_objects/pics/people/woman_4/2.png
diff --git a/graphics/map_objects/pics/people/woman_4/3.png b/graphics/event_objects/pics/people/woman_4/3.png
index a186b454e..a186b454e 100644
--- a/graphics/map_objects/pics/people/woman_4/3.png
+++ b/graphics/event_objects/pics/people/woman_4/3.png
diff --git a/graphics/map_objects/pics/people/woman_4/4.png b/graphics/event_objects/pics/people/woman_4/4.png
index c5cc8670d..c5cc8670d 100644
--- a/graphics/map_objects/pics/people/woman_4/4.png
+++ b/graphics/event_objects/pics/people/woman_4/4.png
diff --git a/graphics/map_objects/pics/people/woman_4/5.png b/graphics/event_objects/pics/people/woman_4/5.png
index f08133faa..f08133faa 100644
--- a/graphics/map_objects/pics/people/woman_4/5.png
+++ b/graphics/event_objects/pics/people/woman_4/5.png
diff --git a/graphics/map_objects/pics/people/woman_4/6.png b/graphics/event_objects/pics/people/woman_4/6.png
index dec6f3146..dec6f3146 100644
--- a/graphics/map_objects/pics/people/woman_4/6.png
+++ b/graphics/event_objects/pics/people/woman_4/6.png
diff --git a/graphics/map_objects/pics/people/woman_4/7.png b/graphics/event_objects/pics/people/woman_4/7.png
index 4912065a5..4912065a5 100644
--- a/graphics/map_objects/pics/people/woman_4/7.png
+++ b/graphics/event_objects/pics/people/woman_4/7.png
diff --git a/graphics/map_objects/pics/people/woman_4/8.png b/graphics/event_objects/pics/people/woman_4/8.png
index 21cd91f67..21cd91f67 100644
--- a/graphics/map_objects/pics/people/woman_4/8.png
+++ b/graphics/event_objects/pics/people/woman_4/8.png
diff --git a/graphics/map_objects/pics/people/woman_5/0.png b/graphics/event_objects/pics/people/woman_5/0.png
index 30ff1cf1c..30ff1cf1c 100644
--- a/graphics/map_objects/pics/people/woman_5/0.png
+++ b/graphics/event_objects/pics/people/woman_5/0.png
diff --git a/graphics/map_objects/pics/people/woman_5/1.png b/graphics/event_objects/pics/people/woman_5/1.png
index 3a5cf543e..3a5cf543e 100644
--- a/graphics/map_objects/pics/people/woman_5/1.png
+++ b/graphics/event_objects/pics/people/woman_5/1.png
diff --git a/graphics/map_objects/pics/people/woman_5/2.png b/graphics/event_objects/pics/people/woman_5/2.png
index 066d52259..066d52259 100644
--- a/graphics/map_objects/pics/people/woman_5/2.png
+++ b/graphics/event_objects/pics/people/woman_5/2.png
diff --git a/graphics/map_objects/pics/people/woman_5/3.png b/graphics/event_objects/pics/people/woman_5/3.png
index 737877bb6..737877bb6 100644
--- a/graphics/map_objects/pics/people/woman_5/3.png
+++ b/graphics/event_objects/pics/people/woman_5/3.png
diff --git a/graphics/map_objects/pics/people/woman_5/4.png b/graphics/event_objects/pics/people/woman_5/4.png
index 170d45929..170d45929 100644
--- a/graphics/map_objects/pics/people/woman_5/4.png
+++ b/graphics/event_objects/pics/people/woman_5/4.png
diff --git a/graphics/map_objects/pics/people/woman_5/5.png b/graphics/event_objects/pics/people/woman_5/5.png
index 2bae62dde..2bae62dde 100644
--- a/graphics/map_objects/pics/people/woman_5/5.png
+++ b/graphics/event_objects/pics/people/woman_5/5.png
diff --git a/graphics/map_objects/pics/people/woman_5/6.png b/graphics/event_objects/pics/people/woman_5/6.png
index 519897644..519897644 100644
--- a/graphics/map_objects/pics/people/woman_5/6.png
+++ b/graphics/event_objects/pics/people/woman_5/6.png
diff --git a/graphics/map_objects/pics/people/woman_5/7.png b/graphics/event_objects/pics/people/woman_5/7.png
index c8ec75432..c8ec75432 100644
--- a/graphics/map_objects/pics/people/woman_5/7.png
+++ b/graphics/event_objects/pics/people/woman_5/7.png
diff --git a/graphics/map_objects/pics/people/woman_5/8.png b/graphics/event_objects/pics/people/woman_5/8.png
index c4c05fcd9..c4c05fcd9 100644
--- a/graphics/map_objects/pics/people/woman_5/8.png
+++ b/graphics/event_objects/pics/people/woman_5/8.png
diff --git a/graphics/map_objects/pics/people/woman_6/0.png b/graphics/event_objects/pics/people/woman_6/0.png
index 61cce57b0..61cce57b0 100644
--- a/graphics/map_objects/pics/people/woman_6/0.png
+++ b/graphics/event_objects/pics/people/woman_6/0.png
diff --git a/graphics/map_objects/pics/people/woman_6/1.png b/graphics/event_objects/pics/people/woman_6/1.png
index ea399ef74..ea399ef74 100644
--- a/graphics/map_objects/pics/people/woman_6/1.png
+++ b/graphics/event_objects/pics/people/woman_6/1.png
diff --git a/graphics/map_objects/pics/people/woman_6/2.png b/graphics/event_objects/pics/people/woman_6/2.png
index 574121114..574121114 100644
--- a/graphics/map_objects/pics/people/woman_6/2.png
+++ b/graphics/event_objects/pics/people/woman_6/2.png
diff --git a/graphics/map_objects/pics/people/woman_6/3.png b/graphics/event_objects/pics/people/woman_6/3.png
index 538e60433..538e60433 100644
--- a/graphics/map_objects/pics/people/woman_6/3.png
+++ b/graphics/event_objects/pics/people/woman_6/3.png
diff --git a/graphics/map_objects/pics/people/woman_6/4.png b/graphics/event_objects/pics/people/woman_6/4.png
index 746cefd09..746cefd09 100644
--- a/graphics/map_objects/pics/people/woman_6/4.png
+++ b/graphics/event_objects/pics/people/woman_6/4.png
diff --git a/graphics/map_objects/pics/people/woman_6/5.png b/graphics/event_objects/pics/people/woman_6/5.png
index 4c4e2c5b0..4c4e2c5b0 100644
--- a/graphics/map_objects/pics/people/woman_6/5.png
+++ b/graphics/event_objects/pics/people/woman_6/5.png
diff --git a/graphics/map_objects/pics/people/woman_6/6.png b/graphics/event_objects/pics/people/woman_6/6.png
index efd7b76ca..efd7b76ca 100644
--- a/graphics/map_objects/pics/people/woman_6/6.png
+++ b/graphics/event_objects/pics/people/woman_6/6.png
diff --git a/graphics/map_objects/pics/people/woman_6/7.png b/graphics/event_objects/pics/people/woman_6/7.png
index 2009f5e9a..2009f5e9a 100644
--- a/graphics/map_objects/pics/people/woman_6/7.png
+++ b/graphics/event_objects/pics/people/woman_6/7.png
diff --git a/graphics/map_objects/pics/people/woman_6/8.png b/graphics/event_objects/pics/people/woman_6/8.png
index 9dd33b643..9dd33b643 100644
--- a/graphics/map_objects/pics/people/woman_6/8.png
+++ b/graphics/event_objects/pics/people/woman_6/8.png
diff --git a/graphics/map_objects/pics/people/woman_7/0.png b/graphics/event_objects/pics/people/woman_7/0.png
index 3adafee30..3adafee30 100644
--- a/graphics/map_objects/pics/people/woman_7/0.png
+++ b/graphics/event_objects/pics/people/woman_7/0.png
diff --git a/graphics/map_objects/pics/people/woman_7/1.png b/graphics/event_objects/pics/people/woman_7/1.png
index 835bc5fec..835bc5fec 100644
--- a/graphics/map_objects/pics/people/woman_7/1.png
+++ b/graphics/event_objects/pics/people/woman_7/1.png
diff --git a/graphics/map_objects/pics/people/woman_7/2.png b/graphics/event_objects/pics/people/woman_7/2.png
index b912ef4bf..b912ef4bf 100644
--- a/graphics/map_objects/pics/people/woman_7/2.png
+++ b/graphics/event_objects/pics/people/woman_7/2.png
diff --git a/graphics/map_objects/pics/people/woman_7/3.png b/graphics/event_objects/pics/people/woman_7/3.png
index b83b62226..b83b62226 100644
--- a/graphics/map_objects/pics/people/woman_7/3.png
+++ b/graphics/event_objects/pics/people/woman_7/3.png
diff --git a/graphics/map_objects/pics/people/woman_7/4.png b/graphics/event_objects/pics/people/woman_7/4.png
index 193f9a4dd..193f9a4dd 100644
--- a/graphics/map_objects/pics/people/woman_7/4.png
+++ b/graphics/event_objects/pics/people/woman_7/4.png
diff --git a/graphics/map_objects/pics/people/woman_7/5.png b/graphics/event_objects/pics/people/woman_7/5.png
index 3704875b2..3704875b2 100644
--- a/graphics/map_objects/pics/people/woman_7/5.png
+++ b/graphics/event_objects/pics/people/woman_7/5.png
diff --git a/graphics/map_objects/pics/people/woman_7/6.png b/graphics/event_objects/pics/people/woman_7/6.png
index ba829becd..ba829becd 100644
--- a/graphics/map_objects/pics/people/woman_7/6.png
+++ b/graphics/event_objects/pics/people/woman_7/6.png
diff --git a/graphics/map_objects/pics/people/woman_7/7.png b/graphics/event_objects/pics/people/woman_7/7.png
index b6aac4b99..b6aac4b99 100644
--- a/graphics/map_objects/pics/people/woman_7/7.png
+++ b/graphics/event_objects/pics/people/woman_7/7.png
diff --git a/graphics/map_objects/pics/people/woman_7/8.png b/graphics/event_objects/pics/people/woman_7/8.png
index b9c8b50fc..b9c8b50fc 100644
--- a/graphics/map_objects/pics/people/woman_7/8.png
+++ b/graphics/event_objects/pics/people/woman_7/8.png
diff --git a/graphics/map_objects/pics/people/woman_8/0.png b/graphics/event_objects/pics/people/woman_8/0.png
index c6d9e955f..c6d9e955f 100644
--- a/graphics/map_objects/pics/people/woman_8/0.png
+++ b/graphics/event_objects/pics/people/woman_8/0.png
diff --git a/graphics/map_objects/pics/people/woman_8/1.png b/graphics/event_objects/pics/people/woman_8/1.png
index 7ed02247b..7ed02247b 100644
--- a/graphics/map_objects/pics/people/woman_8/1.png
+++ b/graphics/event_objects/pics/people/woman_8/1.png
diff --git a/graphics/map_objects/pics/people/woman_8/2.png b/graphics/event_objects/pics/people/woman_8/2.png
index 6fc203557..6fc203557 100644
--- a/graphics/map_objects/pics/people/woman_8/2.png
+++ b/graphics/event_objects/pics/people/woman_8/2.png
diff --git a/graphics/map_objects/pics/people/woman_8/3.png b/graphics/event_objects/pics/people/woman_8/3.png
index 2533909b9..2533909b9 100644
--- a/graphics/map_objects/pics/people/woman_8/3.png
+++ b/graphics/event_objects/pics/people/woman_8/3.png
diff --git a/graphics/map_objects/pics/people/woman_8/4.png b/graphics/event_objects/pics/people/woman_8/4.png
index bd4cb52fc..bd4cb52fc 100644
--- a/graphics/map_objects/pics/people/woman_8/4.png
+++ b/graphics/event_objects/pics/people/woman_8/4.png
diff --git a/graphics/map_objects/pics/people/woman_8/5.png b/graphics/event_objects/pics/people/woman_8/5.png
index d7efe0f70..d7efe0f70 100644
--- a/graphics/map_objects/pics/people/woman_8/5.png
+++ b/graphics/event_objects/pics/people/woman_8/5.png
diff --git a/graphics/map_objects/pics/people/woman_8/6.png b/graphics/event_objects/pics/people/woman_8/6.png
index 67cd94743..67cd94743 100644
--- a/graphics/map_objects/pics/people/woman_8/6.png
+++ b/graphics/event_objects/pics/people/woman_8/6.png
diff --git a/graphics/map_objects/pics/people/woman_8/7.png b/graphics/event_objects/pics/people/woman_8/7.png
index fba5ff510..fba5ff510 100644
--- a/graphics/map_objects/pics/people/woman_8/7.png
+++ b/graphics/event_objects/pics/people/woman_8/7.png
diff --git a/graphics/map_objects/pics/people/woman_8/8.png b/graphics/event_objects/pics/people/woman_8/8.png
index 3f807597d..3f807597d 100644
--- a/graphics/map_objects/pics/people/woman_8/8.png
+++ b/graphics/event_objects/pics/people/woman_8/8.png
diff --git a/graphics/map_objects/pics/people/youngster/0.png b/graphics/event_objects/pics/people/youngster/0.png
index b370f8141..b370f8141 100644
--- a/graphics/map_objects/pics/people/youngster/0.png
+++ b/graphics/event_objects/pics/people/youngster/0.png
diff --git a/graphics/map_objects/pics/people/youngster/1.png b/graphics/event_objects/pics/people/youngster/1.png
index 1c1f15b89..1c1f15b89 100644
--- a/graphics/map_objects/pics/people/youngster/1.png
+++ b/graphics/event_objects/pics/people/youngster/1.png
diff --git a/graphics/map_objects/pics/people/youngster/2.png b/graphics/event_objects/pics/people/youngster/2.png
index c8a936dd2..c8a936dd2 100644
--- a/graphics/map_objects/pics/people/youngster/2.png
+++ b/graphics/event_objects/pics/people/youngster/2.png
diff --git a/graphics/map_objects/pics/people/youngster/3.png b/graphics/event_objects/pics/people/youngster/3.png
index c9fa72ddb..c9fa72ddb 100644
--- a/graphics/map_objects/pics/people/youngster/3.png
+++ b/graphics/event_objects/pics/people/youngster/3.png
diff --git a/graphics/map_objects/pics/people/youngster/4.png b/graphics/event_objects/pics/people/youngster/4.png
index ba17f34ac..ba17f34ac 100644
--- a/graphics/map_objects/pics/people/youngster/4.png
+++ b/graphics/event_objects/pics/people/youngster/4.png
diff --git a/graphics/map_objects/pics/people/youngster/5.png b/graphics/event_objects/pics/people/youngster/5.png
index fcd2f196a..fcd2f196a 100644
--- a/graphics/map_objects/pics/people/youngster/5.png
+++ b/graphics/event_objects/pics/people/youngster/5.png
diff --git a/graphics/map_objects/pics/people/youngster/6.png b/graphics/event_objects/pics/people/youngster/6.png
index fd12b99ea..fd12b99ea 100644
--- a/graphics/map_objects/pics/people/youngster/6.png
+++ b/graphics/event_objects/pics/people/youngster/6.png
diff --git a/graphics/map_objects/pics/people/youngster/7.png b/graphics/event_objects/pics/people/youngster/7.png
index 626716b8d..626716b8d 100644
--- a/graphics/map_objects/pics/people/youngster/7.png
+++ b/graphics/event_objects/pics/people/youngster/7.png
diff --git a/graphics/map_objects/pics/people/youngster/8.png b/graphics/event_objects/pics/people/youngster/8.png
index 3c9662746..3c9662746 100644
--- a/graphics/map_objects/pics/people/youngster/8.png
+++ b/graphics/event_objects/pics/people/youngster/8.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/0.png b/graphics/event_objects/pics/pokemon/azumarill/0.png
index 9b219e552..9b219e552 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/0.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/0.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/1.png b/graphics/event_objects/pics/pokemon/azumarill/1.png
index 16e493f8b..16e493f8b 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/1.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/1.png
diff --git a/graphics/map_objects/pics/pokemon/azumarill/2.png b/graphics/event_objects/pics/pokemon/azumarill/2.png
index b10e6a283..b10e6a283 100644
--- a/graphics/map_objects/pics/pokemon/azumarill/2.png
+++ b/graphics/event_objects/pics/pokemon/azumarill/2.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/0.png b/graphics/event_objects/pics/pokemon/azurill/0.png
index efbcea03f..efbcea03f 100644
--- a/graphics/map_objects/pics/pokemon/azurill/0.png
+++ b/graphics/event_objects/pics/pokemon/azurill/0.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/1.png b/graphics/event_objects/pics/pokemon/azurill/1.png
index 4e00acdc6..4e00acdc6 100644
--- a/graphics/map_objects/pics/pokemon/azurill/1.png
+++ b/graphics/event_objects/pics/pokemon/azurill/1.png
diff --git a/graphics/map_objects/pics/pokemon/azurill/2.png b/graphics/event_objects/pics/pokemon/azurill/2.png
index 08bf43c5b..08bf43c5b 100644
--- a/graphics/map_objects/pics/pokemon/azurill/2.png
+++ b/graphics/event_objects/pics/pokemon/azurill/2.png
diff --git a/graphics/map_objects/pics/pokemon/groudon/0.png b/graphics/event_objects/pics/pokemon/groudon/0.png
index 9109fcb12..9109fcb12 100644
--- a/graphics/map_objects/pics/pokemon/groudon/0.png
+++ b/graphics/event_objects/pics/pokemon/groudon/0.png
diff --git a/graphics/map_objects/pics/pokemon/groudon/1.png b/graphics/event_objects/pics/pokemon/groudon/1.png
index 6f3b6d4fd..6f3b6d4fd 100644
--- a/graphics/map_objects/pics/pokemon/groudon/1.png
+++ b/graphics/event_objects/pics/pokemon/groudon/1.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/0.png b/graphics/event_objects/pics/pokemon/kecleon/0.png
index 691797af0..691797af0 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/0.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/0.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/1.png b/graphics/event_objects/pics/pokemon/kecleon/1.png
index 0d82cc66d..0d82cc66d 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/1.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/1.png
diff --git a/graphics/map_objects/pics/pokemon/kecleon/2.png b/graphics/event_objects/pics/pokemon/kecleon/2.png
index 2713ce057..2713ce057 100644
--- a/graphics/map_objects/pics/pokemon/kecleon/2.png
+++ b/graphics/event_objects/pics/pokemon/kecleon/2.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre/0.png b/graphics/event_objects/pics/pokemon/kyogre/0.png
index 60a2560d5..60a2560d5 100644
--- a/graphics/map_objects/pics/pokemon/kyogre/0.png
+++ b/graphics/event_objects/pics/pokemon/kyogre/0.png
diff --git a/graphics/map_objects/pics/pokemon/kyogre/1.png b/graphics/event_objects/pics/pokemon/kyogre/1.png
index 8a548648c..8a548648c 100644
--- a/graphics/map_objects/pics/pokemon/kyogre/1.png
+++ b/graphics/event_objects/pics/pokemon/kyogre/1.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/0.png b/graphics/event_objects/pics/pokemon/latias_latios/0.png
index 3410e8311..3410e8311 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/0.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/0.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/1.png b/graphics/event_objects/pics/pokemon/latias_latios/1.png
index 428c2b174..428c2b174 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/1.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/1.png
diff --git a/graphics/map_objects/pics/pokemon/latias_latios/2.png b/graphics/event_objects/pics/pokemon/latias_latios/2.png
index d8fe6dc7a..d8fe6dc7a 100644
--- a/graphics/map_objects/pics/pokemon/latias_latios/2.png
+++ b/graphics/event_objects/pics/pokemon/latias_latios/2.png
diff --git a/graphics/map_objects/pics/pokemon/machoke_carrying_box/0.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/0.png
index 62e6261b7..62e6261b7 100644
--- a/graphics/map_objects/pics/pokemon/machoke_carrying_box/0.png
+++ b/graphics/event_objects/pics/pokemon/machoke_carrying_box/0.png
diff --git a/graphics/map_objects/pics/pokemon/machoke_carrying_box/1.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/1.png
index 770387e17..770387e17 100644
--- a/graphics/map_objects/pics/pokemon/machoke_carrying_box/1.png
+++ b/graphics/event_objects/pics/pokemon/machoke_carrying_box/1.png
diff --git a/graphics/map_objects/pics/pokemon/machoke_carrying_box/2.png b/graphics/event_objects/pics/pokemon/machoke_carrying_box/2.png
index f22e43af7..f22e43af7 100644
--- a/graphics/map_objects/pics/pokemon/machoke_carrying_box/2.png
+++ b/graphics/event_objects/pics/pokemon/machoke_carrying_box/2.png
diff --git a/graphics/map_objects/pics/pokemon/machoke_facing_away/0.png b/graphics/event_objects/pics/pokemon/machoke_facing_away/0.png
index 0913e3f12..0913e3f12 100644
--- a/graphics/map_objects/pics/pokemon/machoke_facing_away/0.png
+++ b/graphics/event_objects/pics/pokemon/machoke_facing_away/0.png
diff --git a/graphics/map_objects/pics/pokemon/machoke_facing_away/1.png b/graphics/event_objects/pics/pokemon/machoke_facing_away/1.png
index a04e17a64..a04e17a64 100644
--- a/graphics/map_objects/pics/pokemon/machoke_facing_away/1.png
+++ b/graphics/event_objects/pics/pokemon/machoke_facing_away/1.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/0.png b/graphics/event_objects/pics/pokemon/pikachu/0.png
index f0db4aa80..f0db4aa80 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/0.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/0.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/1.png b/graphics/event_objects/pics/pokemon/pikachu/1.png
index 420e6c4c7..420e6c4c7 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/1.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/1.png
diff --git a/graphics/map_objects/pics/pokemon/pikachu/2.png b/graphics/event_objects/pics/pokemon/pikachu/2.png
index 06a3f4b0e..06a3f4b0e 100644
--- a/graphics/map_objects/pics/pokemon/pikachu/2.png
+++ b/graphics/event_objects/pics/pokemon/pikachu/2.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/0.png b/graphics/event_objects/pics/pokemon/poochyena/0.png
index 1ee042572..1ee042572 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/0.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/0.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/1.png b/graphics/event_objects/pics/pokemon/poochyena/1.png
index 3dbdb383c..3dbdb383c 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/1.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/1.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/2.png b/graphics/event_objects/pics/pokemon/poochyena/2.png
index bda367b94..bda367b94 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/2.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/2.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/3.png b/graphics/event_objects/pics/pokemon/poochyena/3.png
index 8b7d8f803..8b7d8f803 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/3.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/3.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/4.png b/graphics/event_objects/pics/pokemon/poochyena/4.png
index 47012ad54..47012ad54 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/4.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/4.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/5.png b/graphics/event_objects/pics/pokemon/poochyena/5.png
index e256e8a07..e256e8a07 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/5.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/5.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/6.png b/graphics/event_objects/pics/pokemon/poochyena/6.png
index 173b9fe5e..173b9fe5e 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/6.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/6.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/7.png b/graphics/event_objects/pics/pokemon/poochyena/7.png
index 8fdc28209..8fdc28209 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/7.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/7.png
diff --git a/graphics/map_objects/pics/pokemon/poochyena/8.png b/graphics/event_objects/pics/pokemon/poochyena/8.png
index 911619f6a..911619f6a 100644
--- a/graphics/map_objects/pics/pokemon/poochyena/8.png
+++ b/graphics/event_objects/pics/pokemon/poochyena/8.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/0.png b/graphics/event_objects/pics/pokemon/rayquaza/0.png
index 4abbb047a..4abbb047a 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/0.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/0.png
diff --git a/graphics/map_objects/pics/pokemon/rayquaza/1.png b/graphics/event_objects/pics/pokemon/rayquaza/1.png
index 137fe24b1..137fe24b1 100644
--- a/graphics/map_objects/pics/pokemon/rayquaza/1.png
+++ b/graphics/event_objects/pics/pokemon/rayquaza/1.png
diff --git a/graphics/map_objects/pics/pokemon/regi.png b/graphics/event_objects/pics/pokemon/regi.png
index 8425040dd..8425040dd 100644
--- a/graphics/map_objects/pics/pokemon/regi.png
+++ b/graphics/event_objects/pics/pokemon/regi.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/0.png b/graphics/event_objects/pics/pokemon/skitty/0.png
index 105611a10..105611a10 100644
--- a/graphics/map_objects/pics/pokemon/skitty/0.png
+++ b/graphics/event_objects/pics/pokemon/skitty/0.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/1.png b/graphics/event_objects/pics/pokemon/skitty/1.png
index 66a9640e0..66a9640e0 100644
--- a/graphics/map_objects/pics/pokemon/skitty/1.png
+++ b/graphics/event_objects/pics/pokemon/skitty/1.png
diff --git a/graphics/map_objects/pics/pokemon/skitty/2.png b/graphics/event_objects/pics/pokemon/skitty/2.png
index 2ab6cabfa..2ab6cabfa 100644
--- a/graphics/map_objects/pics/pokemon/skitty/2.png
+++ b/graphics/event_objects/pics/pokemon/skitty/2.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/0.png b/graphics/event_objects/pics/pokemon/wingull/0.png
index 82fe258d1..82fe258d1 100644
--- a/graphics/map_objects/pics/pokemon/wingull/0.png
+++ b/graphics/event_objects/pics/pokemon/wingull/0.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/1.png b/graphics/event_objects/pics/pokemon/wingull/1.png
index 55a020ee6..55a020ee6 100644
--- a/graphics/map_objects/pics/pokemon/wingull/1.png
+++ b/graphics/event_objects/pics/pokemon/wingull/1.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/2.png b/graphics/event_objects/pics/pokemon/wingull/2.png
index e1ada8014..e1ada8014 100644
--- a/graphics/map_objects/pics/pokemon/wingull/2.png
+++ b/graphics/event_objects/pics/pokemon/wingull/2.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/3.png b/graphics/event_objects/pics/pokemon/wingull/3.png
index 47206a591..47206a591 100644
--- a/graphics/map_objects/pics/pokemon/wingull/3.png
+++ b/graphics/event_objects/pics/pokemon/wingull/3.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/4.png b/graphics/event_objects/pics/pokemon/wingull/4.png
index 5c36d7413..5c36d7413 100644
--- a/graphics/map_objects/pics/pokemon/wingull/4.png
+++ b/graphics/event_objects/pics/pokemon/wingull/4.png
diff --git a/graphics/map_objects/pics/pokemon/wingull/5.png b/graphics/event_objects/pics/pokemon/wingull/5.png
index e1ada8014..e1ada8014 100644
--- a/graphics/map_objects/pics/pokemon/wingull/5.png
+++ b/graphics/event_objects/pics/pokemon/wingull/5.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/0.png b/graphics/event_objects/pics/pokemon/zigzagoon/0.png
index 0601efade..0601efade 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/0.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/0.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/1.png b/graphics/event_objects/pics/pokemon/zigzagoon/1.png
index c7e067a6d..c7e067a6d 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/1.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/1.png
diff --git a/graphics/map_objects/pics/pokemon/zigzagoon/2.png b/graphics/event_objects/pics/pokemon/zigzagoon/2.png
index d44a71b8d..d44a71b8d 100644
--- a/graphics/map_objects/pics/pokemon/zigzagoon/2.png
+++ b/graphics/event_objects/pics/pokemon/zigzagoon/2.png
diff --git a/include/berry.h b/include/berry.h
index 9de443fe7..259ada634 100644
--- a/include/berry.h
+++ b/include/berry.h
@@ -39,7 +39,7 @@ void debug_sub_80C2C18(const u8 *name, u8 holdEffect, u8 holdEffectParam);
 void SetEnigmaBerry(u8 *src);
 bool32 IsEnigmaBerryValid(void);
 const struct Berry *GetBerryInfo(u8 berry);
-bool32 FieldObjectInteractionWaterBerryTree(void);
+bool32 EventObjectInteractionWaterBerryTree(void);
 bool8 IsPlayerFacingUnplantedSoil(void);
 bool8 TryToWaterBerryTree(void);
 void ClearBerryTrees(void);
@@ -51,11 +51,11 @@ u8 GetStageByBerryTreeId(u8);
 u8 ItemIdToBerryType(u16 item);
 void GetBerryNameByBerryType(u8 berry, u8 *string);
 void ResetBerryTreeSparkleFlag(u8 id);
-void FieldObjectInteractionGetBerryTreeData(void);
+void EventObjectInteractionGetBerryTreeData(void);
 void Berry_FadeAndGoToBerryBagMenu(void);
-void FieldObjectInteractionPlantBerryTree(void);
-void FieldObjectInteractionPickBerryTree(void);
-void FieldObjectInteractionRemoveBerryTree(void);
+void EventObjectInteractionPlantBerryTree(void);
+void EventObjectInteractionPickBerryTree(void);
+void EventObjectInteractionRemoveBerryTree(void);
 bool8 PlayerHasBerries(void);
 void ResetBerryTreeSparkleFlags(void);
 void debug_sub_80C2D24(u8 spicy, u8 dry, u8 sweet, u8 bitter, u8 sour, u8 smoothness);
diff --git a/include/constants/event_objects.h b/include/constants/event_objects.h
new file mode 100644
index 000000000..7c236671d
--- /dev/null
+++ b/include/constants/event_objects.h
@@ -0,0 +1,252 @@
+#ifndef GUARD_CONSTANTS_EVENT_OBJECTS_H
+#define GUARD_CONSTANTS_EVENT_OBJECTS_H
+
+#define EVENT_OBJ_GFX_BRENDAN_NORMAL 0
+#define EVENT_OBJ_GFX_BRENDAN_MACH_BIKE 1
+#define EVENT_OBJ_GFX_BRENDAN_SURFING 2
+#define EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE 3
+#define EVENT_OBJ_GFX_QUINTY_PLUMP 4
+#define EVENT_OBJ_GFX_LITTLE_BOY_1 5
+#define EVENT_OBJ_GFX_LITTLE_GIRL_1 6
+#define EVENT_OBJ_GFX_BOY_1 7
+#define EVENT_OBJ_GFX_GIRL_1 8
+#define EVENT_OBJ_GFX_BOY_2 9
+#define EVENT_OBJ_GFX_GIRL_2 10
+#define EVENT_OBJ_GFX_LITTLE_BOY_2 11
+#define EVENT_OBJ_GFX_LITTLE_GIRL_2 12
+#define EVENT_OBJ_GFX_BOY_3 13
+#define EVENT_OBJ_GFX_GIRL_3 14
+#define EVENT_OBJ_GFX_BOY_4 15
+#define EVENT_OBJ_GFX_WOMAN_1 16
+#define EVENT_OBJ_GFX_FAT_MAN 17
+#define EVENT_OBJ_GFX_WOMAN_2 18
+#define EVENT_OBJ_GFX_MAN_1 19
+#define EVENT_OBJ_GFX_WOMAN_3 20
+#define EVENT_OBJ_GFX_OLD_MAN_1 21
+#define EVENT_OBJ_GFX_OLD_WOMAN_1 22
+#define EVENT_OBJ_GFX_MAN_2 23
+#define EVENT_OBJ_GFX_WOMAN_4 24
+#define EVENT_OBJ_GFX_MAN_3 25
+#define EVENT_OBJ_GFX_WOMAN_5 26
+#define EVENT_OBJ_GFX_COOK 27
+#define EVENT_OBJ_GFX_WOMAN_6 28
+#define EVENT_OBJ_GFX_OLD_MAN_2 29
+#define EVENT_OBJ_GFX_OLD_WOMAN_2 30
+#define EVENT_OBJ_GFX_CAMPER 31
+#define EVENT_OBJ_GFX_PICNICKER 32
+#define EVENT_OBJ_GFX_MAN_4 33
+#define EVENT_OBJ_GFX_WOMAN_7 34
+#define EVENT_OBJ_GFX_YOUNGSTER 35
+#define EVENT_OBJ_GFX_BUG_CATCHER 36
+#define EVENT_OBJ_GFX_PSYCHIC_M 37
+#define EVENT_OBJ_GFX_SCHOOL_KID_M 38
+#define EVENT_OBJ_GFX_MANIAC 39
+#define EVENT_OBJ_GFX_HEX_MANIAC 40
+#define EVENT_OBJ_GFX_WOMAN_8 41
+#define EVENT_OBJ_GFX_SWIMMER_M 42
+#define EVENT_OBJ_GFX_SWIMMER_F 43
+#define EVENT_OBJ_GFX_BLACK_BELT 44
+#define EVENT_OBJ_GFX_BEAUTY 45
+#define EVENT_OBJ_GFX_SCIENTIST_1 46
+#define EVENT_OBJ_GFX_LASS 47
+#define EVENT_OBJ_GFX_GENTLEMAN 48
+#define EVENT_OBJ_GFX_SAILOR 49
+#define EVENT_OBJ_GFX_FISHERMAN 50
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M 51
+#define EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F 52
+#define EVENT_OBJ_GFX_TUBER_F 53
+#define EVENT_OBJ_GFX_TUBER_M 54
+#define EVENT_OBJ_GFX_HIKER 55
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M 56
+#define EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F 57
+#define EVENT_OBJ_GFX_NURSE 58
+#define EVENT_OBJ_GFX_ITEM_BALL 59
+#define EVENT_OBJ_GFX_BERRY_TREE 60
+#define EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61
+#define EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES 62
+#define EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE 63
+#define EVENT_OBJ_GFX_PROF_BIRCH 64
+#define EVENT_OBJ_GFX_MAN_5 65
+#define EVENT_OBJ_GFX_MAN_6 66
+#define EVENT_OBJ_GFX_REPORTER_M 67
+#define EVENT_OBJ_GFX_REPORTER_F 68
+#define EVENT_OBJ_GFX_BARD 69
+#define EVENT_OBJ_GFX_HIPSTER 70
+#define EVENT_OBJ_GFX_TRADER 71
+#define EVENT_OBJ_GFX_STORYTELLER 72
+#define EVENT_OBJ_GFX_GIDDY 73
+#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74
+#define EVENT_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2 75
+#define EVENT_OBJ_GFX_UNUSED_NATU_DOLL 76
+#define EVENT_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77
+#define EVENT_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78
+#define EVENT_OBJ_GFX_UNUSED_WOOPER_DOLL 79
+#define EVENT_OBJ_GFX_UNUSED_PIKACHU_DOLL 80
+#define EVENT_OBJ_GFX_UNUSED_PORYGON2_DOLL 81
+#define EVENT_OBJ_GFX_CUTTABLE_TREE 82
+#define EVENT_OBJ_GFX_MART_EMPLOYEE 83
+#define EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN 84
+#define EVENT_OBJ_GFX_TEALA 85
+#define EVENT_OBJ_GFX_BREAKABLE_ROCK 86
+#define EVENT_OBJ_GFX_PUSHABLE_BOULDER 87
+#define EVENT_OBJ_GFX_MR_BRINEYS_BOAT 88
+#define EVENT_OBJ_GFX_MAY_NORMAL 89
+#define EVENT_OBJ_GFX_MAY_MACH_BIKE 90
+#define EVENT_OBJ_GFX_MAY_ACRO_BIKE 91
+#define EVENT_OBJ_GFX_MAY_SURFING 92
+#define EVENT_OBJ_GFX_MAY_FIELD_MOVE 93
+#define EVENT_OBJ_GFX_TRUCK 94
+#define EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX 95
+#define EVENT_OBJ_GFX_MACHOKE_FACING_AWAY 96
+#define EVENT_OBJ_GFX_BIRCHS_BAG 97
+#define EVENT_OBJ_GFX_POOCHYENA 98
+#define EVENT_OBJ_GFX_ARTIST 99
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING 103
+#define EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104
+#define EVENT_OBJ_GFX_RIVAL_MAY_NORMAL 105
+#define EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106
+#define EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107
+#define EVENT_OBJ_GFX_RIVAL_MAY_SURFING 108
+#define EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109
+#define EVENT_OBJ_GFX_CAMERAMAN 110
+#define EVENT_OBJ_GFX_BRENDAN_UNDERWATER 111
+#define EVENT_OBJ_GFX_MAY_UNDERWATER 112
+#define EVENT_OBJ_GFX_MOVING_BOX 113
+#define EVENT_OBJ_GFX_CABLE_CAR 114
+#define EVENT_OBJ_GFX_SCIENTIST_2 115
+#define EVENT_OBJ_GFX_MAN_7 116
+#define EVENT_OBJ_GFX_AQUA_MEMBER_M 117
+#define EVENT_OBJ_GFX_AQUA_MEMBER_F 118
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_M 119
+#define EVENT_OBJ_GFX_MAGMA_MEMBER_F 120
+#define EVENT_OBJ_GFX_SIDNEY 121
+#define EVENT_OBJ_GFX_PHOEBE 122
+#define EVENT_OBJ_GFX_GLACIA 123
+#define EVENT_OBJ_GFX_DRAKE 124
+#define EVENT_OBJ_GFX_ROXANNE 125
+#define EVENT_OBJ_GFX_BRAWLY 126
+#define EVENT_OBJ_GFX_WATTSON 127
+#define EVENT_OBJ_GFX_FLANNERY 128
+#define EVENT_OBJ_GFX_NORMAN 129
+#define EVENT_OBJ_GFX_WINONA 130
+#define EVENT_OBJ_GFX_LIZA 131
+#define EVENT_OBJ_GFX_TATE 132
+#define EVENT_OBJ_GFX_WALLACE 133
+#define EVENT_OBJ_GFX_STEVEN 134
+#define EVENT_OBJ_GFX_WALLY 135
+#define EVENT_OBJ_GFX_LITTLE_BOY_3 136
+#define EVENT_OBJ_GFX_BRENDAN_FISHING 137
+#define EVENT_OBJ_GFX_MAY_FISHING 138
+#define EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139
+#define EVENT_OBJ_GFX_SS_TIDAL 140
+#define EVENT_OBJ_GFX_SUBMARINE_SHADOW 141
+#define EVENT_OBJ_GFX_PICHU_DOLL 142
+#define EVENT_OBJ_GFX_PIKACHU_DOLL 143
+#define EVENT_OBJ_GFX_MARILL_DOLL 144
+#define EVENT_OBJ_GFX_TOGEPI_DOLL 145
+#define EVENT_OBJ_GFX_CYNDAQUIL_DOLL 146
+#define EVENT_OBJ_GFX_CHIKORITA_DOLL 147
+#define EVENT_OBJ_GFX_TOTODILE_DOLL 148
+#define EVENT_OBJ_GFX_JIGGLYPUFF_DOLL 149
+#define EVENT_OBJ_GFX_MEOWTH_DOLL 150
+#define EVENT_OBJ_GFX_CLEFAIRY_DOLL 151
+#define EVENT_OBJ_GFX_DITTO_DOLL 152
+#define EVENT_OBJ_GFX_SMOOCHUM_DOLL 153
+#define EVENT_OBJ_GFX_TREECKO_DOLL 154
+#define EVENT_OBJ_GFX_TORCHIC_DOLL 155
+#define EVENT_OBJ_GFX_MUDKIP_DOLL 156
+#define EVENT_OBJ_GFX_DUSKULL_DOLL 157
+#define EVENT_OBJ_GFX_WYNAUT_DOLL 158
+#define EVENT_OBJ_GFX_BALTOY_DOLL 159
+#define EVENT_OBJ_GFX_KECLEON_DOLL 160
+#define EVENT_OBJ_GFX_AZURILL_DOLL 161
+#define EVENT_OBJ_GFX_SKITTY_DOLL 162
+#define EVENT_OBJ_GFX_SWABLU_DOLL 163
+#define EVENT_OBJ_GFX_GULPIN_DOLL 164
+#define EVENT_OBJ_GFX_LOTAD_DOLL 165
+#define EVENT_OBJ_GFX_SEEDOT_DOLL 166
+#define EVENT_OBJ_GFX_PIKA_CUSHION 167
+#define EVENT_OBJ_GFX_ROUND_CUSHION 168
+#define EVENT_OBJ_GFX_KISS_CUSHION 169
+#define EVENT_OBJ_GFX_ZIGZAG_CUSHION 170
+#define EVENT_OBJ_GFX_SPIN_CUSHION 171
+#define EVENT_OBJ_GFX_DIAMOND_CUSHION 172
+#define EVENT_OBJ_GFX_BALL_CUSHION 173
+#define EVENT_OBJ_GFX_GRASS_CUSHION 174
+#define EVENT_OBJ_GFX_FIRE_CUSHION 175
+#define EVENT_OBJ_GFX_WATER_CUSHION 176
+#define EVENT_OBJ_GFX_BIG_SNORLAX_DOLL 177
+#define EVENT_OBJ_GFX_BIG_RHYDON_DOLL 178
+#define EVENT_OBJ_GFX_BIG_LAPRAS_DOLL 179
+#define EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL 180
+#define EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL 181
+#define EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL 182
+#define EVENT_OBJ_GFX_BIG_WAILMER_DOLL 183
+#define EVENT_OBJ_GFX_BIG_REGIROCK_DOLL 184
+#define EVENT_OBJ_GFX_BIG_REGICE_DOLL 185
+#define EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL 186
+#define EVENT_OBJ_GFX_LATIAS 187
+#define EVENT_OBJ_GFX_LATIOS 188
+#define EVENT_OBJ_GFX_BOY_5 189
+#define EVENT_OBJ_GFX_CONTEST_JUDGE 190
+#define EVENT_OBJ_GFX_BRENDAN_WATERING 191
+#define EVENT_OBJ_GFX_MAY_WATERING 192
+#define EVENT_OBJ_GFX_BRENDAN_DECORATING 193
+#define EVENT_OBJ_GFX_MAY_DECORATING 194
+#define EVENT_OBJ_GFX_ARCHIE 195
+#define EVENT_OBJ_GFX_MAXIE 196
+#define EVENT_OBJ_GFX_KYOGRE_1 197
+#define EVENT_OBJ_GFX_GROUDON_1 198
+#define EVENT_OBJ_GFX_FOSSIL 199
+#define EVENT_OBJ_GFX_REGIROCK 200
+#define EVENT_OBJ_GFX_REGICE 201
+#define EVENT_OBJ_GFX_REGISTEEL 202
+#define EVENT_OBJ_GFX_SKITTY 203
+#define EVENT_OBJ_GFX_KECLEON_1 204
+#define EVENT_OBJ_GFX_KYOGRE_2 205
+#define EVENT_OBJ_GFX_GROUDON_2 206
+#define EVENT_OBJ_GFX_RAYQUAZA 207
+#define EVENT_OBJ_GFX_ZIGZAGOON 208
+#define EVENT_OBJ_GFX_PIKACHU 209
+#define EVENT_OBJ_GFX_AZUMARILL 210
+#define EVENT_OBJ_GFX_WINGULL 211
+#define EVENT_OBJ_GFX_KECLEON_2 212
+#define EVENT_OBJ_GFX_TUBER_M_SWIMMING 213
+#define EVENT_OBJ_GFX_AZURILL 214
+#define EVENT_OBJ_GFX_MOM 215
+#define EVENT_OBJ_GFX_LINK_BRENDAN 216
+#define EVENT_OBJ_GFX_LINK_MAY 217
+
+// These are dynamic object gfx ids.
+// They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
+// More info about them in include/constants/vars.h
+#define EVENT_OBJ_GFX_VAR_0 240
+#define EVENT_OBJ_GFX_VAR_1 241
+#define EVENT_OBJ_GFX_VAR_2 242
+#define EVENT_OBJ_GFX_VAR_3 243
+#define EVENT_OBJ_GFX_VAR_4 244
+#define EVENT_OBJ_GFX_VAR_5 245
+#define EVENT_OBJ_GFX_VAR_6 246
+#define EVENT_OBJ_GFX_VAR_7 247
+#define EVENT_OBJ_GFX_VAR_8 248
+#define EVENT_OBJ_GFX_VAR_9 249
+#define EVENT_OBJ_GFX_VAR_A 250
+#define EVENT_OBJ_GFX_VAR_B 251
+#define EVENT_OBJ_GFX_VAR_C 252
+#define EVENT_OBJ_GFX_VAR_D 253
+#define EVENT_OBJ_GFX_VAR_E 254
+#define EVENT_OBJ_GFX_VAR_F 255
+
+#define SHADOW_SIZE_S 0
+#define SHADOW_SIZE_M 1
+#define SHADOW_SIZE_L 2
+#define SHADOW_SIZE_XL 3
+
+#define TRACKS_NONE 0
+#define TRACKS_FOOT 1
+#define TRACKS_BIKE_TIRE 2
+
+#endif  // GUARD_CONSTANTS_EVENT_OBJECTS_H
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index 3b2117d3a..86fd6718f 100755
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
 #define GUARD_FIELD_EFFECT_CONSTANTS_H
 
-#define FLDEFF_EXCLAMATION_MARK_ICON_1   0
+#define FLDEFF_EXCLAMATION_MARK_ICON     0
 #define FLDEFF_USE_CUT_ON_GRASS          1
 #define FLDEFF_USE_CUT_ON_TREE           2
 #define FLDEFF_SHADOW                    3
@@ -34,7 +34,7 @@
 #define FLDEFF_NPCFLY_OUT                30
 #define FLDEFF_USE_FLY                   31
 #define FLDEFF_FLY_IN                    32
-#define FLDEFF_EXCLAMATION_MARK_ICON_2   33
+#define FLDEFF_QUESTION_MARK_ICON        33
 #define FLDEFF_FEET_IN_FLOWING_WATER     34
 #define FLDEFF_BIKE_TIRE_TRACKS          35
 #define FLDEFF_SAND_DISGUISE             36
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 562741b93..a867fd77e 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -357,7 +357,7 @@
 #define FLAG_HIDDEN_ITEM_61      0x2B9
 
 
-// map object hide/show flags
+// event object hide/show flags
 #define FLAG_HIDE_BIRCH_STARTERS_BAG        0x2BC
 
 #define FLAG_HIDE_BIRCH_BATTLE_POOCHYENA    0x2D0
diff --git a/include/constants/map_objects.h b/include/constants/map_objects.h
deleted file mode 100644
index 7e5aef744..000000000
--- a/include/constants/map_objects.h
+++ /dev/null
@@ -1,252 +0,0 @@
-#ifndef GUARD_CONSTANTS_MAP_OBJECTS_H
-#define GUARD_CONSTANTS_MAP_OBJECTS_H
-
-#define MAP_OBJ_GFX_BRENDAN_NORMAL 0
-#define MAP_OBJ_GFX_BRENDAN_MACH_BIKE 1
-#define MAP_OBJ_GFX_BRENDAN_SURFING 2
-#define MAP_OBJ_GFX_BRENDAN_FIELD_MOVE 3
-#define MAP_OBJ_GFX_QUINTY_PLUMP 4
-#define MAP_OBJ_GFX_LITTLE_BOY_1 5
-#define MAP_OBJ_GFX_LITTLE_GIRL_1 6
-#define MAP_OBJ_GFX_BOY_1 7
-#define MAP_OBJ_GFX_GIRL_1 8
-#define MAP_OBJ_GFX_BOY_2 9
-#define MAP_OBJ_GFX_GIRL_2 10
-#define MAP_OBJ_GFX_LITTLE_BOY_2 11
-#define MAP_OBJ_GFX_LITTLE_GIRL_2 12
-#define MAP_OBJ_GFX_BOY_3 13
-#define MAP_OBJ_GFX_GIRL_3 14
-#define MAP_OBJ_GFX_BOY_4 15
-#define MAP_OBJ_GFX_WOMAN_1 16
-#define MAP_OBJ_GFX_FAT_MAN 17
-#define MAP_OBJ_GFX_WOMAN_2 18
-#define MAP_OBJ_GFX_MAN_1 19
-#define MAP_OBJ_GFX_WOMAN_3 20
-#define MAP_OBJ_GFX_OLD_MAN_1 21
-#define MAP_OBJ_GFX_OLD_WOMAN_1 22
-#define MAP_OBJ_GFX_MAN_2 23
-#define MAP_OBJ_GFX_WOMAN_4 24
-#define MAP_OBJ_GFX_MAN_3 25
-#define MAP_OBJ_GFX_WOMAN_5 26
-#define MAP_OBJ_GFX_COOK 27
-#define MAP_OBJ_GFX_WOMAN_6 28
-#define MAP_OBJ_GFX_OLD_MAN_2 29
-#define MAP_OBJ_GFX_OLD_WOMAN_2 30
-#define MAP_OBJ_GFX_CAMPER 31
-#define MAP_OBJ_GFX_PICNICKER 32
-#define MAP_OBJ_GFX_MAN_4 33
-#define MAP_OBJ_GFX_WOMAN_7 34
-#define MAP_OBJ_GFX_YOUNGSTER 35
-#define MAP_OBJ_GFX_BUG_CATCHER 36
-#define MAP_OBJ_GFX_PSYCHIC_M 37
-#define MAP_OBJ_GFX_SCHOOL_KID_M 38
-#define MAP_OBJ_GFX_MANIAC 39
-#define MAP_OBJ_GFX_HEX_MANIAC 40
-#define MAP_OBJ_GFX_WOMAN_8 41
-#define MAP_OBJ_GFX_SWIMMER_M 42
-#define MAP_OBJ_GFX_SWIMMER_F 43
-#define MAP_OBJ_GFX_BLACK_BELT 44
-#define MAP_OBJ_GFX_BEAUTY 45
-#define MAP_OBJ_GFX_SCIENTIST_1 46
-#define MAP_OBJ_GFX_LASS 47
-#define MAP_OBJ_GFX_GENTLEMAN 48
-#define MAP_OBJ_GFX_SAILOR 49
-#define MAP_OBJ_GFX_FISHERMAN 50
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_M 51
-#define MAP_OBJ_GFX_RUNNING_TRIATHLETE_F 52
-#define MAP_OBJ_GFX_TUBER_F 53
-#define MAP_OBJ_GFX_TUBER_M 54
-#define MAP_OBJ_GFX_HIKER 55
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_M 56
-#define MAP_OBJ_GFX_CYCLING_TRIATHLETE_F 57
-#define MAP_OBJ_GFX_NURSE 58
-#define MAP_OBJ_GFX_ITEM_BALL 59
-#define MAP_OBJ_GFX_BERRY_TREE 60
-#define MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES 61
-#define MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES 62
-#define MAP_OBJ_GFX_BRENDAN_ACRO_BIKE 63
-#define MAP_OBJ_GFX_PROF_BIRCH 64
-#define MAP_OBJ_GFX_MAN_5 65
-#define MAP_OBJ_GFX_MAN_6 66
-#define MAP_OBJ_GFX_REPORTER_M 67
-#define MAP_OBJ_GFX_REPORTER_F 68
-#define MAP_OBJ_GFX_BARD 69
-#define MAP_OBJ_GFX_HIPSTER 70
-#define MAP_OBJ_GFX_TRADER 71
-#define MAP_OBJ_GFX_STORYTELLER 72
-#define MAP_OBJ_GFX_GIDDY 73
-#define MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_1 74
-#define MAP_OBJ_GFX_UNUSED_MAUVILLE_OLD_MAN_2 75
-#define MAP_OBJ_GFX_UNUSED_NATU_DOLL 76
-#define MAP_OBJ_GFX_UNUSED_MAGNEMITE_DOLL 77
-#define MAP_OBJ_GFX_UNUSED_SQUIRTLE_DOLL 78
-#define MAP_OBJ_GFX_UNUSED_WOOPER_DOLL 79
-#define MAP_OBJ_GFX_UNUSED_PIKACHU_DOLL 80
-#define MAP_OBJ_GFX_UNUSED_PORYGON2_DOLL 81
-#define MAP_OBJ_GFX_CUTTABLE_TREE 82
-#define MAP_OBJ_GFX_MART_EMPLOYEE 83
-#define MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN 84
-#define MAP_OBJ_GFX_TEALA 85
-#define MAP_OBJ_GFX_BREAKABLE_ROCK 86
-#define MAP_OBJ_GFX_PUSHABLE_BOULDER 87
-#define MAP_OBJ_GFX_MR_BRINEYS_BOAT 88
-#define MAP_OBJ_GFX_MAY_NORMAL 89
-#define MAP_OBJ_GFX_MAY_MACH_BIKE 90
-#define MAP_OBJ_GFX_MAY_ACRO_BIKE 91
-#define MAP_OBJ_GFX_MAY_SURFING 92
-#define MAP_OBJ_GFX_MAY_FIELD_MOVE 93
-#define MAP_OBJ_GFX_TRUCK 94
-#define MAP_OBJ_GFX_MACHOKE_CARRYING_BOX 95
-#define MAP_OBJ_GFX_MACHOKE_FACING_AWAY 96
-#define MAP_OBJ_GFX_BIRCHS_BAG 97
-#define MAP_OBJ_GFX_POOCHYENA 98
-#define MAP_OBJ_GFX_ARTIST 99
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL 100
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE 101
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE 102
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING 103
-#define MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE 104
-#define MAP_OBJ_GFX_RIVAL_MAY_NORMAL 105
-#define MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE 106
-#define MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE 107
-#define MAP_OBJ_GFX_RIVAL_MAY_SURFING 108
-#define MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE 109
-#define MAP_OBJ_GFX_CAMERAMAN 110
-#define MAP_OBJ_GFX_BRENDAN_UNDERWATER 111
-#define MAP_OBJ_GFX_MAY_UNDERWATER 112
-#define MAP_OBJ_GFX_MOVING_BOX 113
-#define MAP_OBJ_GFX_CABLE_CAR 114
-#define MAP_OBJ_GFX_SCIENTIST_2 115
-#define MAP_OBJ_GFX_MAN_7 116
-#define MAP_OBJ_GFX_AQUA_MEMBER_M 117
-#define MAP_OBJ_GFX_AQUA_MEMBER_F 118
-#define MAP_OBJ_GFX_MAGMA_MEMBER_M 119
-#define MAP_OBJ_GFX_MAGMA_MEMBER_F 120
-#define MAP_OBJ_GFX_SIDNEY 121
-#define MAP_OBJ_GFX_PHOEBE 122
-#define MAP_OBJ_GFX_GLACIA 123
-#define MAP_OBJ_GFX_DRAKE 124
-#define MAP_OBJ_GFX_ROXANNE 125
-#define MAP_OBJ_GFX_BRAWLY 126
-#define MAP_OBJ_GFX_WATTSON 127
-#define MAP_OBJ_GFX_FLANNERY 128
-#define MAP_OBJ_GFX_NORMAN 129
-#define MAP_OBJ_GFX_WINONA 130
-#define MAP_OBJ_GFX_LIZA 131
-#define MAP_OBJ_GFX_TATE 132
-#define MAP_OBJ_GFX_WALLACE 133
-#define MAP_OBJ_GFX_STEVEN 134
-#define MAP_OBJ_GFX_WALLY 135
-#define MAP_OBJ_GFX_LITTLE_BOY_3 136
-#define MAP_OBJ_GFX_BRENDAN_FISHING 137
-#define MAP_OBJ_GFX_MAY_FISHING 138
-#define MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN 139
-#define MAP_OBJ_GFX_SS_TIDAL 140
-#define MAP_OBJ_GFX_SUBMARINE_SHADOW 141
-#define MAP_OBJ_GFX_PICHU_DOLL 142
-#define MAP_OBJ_GFX_PIKACHU_DOLL 143
-#define MAP_OBJ_GFX_MARILL_DOLL 144
-#define MAP_OBJ_GFX_TOGEPI_DOLL 145
-#define MAP_OBJ_GFX_CYNDAQUIL_DOLL 146
-#define MAP_OBJ_GFX_CHIKORITA_DOLL 147
-#define MAP_OBJ_GFX_TOTODILE_DOLL 148
-#define MAP_OBJ_GFX_JIGGLYPUFF_DOLL 149
-#define MAP_OBJ_GFX_MEOWTH_DOLL 150
-#define MAP_OBJ_GFX_CLEFAIRY_DOLL 151
-#define MAP_OBJ_GFX_DITTO_DOLL 152
-#define MAP_OBJ_GFX_SMOOCHUM_DOLL 153
-#define MAP_OBJ_GFX_TREECKO_DOLL 154
-#define MAP_OBJ_GFX_TORCHIC_DOLL 155
-#define MAP_OBJ_GFX_MUDKIP_DOLL 156
-#define MAP_OBJ_GFX_DUSKULL_DOLL 157
-#define MAP_OBJ_GFX_WYNAUT_DOLL 158
-#define MAP_OBJ_GFX_BALTOY_DOLL 159
-#define MAP_OBJ_GFX_KECLEON_DOLL 160
-#define MAP_OBJ_GFX_AZURILL_DOLL 161
-#define MAP_OBJ_GFX_SKITTY_DOLL 162
-#define MAP_OBJ_GFX_SWABLU_DOLL 163
-#define MAP_OBJ_GFX_GULPIN_DOLL 164
-#define MAP_OBJ_GFX_LOTAD_DOLL 165
-#define MAP_OBJ_GFX_SEEDOT_DOLL 166
-#define MAP_OBJ_GFX_PIKA_CUSHION 167
-#define MAP_OBJ_GFX_ROUND_CUSHION 168
-#define MAP_OBJ_GFX_KISS_CUSHION 169
-#define MAP_OBJ_GFX_ZIGZAG_CUSHION 170
-#define MAP_OBJ_GFX_SPIN_CUSHION 171
-#define MAP_OBJ_GFX_DIAMOND_CUSHION 172
-#define MAP_OBJ_GFX_BALL_CUSHION 173
-#define MAP_OBJ_GFX_GRASS_CUSHION 174
-#define MAP_OBJ_GFX_FIRE_CUSHION 175
-#define MAP_OBJ_GFX_WATER_CUSHION 176
-#define MAP_OBJ_GFX_BIG_SNORLAX_DOLL 177
-#define MAP_OBJ_GFX_BIG_RHYDON_DOLL 178
-#define MAP_OBJ_GFX_BIG_LAPRAS_DOLL 179
-#define MAP_OBJ_GFX_BIG_VENUSAUR_DOLL 180
-#define MAP_OBJ_GFX_BIG_CHARIZARD_DOLL 181
-#define MAP_OBJ_GFX_BIG_BLASTOISE_DOLL 182
-#define MAP_OBJ_GFX_BIG_WAILMER_DOLL 183
-#define MAP_OBJ_GFX_BIG_REGIROCK_DOLL 184
-#define MAP_OBJ_GFX_BIG_REGICE_DOLL 185
-#define MAP_OBJ_GFX_BIG_REGISTEEL_DOLL 186
-#define MAP_OBJ_GFX_LATIAS 187
-#define MAP_OBJ_GFX_LATIOS 188
-#define MAP_OBJ_GFX_BOY_5 189
-#define MAP_OBJ_GFX_CONTEST_JUDGE 190
-#define MAP_OBJ_GFX_BRENDAN_WATERING 191
-#define MAP_OBJ_GFX_MAY_WATERING 192
-#define MAP_OBJ_GFX_BRENDAN_DECORATING 193
-#define MAP_OBJ_GFX_MAY_DECORATING 194
-#define MAP_OBJ_GFX_ARCHIE 195
-#define MAP_OBJ_GFX_MAXIE 196
-#define MAP_OBJ_GFX_KYOGRE_1 197
-#define MAP_OBJ_GFX_GROUDON_1 198
-#define MAP_OBJ_GFX_FOSSIL 199
-#define MAP_OBJ_GFX_REGIROCK 200
-#define MAP_OBJ_GFX_REGICE 201
-#define MAP_OBJ_GFX_REGISTEEL 202
-#define MAP_OBJ_GFX_SKITTY 203
-#define MAP_OBJ_GFX_KECLEON_1 204
-#define MAP_OBJ_GFX_KYOGRE_2 205
-#define MAP_OBJ_GFX_GROUDON_2 206
-#define MAP_OBJ_GFX_RAYQUAZA 207
-#define MAP_OBJ_GFX_ZIGZAGOON 208
-#define MAP_OBJ_GFX_PIKACHU 209
-#define MAP_OBJ_GFX_AZUMARILL 210
-#define MAP_OBJ_GFX_WINGULL 211
-#define MAP_OBJ_GFX_KECLEON_2 212
-#define MAP_OBJ_GFX_TUBER_M_SWIMMING 213
-#define MAP_OBJ_GFX_AZURILL 214
-#define MAP_OBJ_GFX_MOM 215
-#define MAP_OBJ_GFX_LINK_BRENDAN 216
-#define MAP_OBJ_GFX_LINK_MAY 217
-
-// These are dynamic object gfx ids.
-// They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
-// More info about them in include/constants/vars.h
-#define MAP_OBJ_GFX_VAR_0 240
-#define MAP_OBJ_GFX_VAR_1 241
-#define MAP_OBJ_GFX_VAR_2 242
-#define MAP_OBJ_GFX_VAR_3 243
-#define MAP_OBJ_GFX_VAR_4 244
-#define MAP_OBJ_GFX_VAR_5 245
-#define MAP_OBJ_GFX_VAR_6 246
-#define MAP_OBJ_GFX_VAR_7 247
-#define MAP_OBJ_GFX_VAR_8 248
-#define MAP_OBJ_GFX_VAR_9 249
-#define MAP_OBJ_GFX_VAR_A 250
-#define MAP_OBJ_GFX_VAR_B 251
-#define MAP_OBJ_GFX_VAR_C 252
-#define MAP_OBJ_GFX_VAR_D 253
-#define MAP_OBJ_GFX_VAR_E 254
-#define MAP_OBJ_GFX_VAR_F 255
-
-#define SHADOW_SIZE_S 0
-#define SHADOW_SIZE_M 1
-#define SHADOW_SIZE_L 2
-#define SHADOW_SIZE_XL 3
-
-#define TRACKS_NONE 0
-#define TRACKS_FOOT 1
-#define TRACKS_BIKE_TIRE 2
-
-#endif  // GUARD_CONSTANTS_MAP_OBJECTS_H
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 682d45003..856aba069 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -25,9 +25,9 @@
 #define VAR_TEMP_F                 0x400F
 
 // object gfx id vars
-// These 0x10 vars are used to dynamically control a map object's sprite.
+// These 0x10 vars are used to dynamically control a event object's sprite.
 // For example, the rival's sprite id is dynamically set based on the player's gender.
-// See VarGetFieldObjectGraphicsId().
+// See VarGetEventObjectGraphicsId().
 #define VAR_OBJ_GFX_ID_0           0x4010
 #define VAR_OBJ_GFX_ID_1           0x4011
 #define VAR_OBJ_GFX_ID_2           0x4012
diff --git a/include/decoration.h b/include/decoration.h
index d7f26bd05..6bff60771 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -181,7 +181,7 @@ bool8 sub_80FEFA4(void);
 void sub_80FF394(u16, u16, u16);
 void sub_80FF6AC(u8);
 void sub_80FF960(u8);
-void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 *, u8);
+void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 *, u8);
 void SetUpPlacingDecorationPlayerAvatar(u8, struct UnkStruct_02038900 *);
 void sub_8100038(u8);
 void sub_81000A0(u8);
diff --git a/include/event_data.h b/include/event_data.h
index 5656ab8dc..44d1e8e41 100644
--- a/include/event_data.h
+++ b/include/event_data.h
@@ -19,7 +19,7 @@ bool32 CanResetRTC(void);
 u16 *GetVarPointer(u16 id);
 u16 VarGet(u16 id);
 bool8 VarSet(u16 id, u16 value);
-u8 VarGetFieldObjectGraphicsId(u8 id);
+u8 VarGetEventObjectGraphicsId(u8 id);
 u8 *GetFlagPointer(u16 id);
 u8 FlagSet(u16 id);
 u8 FlagClear(u16 id);
diff --git a/include/map_obj_lock.h b/include/event_obj_lock.h
index 9fb57743e..e95bc9131 100644
--- a/include/map_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -1,16 +1,16 @@
-#ifndef GUARD_MAP_OBJ_LOCK_H
-#define GUARD_MAP_OBJ_LOCK_H
+#ifndef GUARD_EVENT_OBJ_LOCK_H
+#define GUARD_EVENT_OBJ_LOCK_H
 
 bool8 walkrun_is_standing_still(void);
 void sub_8064CDC(u8 taskId);
 bool8 sub_8064CFC(void);
-void ScriptFreezeMapObjects(void);
+void ScriptFreezeEventObjects(void);
 void sub_8064D38(u8 taskId);
 bool8 sub_8064DB4(void);
-void LockSelectedMapObject(void);
+void LockSelectedEventObject(void);
 void sub_8064E2C(void);
 void unref_sub_8064E5C(void);
 void sub_8064EAC(void);
 void sub_8064ED4(void);
 
-#endif // GUARD_MAP_OBJ_LOCK_H
+#endif // GUARD_EVENT_OBJ_LOCK_H
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 6105d1774..7ae04dfa6 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -3,6 +3,227 @@
 
 #include "sprite.h"
 
+enum {
+    MOVEMENT_TYPE_NONE,
+    MOVEMENT_TYPE_LOOK_AROUND,
+    MOVEMENT_TYPE_WANDER_AROUND,
+    MOVEMENT_TYPE_WANDER_UP_AND_DOWN,
+    MOVEMENT_TYPE_WANDER_DOWN_AND_UP,
+    MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT,
+    MOVEMENT_TYPE_FACE_UP,
+    MOVEMENT_TYPE_FACE_DOWN,
+    MOVEMENT_TYPE_FACE_LEFT,
+    MOVEMENT_TYPE_FACE_RIGHT,
+    MOVEMENT_TYPE_PLAYER,
+    MOVEMENT_TYPE_BERRY_TREE_GROWTH,
+    MOVEMENT_TYPE_FACE_DOWN_AND_UP,
+    MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_UP_AND_LEFT,
+    MOVEMENT_TYPE_FACE_UP_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_AND_LEFT,
+    MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT,
+    MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE,
+    MOVEMENT_TYPE_ROTATE_CLOCKWISE,
+    MOVEMENT_TYPE_WALK_UP_AND_DOWN,
+    MOVEMENT_TYPE_WALK_DOWN_AND_UP,
+    MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT,
+    MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT,
+    MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN,
+    MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP,
+    MOVEMENT_TYPE_COPY_PLAYER,
+    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE,
+    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE,
+    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE,
+    MOVEMENT_TYPE_TREE_DISGUISE,
+    MOVEMENT_TYPE_MOUNTAIN_DISGUISE,
+    MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS,
+    MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS,
+    MOVEMENT_TYPE_HIDDEN,
+    MOVEMENT_TYPE_WALK_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_WALK_IN_PLACE_UP,
+    MOVEMENT_TYPE_WALK_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_JOG_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_JOG_IN_PLACE_UP,
+    MOVEMENT_TYPE_JOG_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_RUN_IN_PLACE_DOWN,
+    MOVEMENT_TYPE_RUN_IN_PLACE_UP,
+    MOVEMENT_TYPE_RUN_IN_PLACE_LEFT,
+    MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT,
+    MOVEMENT_TYPE_INVISIBLE,
+};
+
+enum {
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_UP,
+    MOVEMENT_ACTION_JUMP_2_LEFT,
+    MOVEMENT_ACTION_JUMP_2_RIGHT,
+    MOVEMENT_ACTION_DELAY_1,
+    MOVEMENT_ACTION_DELAY_2,
+    MOVEMENT_ACTION_DELAY_4,
+    MOVEMENT_ACTION_DELAY_8,
+    MOVEMENT_ACTION_DELAY_16,
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_UP,
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_UP,
+    MOVEMENT_ACTION_SLIDE_LEFT,
+    MOVEMENT_ACTION_SLIDE_RIGHT,
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_UP,
+    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+    MOVEMENT_ACTION_START_ANIM_IN_DIRECTION,
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT ,
+    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+    MOVEMENT_ACITON_FACE_PLAYER,
+    MOVEMENT_ACITON_FACE_AWAY_PLAYER,
+    MOVEMENT_ACTION_LOCK_FACING_DIRECTION,
+    MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION,
+    MOVEMENT_ACITON_JUMP_DOWN,
+    MOVEMENT_ACITON_JUMP_UP,
+    MOVEMENT_ACITON_JUMP_LEFT,
+    MOVEMENT_ACITON_JUMP_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+    MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION,
+    MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN,
+    MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT,
+    MOVEMENT_ACTION_DISABLE_ANIMATION,
+    MOVEMENT_ACTION_RESTORE_ANIMATION,
+    MOVEMENT_ACTION_SET_INVISIBLE,
+    MOVEMENT_ACTION_SET_VISIBLE,
+    MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK,
+    MOVEMENT_ACTION_EMOTE_QUESTION_MARK,
+    MOVEMENT_ACTION_EMOTE_HEART,
+    MOVEMENT_ACTION_REVEAL_TRAINER,
+    MOVEMENT_ACTION_ROCK_SMASH_BREAK,
+    MOVEMENT_ACTION_CUT_TREE,
+    MOVEMENT_ACTION_SET_FIXED_PRIORITY,
+    MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY,
+    MOVEMENT_ACTION_INIT_AFFINE_ANIM,
+    MOVEMENT_ACTION_CLEAR_AFFINE_ANIM,
+    MOVEMENT_ACTION_WALK_DOWN_AFFINE_0,
+    MOVEMENT_ACTION_WALK_DOWN_AFFINE_1,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
+};
+
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN   (1 << 0)
 #define GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE    (1 << 1)
 #define GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN   (1 << 2)
@@ -26,24 +247,24 @@
 
 extern const u8 gUnknown_0830FD14[];
 
-#define fieldmap_object_cb(setup, callback, table) \
-static u8 callback(struct MapObject *, struct Sprite *);\
+#define movement_type_def(setup, table) \
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
 {\
-    meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
 }\
-static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
-    return table[sprite->data[1]](mapObject, sprite);\
+    return table[sprite->data[1]](eventObject, sprite);\
 }
 
-#define fieldmap_object_null_cb(setup, callback) \
-static u8 callback(struct MapObject *, struct Sprite *);\
+#define movement_type_empty_callback(setup) \
+static u8 setup##_callback(struct EventObject *, struct Sprite *);\
 void setup(struct Sprite *sprite)\
 {\
-    meta_step(&gMapObjects[sprite->data[0]], sprite, callback);\
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, setup##_callback);\
 }\
-static u8 callback(struct MapObject *mapObject, struct Sprite *sprite)\
+static u8 setup##_callback(struct EventObject *eventObject, struct Sprite *sprite)\
 {\
     return 0;\
 }
@@ -54,41 +275,40 @@ struct PairedPalettes
     const u16 *data;
 };
 
-extern const u16 gMapObjectPalette19[];
+extern const u16 gEventObjectPalette19[];
 
-extern const u32 gMapObjectPic_MovingBox[32];
-extern const struct SpriteFrameImage gMapObjectPicTable_PechaBerryTree[];
+extern const u32 gEventObjectPic_MovingBox[32];
+extern const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[];
 
 extern const u8 gFieldEffectPic_CutGrass[];
 extern const u16 gFieldEffectObjectPalette6[];
 
-void sub_805C058(struct MapObject *mapObject, s16 a, s16 b);
-void FieldObjectSetDirection(struct MapObject *pObject, u8 unk_18);
+void sub_805C058(struct EventObject *eventObject, s16 a, s16 b);
+void SetEventObjectDirection(struct EventObject *pObject, u8 unk_18);
 void MoveCoords(u8 direction, s16 *x, s16 *y);
-void meta_step(struct MapObject *pObject,  struct Sprite *pSprite,  u8 (*d8)(struct MapObject *, struct Sprite *));
-void npc_reset(struct MapObject *mapObject, struct Sprite *sprite);
+void UpdateEventObjectCurrentMovement(struct EventObject *pObject,  struct Sprite *pSprite,  u8 (*d8)(struct EventObject *, struct Sprite *));
 
-u8 sub_805CAAC(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CADC(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CAEC(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CB00(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CB5C(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CBB8(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CC14(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CC70(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CCAC(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CCE8(s16 a0, s16 a1, s16 a2, s16 a3);
-u8 sub_805CD24(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetVectorDirection(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_SouthNorth(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_WestEast(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_WestNorth(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_EastNorth(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_WestSouth(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_EastSouth(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_SouthNorthWest(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_SouthNorthEast(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_NorthWestEast(s16 a0, s16 a1, s16 a2, s16 a3);
+u8 GetLimitedVectorDirection_SouthWestEast(s16 a0, s16 a1, s16 a2, s16 a3);
 
-u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F3F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F438(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F4F0(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F5A8(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F660(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 cph_IM_DIFFERENT(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 sub_805F760(struct MapObject *, struct Sprite *, u8, bool8(u8));
-u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_None(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_FaceDirection(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed0(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed1(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed2(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Slide(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 cph_IM_DIFFERENT(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_GoSpeed4(struct EventObject *, struct Sprite *, u8, bool8(u8));
+u8 CopyablePlayerMovement_Jump(struct EventObject *, struct Sprite *, u8, bool8(u8));
 
 extern struct CameraSomething gUnknown_03004880;
 extern u16 gUnknown_03004898;
@@ -96,279 +316,278 @@ extern u16 gUnknown_0300489C;
 
 extern const struct Coords16 gDirectionToVector[];
 
-void FieldObjectCB_BerryTree(struct Sprite *);
-void FieldObjectCB_Hidden1(struct Sprite *);
-void FieldObjectCB_MountainDisguise(struct Sprite *);
-void FieldObjectCB_TreeDisguise(struct Sprite *);
-void sub_80587B4(struct Sprite *);
-void sub_805C884(struct Sprite *);
-void sub_805C8AC(struct Sprite *);
-void sub_805CDE8(struct Sprite *);
-void sub_805CF28(struct Sprite *);
-void sub_805D0AC(struct Sprite *);
-void sub_805D230(struct Sprite *);
-void sub_805D4F4(struct Sprite *);
-void sub_805D634(struct Sprite *);
-void sub_805D774(struct Sprite *);
-void sub_805D8B4(struct Sprite *);
-void sub_805D9F4(struct Sprite *);
-void sub_805DB34(struct Sprite *);
-void sub_805DC74(struct Sprite *);
-void sub_805DDB4(struct Sprite *);
-void sub_805DEF4(struct Sprite *);
-void sub_805E034(struct Sprite *);
-void sub_805E174(struct Sprite *);
-void sub_805E278(struct Sprite *);
-void sub_805E37C(struct Sprite *);
-void sub_805E5DC(struct Sprite *);
-void sub_805E668(struct Sprite *);
-void sub_805E6F4(struct Sprite *);
-void sub_805E780(struct Sprite *);
-void sub_805E80C(struct Sprite *);
-void sub_805E898(struct Sprite *);
-void sub_805E924(struct Sprite *);
-void sub_805E9B0(struct Sprite *);
-void sub_805EA3C(struct Sprite *);
-void sub_805EAC8(struct Sprite *);
-void sub_805EB54(struct Sprite *);
-void sub_805EBE0(struct Sprite *);
-void sub_805EC6C(struct Sprite *);
-void sub_805ECF8(struct Sprite *);
-void sub_805ED84(struct Sprite *);
-void sub_805EE10(struct Sprite *);
-void sub_805EE9C(struct Sprite *);
-void sub_805EF28(struct Sprite *);
-void sub_805EFB4(struct Sprite *);
-void sub_805F040(struct Sprite *);
-void sub_805F0CC(struct Sprite *);
-void sub_805F158(struct Sprite *);
-void sub_805F1E4(struct Sprite *);
-void sub_805F270(struct Sprite *);
-void sub_805F2FC(struct Sprite *);
-void sub_805F8E0(struct Sprite *);
-void sub_805FB20(struct Sprite *);
-void sub_805FB90(struct Sprite *);
-void sub_805FC00(struct Sprite *);
-void sub_805FC70(struct Sprite *);
+void MovementType_BerryTreeGrowth(struct Sprite *);
+void MovementType_Hidden(struct Sprite *);
+void MovementType_MountainDisguise(struct Sprite *);
+void MovementType_TreeDisguise(struct Sprite *);
+void MovementType_Player(struct Sprite *);
+void MovementType_None(struct Sprite *);
+void MovementType_WanderAround(struct Sprite *);
+void MovementType_LookAround(struct Sprite *);
+void MovementType_WanderUpAndDown(struct Sprite *);
+void MovementType_WanderLeftAndRight(struct Sprite *);
+void MovementType_FaceDirection(struct Sprite *);
+void MovementType_FaceDownAndUp(struct Sprite *);
+void MovementType_FaceLeftAndRight(struct Sprite *);
+void MovementType_FaceUpAndLeft(struct Sprite *);
+void MovementType_FaceUpAndRight(struct Sprite *);
+void MovementType_FaceDownAndLeft(struct Sprite *);
+void MovementType_FaceDownAndRight(struct Sprite *);
+void MovementType_FaceDownUpAndLeft(struct Sprite *);
+void MovementType_FaceDownUpAndRight(struct Sprite *);
+void MovementType_FaceUpLeftAndRight(struct Sprite *);
+void MovementType_FaceDownLeftAndRight(struct Sprite *);
+void MovementType_RotateCounterclockwise(struct Sprite *);
+void MovementType_RotateClockwise(struct Sprite *);
+void MovementType_WalkBackAndForth(struct Sprite *);
+void MovementType_WalkSequenceUpRightLeftDown(struct Sprite *);
+void MovementType_WalkSequenceRightLeftDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpRightLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownUpRight(struct Sprite *);
+void MovementType_WalkSequenceUpLeftRightDown(struct Sprite *);
+void MovementType_WalkSequenceLeftRightDownUp(struct Sprite *);
+void MovementType_WalkSequenceDownUpLeftRight(struct Sprite *);
+void MovementType_WalkSequenceRightDownUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftUpDownRight(struct Sprite *);
+void MovementType_WalkSequenceUpDownRightLeft(struct Sprite *);
+void MovementType_WalkSequenceRightLeftUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownRightLeftUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpDownLeft(struct Sprite *);
+void MovementType_WalkSequenceUpDownLeftRight(struct Sprite *);
+void MovementType_WalkSequenceLeftRightUpDown(struct Sprite *);
+void MovementType_WalkSequenceDownLeftRightUp(struct Sprite *);
+void MovementType_WalkSequenceUpLeftDownRight(struct Sprite *);
+void MovementType_WalkSequenceDownRightUpLeft(struct Sprite *);
+void MovementType_WalkSequenceLeftDownRightUp(struct Sprite *);
+void MovementType_WalkSequenceRightUpLeftDown(struct Sprite *);
+void MovementType_WalkSequenceUpRightDownLeft(struct Sprite *);
+void MovementType_WalkSequenceDownLeftUpRight(struct Sprite *);
+void MovementType_WalkSequenceLeftUpRightDown(struct Sprite *);
+void MovementType_WalkSequenceRightDownLeftUp(struct Sprite *);
+void MovementType_CopyPlayer(struct Sprite *);
+void MovementType_CopyPlayerInGrass(struct Sprite *);
+void MovementType_WalkInPlace(struct Sprite *);
+void MovementType_JogInPlace(struct Sprite *);
+void MovementType_RunInPlace(struct Sprite *);
+void MovementType_Invisible(struct Sprite *);
 
-u8 sub_805C8F0(struct MapObject *, struct Sprite *);
-u8 sub_805C904(struct MapObject *, struct Sprite *);
-u8 sub_805C930(struct MapObject *, struct Sprite *);
-u8 sub_805C96C(struct MapObject *, struct Sprite *);
-u8 sub_805C98C(struct MapObject *, struct Sprite *);
-u8 sub_805C9D8(struct MapObject *, struct Sprite *);
-u8 sub_805CA08(struct MapObject *, struct Sprite *);
-u8 sub_805CE2C(struct MapObject *, struct Sprite *);
-u8 sub_805CE40(struct MapObject *, struct Sprite *);
-u8 sub_805CE6C(struct MapObject *, struct Sprite *);
-u8 sub_805CEB0(struct MapObject *, struct Sprite *);
-u8 sub_805CEE0(struct MapObject *, struct Sprite *);
-u8 sub_805CF6C(struct MapObject *, struct Sprite *);
-u8 sub_805CF80(struct MapObject *, struct Sprite *);
-u8 sub_805CFAC(struct MapObject *, struct Sprite *);
-u8 sub_805CFE8(struct MapObject *, struct Sprite *);
-u8 sub_805D008(struct MapObject *, struct Sprite *);
-u8 sub_805D054(struct MapObject *, struct Sprite *);
-u8 sub_805D084(struct MapObject *, struct Sprite *);
-u8 sub_805D0F0(struct MapObject *, struct Sprite *);
-u8 sub_805D104(struct MapObject *, struct Sprite *);
-u8 sub_805D130(struct MapObject *, struct Sprite *);
-u8 sub_805D16C(struct MapObject *, struct Sprite *);
-u8 sub_805D18C(struct MapObject *, struct Sprite *);
-u8 sub_805D1D8(struct MapObject *, struct Sprite *);
-u8 sub_805D208(struct MapObject *, struct Sprite *);
-u8 sub_805D274(struct MapObject *, struct Sprite *);
-u8 sub_805D2A0(struct MapObject *, struct Sprite *);
-u8 sub_805D2C0(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_1(struct MapObject *, struct Sprite *);
-u8 sub_805D3EC(struct MapObject *, struct Sprite *);
-u8 do_berry_tree_growth_sparkle_2(struct MapObject *, struct Sprite *);
-u8 sub_805D458(struct MapObject *, struct Sprite *);
-u8 sub_805D4A8(struct MapObject *, struct Sprite *);
-u8 sub_805D538(struct MapObject *, struct Sprite *);
-u8 sub_805D54C(struct MapObject *, struct Sprite *);
-u8 sub_805D578(struct MapObject *, struct Sprite *);
-u8 sub_805D5BC(struct MapObject *, struct Sprite *);
-u8 sub_805D5EC(struct MapObject *, struct Sprite *);
-u8 sub_805D678(struct MapObject *, struct Sprite *);
-u8 sub_805D68C(struct MapObject *, struct Sprite *);
-u8 sub_805D6B8(struct MapObject *, struct Sprite *);
-u8 sub_805D6FC(struct MapObject *, struct Sprite *);
-u8 sub_805D72C(struct MapObject *, struct Sprite *);
-u8 sub_805D7B8(struct MapObject *, struct Sprite *);
-u8 sub_805D7CC(struct MapObject *, struct Sprite *);
-u8 sub_805D7F8(struct MapObject *, struct Sprite *);
-u8 sub_805D83C(struct MapObject *, struct Sprite *);
-u8 sub_805D86C(struct MapObject *, struct Sprite *);
-u8 sub_805D8F8(struct MapObject *, struct Sprite *);
-u8 sub_805D90C(struct MapObject *, struct Sprite *);
-u8 sub_805D938(struct MapObject *, struct Sprite *);
-u8 sub_805D97C(struct MapObject *, struct Sprite *);
-u8 sub_805D9AC(struct MapObject *, struct Sprite *);
-u8 sub_805DA38(struct MapObject *, struct Sprite *);
-u8 sub_805DA4C(struct MapObject *, struct Sprite *);
-u8 sub_805DA78(struct MapObject *, struct Sprite *);
-u8 sub_805DABC(struct MapObject *, struct Sprite *);
-u8 sub_805DAEC(struct MapObject *, struct Sprite *);
-u8 sub_805DB78(struct MapObject *, struct Sprite *);
-u8 sub_805DB8C(struct MapObject *, struct Sprite *);
-u8 sub_805DBB8(struct MapObject *, struct Sprite *);
-u8 sub_805DBFC(struct MapObject *, struct Sprite *);
-u8 sub_805DC2C(struct MapObject *, struct Sprite *);
-u8 sub_805DCB8(struct MapObject *, struct Sprite *);
-u8 sub_805DCCC(struct MapObject *, struct Sprite *);
-u8 sub_805DCF8(struct MapObject *, struct Sprite *);
-u8 sub_805DD3C(struct MapObject *, struct Sprite *);
-u8 sub_805DD6C(struct MapObject *, struct Sprite *);
-u8 sub_805DDF8(struct MapObject *, struct Sprite *);
-u8 sub_805DE0C(struct MapObject *, struct Sprite *);
-u8 sub_805DE38(struct MapObject *, struct Sprite *);
-u8 sub_805DE7C(struct MapObject *, struct Sprite *);
-u8 sub_805DEAC(struct MapObject *, struct Sprite *);
-u8 sub_805DF38(struct MapObject *, struct Sprite *);
-u8 sub_805DF4C(struct MapObject *, struct Sprite *);
-u8 sub_805DF78(struct MapObject *, struct Sprite *);
-u8 sub_805DFBC(struct MapObject *, struct Sprite *);
-u8 sub_805DFEC(struct MapObject *, struct Sprite *);
-u8 sub_805E078(struct MapObject *, struct Sprite *);
-u8 sub_805E08C(struct MapObject *, struct Sprite *);
-u8 sub_805E0B8(struct MapObject *, struct Sprite *);
-u8 sub_805E0FC(struct MapObject *, struct Sprite *);
-u8 sub_805E12C(struct MapObject *, struct Sprite *);
-u8 sub_805E1B8(struct MapObject *, struct Sprite *);
-u8 sub_805E1E4(struct MapObject *, struct Sprite *);
-u8 sub_805E208(struct MapObject *, struct Sprite *);
-u8 sub_805E234(struct MapObject *, struct Sprite *);
-u8 sub_805E2BC(struct MapObject *, struct Sprite *);
-u8 sub_805E2E8(struct MapObject *, struct Sprite *);
-u8 sub_805E30C(struct MapObject *, struct Sprite *);
-u8 sub_805E338(struct MapObject *, struct Sprite *);
-u8 sub_805E3C0(struct MapObject *, struct Sprite *);
-u8 sub_805E3D4(struct MapObject *, struct Sprite *);
-u8 sub_805E40C(struct MapObject *, struct Sprite *);
-u8 sub_805E4C4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E620(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E6AC(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E738(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E7C4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E850(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E8DC(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E968(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805E9F4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EA80(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EB0C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EB98(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EC24(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805ECB0(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805ED3C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EDC8(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EE54(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EEE0(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EF6C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805EFF8(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F084(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F110(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F19C(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F228(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 sub_805E4EC(struct MapObject *, struct Sprite *);
-u8 sub_805F2B4(struct MapObject *, struct Sprite *);
-u8 sub_805E5B4(struct MapObject *, struct Sprite *);
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *);
-u8 sub_805F364(struct MapObject *, struct Sprite *);
-u8 sub_805F3C4(struct MapObject *, struct Sprite *);
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *, struct Sprite *);
-u8 mss_08062EA4(struct MapObject *, struct Sprite *);
-u8 sub_805F3C4(struct MapObject *, struct Sprite *);
-u8 sub_805FAF8(struct MapObject *, struct Sprite *);
-u8 sub_805FB64(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FBD4(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FC44(struct MapObject *, struct Sprite *);
-u8 sub_805FB04(struct MapObject *, struct Sprite *);
-u8 sub_805FCB4(struct MapObject *, struct Sprite *);
-u8 sub_805FCE8(struct MapObject *, struct Sprite *);
-u8 sub_805FD08(struct MapObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderAround_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_LookAround_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderUpAndDown_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *, struct Sprite *);
+u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDirection_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndUp_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_RotateClockwise_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkBackAndForth_Step3(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkSequence_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_CopyPlayer_Step2(struct EventObject *, struct Sprite *);
+u8 MovementType_Hidden_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_JogInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_RunInPlace_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step1(struct EventObject *, struct Sprite *);
+u8 MovementType_Invisible_Step2(struct EventObject *, struct Sprite *);
 
-u8 get_go_image_anim_num(u8);
-u8 get_go_fast_image_anim_num(u8);
-u8 get_go_fast_image_anim_num(u8);
-u8 get_go_faster_image_anim_num(u8);
-u8 sub_805FD78(u8);
+u8 GetMoveDirectionAnimNum(u8);
+u8 GetMoveDirectionFastAnimNum(u8);
+u8 GetMoveDirectionFastAnimNum(u8);
+u8 GetMoveDirectionFasterAnimNum(u8);
+u8 GetMoveDirectionFastestAnimNum(u8);
 
 u32 state_to_direction(u8, u32, u32);
 
 void sub_805AA98();
 void sub_805AAB0(void);
-u8 sub_805AB54(void);
-u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8);
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
-u8 GetFieldObjectIdByXY(s16, s16);
-u8 GetFieldObjectIdByLocalIdAndMapInternal(u8, u8, u8);
-u8 GetFieldObjectIdByLocalId(u8);
-u8 GetAvailableFieldObjectSlot(u16, u8, u8, u8 *);
-void RemoveFieldObjectByLocalIdAndMap(u8, u8, u8);
-void RemoveFieldObjectInternal(struct MapObject *);
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
+u8 GetFirstInactiveEventObjectId(void);
+u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8);
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8, u8, u8, u8 *);
+u8 GetEventObjectIdByXY(s16, s16);
+u8 GetEventObjectIdByLocalIdAndMapInternal(u8, u8, u8);
+u8 GetEventObjectIdByLocalId(u8);
+u8 GetAvailableEventObjectId(u16, u8, u8, u8 *);
+void RemoveEventObjectByLocalIdAndMap(u8, u8, u8);
+void RemoveEventObjectInternal(struct EventObject *);
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *);
 u8 show_sprite(u8, u8, u8);
-void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables);
-u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
+void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables);
+u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority);
 u8 sub_805B410(u8, u8, s16, s16, u8, u8);
-void sub_805B55C(s16 a, s16 b);
+void TrySpawnEventObjects(s16, s16);
 void sub_805B710(u16 i, u16 i1);
-void sub_805B980(struct MapObject *, u8);
-void FieldObjectTurn(struct MapObject *, u8);
-void FieldObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8);
-void FieldObjectHandleDynamicGraphicsId(struct MapObject *);
+void sub_805B980(struct EventObject *, u8);
+void EventObjectTurn(struct EventObject *, u8);
+void EventObjectTurnByLocalIdAndMap(u8, u8, u8, u8);
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8);
+void SetEventObjectDynamicGraphicsId(struct EventObject *);
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8, u8, u8, u8);
-void FieldObjectGetLocalIdAndMap(struct MapObject *, void *, void *, void *);
+void EventObjectGetLocalIdAndMap(struct EventObject *, void *, void *, void *);
 void sub_805BCC0(s16 x, s16 y);
 void sub_805BCF0(u8, u8, u8, u8);
 void sub_805BD48(u8, u8, u8);
@@ -377,123 +596,120 @@ void gpu_pal_allocator_reset__manage_upper_four(void);
 void sub_805BDF8(u16);
 u8 sub_805BE58(const struct SpritePalette *);
 void pal_patch_for_npc(u16, u16);
-u8 FindFieldObjectPaletteIndexByTag(u16);
+u8 FindEventObjectPaletteIndexByTag(u16);
 void npc_load_two_palettes__no_record(u16, u8);
 void npc_load_two_palettes__and_record(u16, u8);
-void npc_coords_shift(struct MapObject *pObject, s16 x, s16 y);
+void ShiftEventObjectCoords(struct EventObject *pObject, s16 x, s16 y);
 void sub_805C0F8(u8, u8, u8, s16, s16);
-void npc_coords_shift_still(struct MapObject *pObject);
-u8 GetFieldObjectIdByXYZ(u16, u16, u8);
-void UpdateFieldObjectsForCameraUpdate(s16, s16);
+void ShiftStillEventObjectCoords(struct EventObject *pObject);
+u8 GetEventObjectIdByXYZ(u16, u16, u8);
+void UpdateEventObjectsForCameraUpdate(s16, s16);
 u8 AddCameraObject(u8);
 void CameraObjectReset1(void);
-u8 * GetFieldObjectScriptPointerByFieldObjectId(u8);
-u16 GetFieldObjectFlagIdByFieldObjectId(u8);
-u8 FieldObjectGetBerryTreeId(u8);
-struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8, u8, u8);
-void sub_805C754(struct MapObject *pObject);
-void sub_805C774(struct MapObject *, u8);
-void sub_805C78C(u8, u8, u8);
+u8 * GetEventObjectScriptPointerByEventObjectId(u8);
+u16 GetEventObjectFlagIdByEventObjectId(u8);
+u8 EventObjectGetBerryTreeId(u8);
+struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8, u8, u8);
+void OverrideTemplateCoordsForEventObject(struct EventObject *pObject);
+void OverrideMovementTypeForEventObject(struct EventObject *, u8);
+void TryOverrideTemplateCoordsForEventObject(u8, u8, u8);
 void sub_805C7C4(u8 i);
-u8 FieldObjectDirectionToImageAnimId(u8);
-u8 get_go_image_anim_num(u8 unk_19);
-u8 sub_805FD98(u8);
-u8 sub_805FDE8(u8);
-u8 sub_805FDF8(u8);
-u8 sub_805FE08(u8);
-void npc_set_running_behaviour_etc(struct MapObject *, u8);
-u8 npc_running_behaviour_by_direction(u8);
-u8 npc_block_way(struct MapObject *, s16, s16, u32);
-u8 sub_8060024(struct MapObject *, s16, s16, u8);
+u8 GetFaceDirectionAnimNum(u8);
+u8 GetMoveDirectionAnimNum(u8 unk_19);
+u8 GetAcroWheelieDirectionAnimNum(u8);
+u8 GetFishingDirectionAnimNum(u8);
+u8 GetFishingNoCatchDirectionAnimNum(u8);
+u8 GetFishingBiteDirectionAnimNum(u8);
+void SetTrainerMovementType(struct EventObject *, u8);
+u8 GetTrainerFacingDirectionMovementType(u8);
+u8 GetCollisionAtCoords(struct EventObject *, s16, s16, u32);
+u8 GetCollisionFlagsAtCoords(struct EventObject *, s16, s16, u8);
 bool8 IsBerryTreeSparkling(u8, u8, u8);
 void sub_8060288(u8, u8, u8);
 void sub_8060388(s16, s16, s16 *, s16 *);
 void sub_80603CC(s16 x, s16 y, s16 *pInt, s16 *pInt1);
-void GetFieldObjectMovingCameraOffset(s16 *, s16 *);
-void FieldObjectMoveDestCoords(struct MapObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *);
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *);
-bool8 FieldObjectSetSpecialAnim(struct MapObject *, u8);
-void FieldObjectForceSetSpecialAnim(struct MapObject *pObject, u8 a);
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *);
-void FieldObjectClearAnim(struct MapObject *);
-bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *);
-u8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *);
-u8 FieldObjectGetSpecialAnim(struct MapObject *);
-u8 GetFaceDirectionAnimId(u32);
-u8 GetSimpleGoAnimId(u32);
-u8 GetGoSpeed0AnimId(u32);
-u8 sub_8060744(u32);
-u8 d2s_08064034(u32);
-u8 sub_806079C(u32);
-u8 sub_80607C8(u32);
-u8 sub_80607F4(u32);
-u8 GetJumpLedgeAnimId(u32);
-u8 sub_806084C(u32);
-u8 sub_8060878(u32);
+void GetEventObjectMovingCameraOffset(s16 *, s16 *);
+void EventObjectMoveDestCoords(struct EventObject *pObject, u32 unk_19, s16 *pInt, s16 *pInt1);
+bool8 EventObjectIsMovementOverridden(struct EventObject *);
+bool8 EventObjectIsHeldMovementActive(struct EventObject *);
+bool8 EventObjectSetHeldMovement(struct EventObject *, u8);
+void EventObjectForceSetHeldMovement(struct EventObject *pObject, u8 a);
+void EventObjectClearHeldMovementIfActive(struct EventObject *);
+void EventObjectClearHeldMovement(struct EventObject *);
+bool8 EventObjectCheckHeldMovementStatus(struct EventObject *);
+u8 EventObjectClearHeldMovementIfFinished(struct EventObject *);
+u8 EventObjectGetHeldMovementActionId(struct EventObject *);
+u8 GetFaceDirectionMovementAction(u32);
+u8 GetWalkSlowMovementAction(u32);
+u8 GetWalkNormalMovementAction(u32);
+u8 GetWalkFastMovementAction(u32);
+u8 GetRideWaterCurrentMovementAction(u32);
+u8 GetWalkFastestMovementAction(u32);
+u8 GetSlideMovementAction(u32);
+u8 GetPlayerRunMovementAction(u32);
+u8 GetJump2MovementAction(u32);
+u8 GetJumpInPlaceMovementAction(u32);
+u8 GetJumpInPlaceTurnAroundMovementAction(u32);
 u8 sub_80608A4(u32);
-u8 sub_80608D0(u32);
-u8 GetStepInPlaceDelay32AnimId(u32);
-u8 GetStepInPlaceDelay16AnimId(u32);
-u8 GetStepInPlaceDelay8AnimId(u32);
-u8 GetStepInPlaceDelay4AnimId(u32);
-u8 FieldObjectFaceOppositeDirection(struct MapObject *, u8);
-u8 sub_80609D8(u8);
-u8 sub_8060A04(u8);
-u8 sub_8060A30(u8);
-u8 sub_8060A5C(u8);
-u8 sub_8060A88(u8);
-u8 sub_8060AB4(u8);
-u8 sub_8060AE0(u8);
-u8 sub_8060B0C(u8);
-u8 sub_8060B38(u8);
-u8 sub_8060B64(u8);
+u8 GetJumpSpecialMovementAction(u32);
+u8 GetWalkInPlaceSlowMovementAction(u32);
+u8 GetWalkInPlaceNormalMovementAction(u32);
+u8 GetWalkInPlaceFastMovementAction(u32);
+u8 GetWalkInPlaceFastestMovementAction(u32);
+u8 EventObjectFaceOppositeDirection(struct EventObject *, u8);
+u8 GetAcroWheelieFaceDirectionMovementAction(u8);
+u8 GetAcroPopWheelieFaceDirectionMovementAction(u8);
+u8 GetAcroEndWheelieFaceDirectionMovementAction(u8);
+u8 GetAcroWheelieHopFaceDirectionMovementAction(u8);
+u8 GetAcroWheelieHopDirectionMovementAction(u8);
+u8 GetAcroWheelieJumpDirectionMovementAction(u8);
+u8 GetAcroWheelieInPlaceDirectionMovementAction(u8);
+u8 GetAcroPopWheelieMoveDirectionMovementAction(u8);
+u8 GetAcroWheelieMoveDirectionMovementAction(u8);
+u8 GetAcroEndWheelieMoveDirectionMovementAction(u8);
 u8 GetOppositeDirection(u8);
-void sub_80634D0(struct MapObject *, struct Sprite *);
-u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialEventObjectParametrized(u8, u8, u8, s16, s16, u8);
 void CameraObjectSetFollowedObjectId(u8);
-u8 sub_805ADDC(u8);
-void sub_8060320(u32, s16 *, s16 *, s16, s16);
+u8 TryInitLocalEventObject(u8);
 u8 obj_unfreeze(struct Sprite *, s16, s16, u8);
 u16 npc_paltag_by_palslot(u8);
 void sub_8060470(s16 *, s16 *, s16, s16);
-bool8 FreezeMapObject(struct MapObject *);
-void FreezeMapObjects(void);
-void FreezeMapObjectsExceptOne(u8);
-void UnfreezeMapObjects(void);
-void sub_806487C(struct Sprite *sprite, bool8 invisible);
-void sub_8064990(u8, u8);
-void UnfreezeMapObject(struct MapObject *mapObject);
-void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3);
+bool8 FreezeEventObject(struct EventObject *);
+void FreezeEventObjects(void);
+void FreezeEventObjectsExceptOne(u8);
+void UnfreezeEventObjects(void);
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible);
+void TurnEventObject(u8, u8);
+void UnfreezeEventObject(struct EventObject *eventObject);
 void sub_806467C(struct Sprite *sprite, u8 direction);
 bool8 sub_806468C(struct Sprite *sprite);
 void sub_80646E4(struct Sprite *sprite, u8 a2, u8 a3, u8 a4);
-void DoShadowFieldEffect(struct MapObject *mapObject);
+void DoShadowFieldEffect(struct EventObject *eventObject);
 u8 sub_8064704(struct Sprite *);
 u8 sub_806478C(struct Sprite *);
-void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3);
-void DoRippleFieldEffect(struct MapObject *mapObj, struct Sprite *sprite);
+void SetAndStartSpriteAnim(struct Sprite *sprite, u8 a2, u8 a3);
+void DoRippleFieldEffect(struct EventObject *eventObj, struct Sprite *sprite);
 bool8 IsZCoordMismatchAt(u8 z, s16 x, s16 y);
 bool8 AreZCoordsCompatible(u8 z1, u8 z2);
-void FieldObjectUpdateMetatileBehaviors(struct MapObject *);
-void GetGroundEffectFlags_Reflection(struct MapObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *, u32 *);
-void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *, u32 *);
-void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Tracks(struct MapObject *, u32 *);
-void GetGroundEffectFlags_SandPile(struct MapObject *, u32 *);
-void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Puddle(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Ripple(struct MapObject *, u32 *);
-void GetGroundEffectFlags_ShortGrass(struct MapObject *, u32 *);
-void GetGroundEffectFlags_HotSprings(struct MapObject *, u32 *);
-void GetGroundEffectFlags_Seaweed(struct MapObject *, u32 *);
-void GetGroundEffectFlags_JumpLanding(struct MapObject *, u32 *);
-u8 FieldObjectCheckForReflectiveSurface(struct MapObject *);
+void EventObjectUpdateMetatileBehaviors(struct EventObject *);
+void GetGroundEffectFlags_Reflection(struct EventObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *, u32 *);
+void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *, u32 *);
+void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Tracks(struct EventObject *, u32 *);
+void GetGroundEffectFlags_SandPile(struct EventObject *, u32 *);
+void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Puddle(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Ripple(struct EventObject *, u32 *);
+void GetGroundEffectFlags_ShortGrass(struct EventObject *, u32 *);
+void GetGroundEffectFlags_HotSprings(struct EventObject *, u32 *);
+void GetGroundEffectFlags_Seaweed(struct EventObject *, u32 *);
+void GetGroundEffectFlags_JumpLanding(struct EventObject *, u32 *);
+u8 EventObjectCheckForReflectiveSurface(struct EventObject *);
 u8 GetLedgeJumpDirection(s16, s16, u8);
 u8 ZCoordToPriority(u8);
-void FieldObjectUpdateZCoord(struct MapObject *pObject);
+void EventObjectUpdateZCoord(struct EventObject *pObject);
 void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
 
 #endif // GUARD_EVENTOBJMV_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 49e9f23e3..b79eebd83 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -30,7 +30,7 @@ u8 *sub_80682A8(struct MapPosition *, u8, u8);
 void overworld_poison_timer_set(void);
 void prev_quest_postbuffer_cursor_backup_reset(void);
 u8 *sub_8068E24(struct MapPosition *);
-u8 *GetFieldObjectScriptPointerPlayerFacing(void);
+u8 *GetEventObjectScriptPointerPlayerFacing(void);
 bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *);
 bool8 sub_8068870(u16 a);
 bool8 sub_8068894(void);
diff --git a/include/field_effect.h b/include/field_effect.h
index 96234fae9..4ca97c898 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -88,11 +88,11 @@ bool8 sub_8086E50(struct Task *);
 bool8 sub_8086EB0(struct Task *);
 bool8 sub_8086ED4(struct Task *);
 
-bool8 sub_8086FB0(struct Task *, struct MapObject *);
-bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *);
-bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *);
-bool8 sub_8087030(struct Task *, struct MapObject *);
-bool8 sub_8087058(struct Task *, struct MapObject *);
+bool8 sub_8086FB0(struct Task *, struct EventObject *);
+bool8 waterfall_1_do_anim_probably(struct Task *, struct EventObject *);
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct EventObject *);
+bool8 sub_8087030(struct Task *, struct EventObject *);
+bool8 sub_8087058(struct Task *, struct EventObject *);
 
 bool8 sub_8087124(struct Task *);
 bool8 dive_2_unknown(struct Task *);
@@ -100,25 +100,25 @@ bool8 dive_3_unknown(struct Task *);
 
 void sub_80871B8(u8);
 
-bool8 sub_808722C(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_8087264(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_8087298(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80872E4(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80873D8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80873F4(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_808722C(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_8087264(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_8087298(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80872E4(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80873D8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80873F4(struct Task *, struct EventObject *, struct Sprite *);
 
-bool8 sub_80874CC(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80874FC(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_8087548(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_808759C(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80874CC(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80874FC(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_8087548(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_808759C(struct Task *, struct EventObject *, struct Sprite *);
 
 void sub_8087654(u8);
 
-bool8 sub_80876C8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80876F8(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_8087774(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80877AC(struct Task *, struct MapObject *, struct Sprite *);
-bool8 sub_80877D4(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80876C8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80876F8(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_8087774(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80877AC(struct Task *, struct EventObject *, struct Sprite *);
+bool8 sub_80877D4(struct Task *, struct EventObject *, struct Sprite *);
 
 void sub_80878F4(struct Task *);
 void sub_8087914(struct Task *);
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 7bba24fa6..8d207aded 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -3,8 +3,8 @@
 
 extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
 
-void sub_812869C(struct MapObject *);
-bool8 sub_81286C4(struct MapObject *);
+void sub_812869C(struct EventObject *);
+bool8 sub_81286C4(struct EventObject *);
 void oamc_shadow(struct Sprite *);
 void sub_8087638(struct Sprite *);
 void sub_808788C(struct Sprite *);
@@ -29,8 +29,8 @@ void sub_8127ED0(u8, u8);
 void sub_8127F28(u8, u8, s16);
 u8 sub_8128124(u8 id);
 void ash(s16, s16, u16, s16);
-void SetUpReflection(struct MapObject *mapObj, struct Sprite *sprite, u8 a);
-u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject);
+void SetUpReflection(struct EventObject *eventObj, struct Sprite *sprite, u8 a);
+u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject);
 u8 sub_8126FF0(u8, u8, u8, s16, s16);
 
 #endif // GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index b62782c8d..0d8776fd1 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -14,7 +14,7 @@ enum {
     PLAYER_AVATAR_STATE_WATERING,
 };
 
-// sub_80587B4
+// MovementType_None2
 void player_step(u8 a, u16 b, u16 c);
 u8 ForcedMovement_None(void);
 u8 ForcedMovement_Slip(void);
@@ -36,17 +36,17 @@ u8 ForcedMovement_MuddySlope(void);
 void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys);
 void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys);
 void sub_8058D0C(u8 direction, u16 heldKeys);
-u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
+u8 CheckForEventObjectCollision(struct EventObject *a, s16 b, s16 c, u8 d, u8 e);
 void SetPlayerAvatarTransitionFlags(u16 a);
-void nullsub_49(struct MapObject *a);
-void PlayerAvatarTransition_Normal(struct MapObject *a);
-void PlayerAvatarTransition_MachBike(struct MapObject *a);
-void PlayerAvatarTransition_AcroBike(struct MapObject *a);
-void PlayerAvatarTransition_Surfing(struct MapObject *a);
-void PlayerAvatarTransition_Underwater(struct MapObject *a);
-void sub_80591F4(struct MapObject *a);
+void nullsub_49(struct EventObject *a);
+void PlayerAvatarTransition_Normal(struct EventObject *a);
+void PlayerAvatarTransition_MachBike(struct EventObject *a);
+void PlayerAvatarTransition_AcroBike(struct EventObject *a);
+void PlayerAvatarTransition_Surfing(struct EventObject *a);
+void PlayerAvatarTransition_Underwater(struct EventObject *a);
+void sub_80591F4(struct EventObject *a);
 void sub_8059204(void);
-u8 player_get_x22(void);
+u8 PlayerGetCopyableMovement(void);
 void PlayerSetAnimId(u8 a, u8 b);
 void PlayerGoSpeed1(u8 a);
 void PlayerGoSpeed2(u8 a);
@@ -71,8 +71,8 @@ void sub_8059618(u8 a);
 void sub_8059630(u8 a);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y);
 void PlayerGetDestCoords(s16 *, s16 *);
-u8 player_get_direction_lower_nybble(void);
-u8 player_get_direction_upper_nybble(void);
+u8 GetPlayerFacingDirection(void);
+u8 GetPlayerMovementDirection(void);
 u8 PlayerGetZCoord(void);
 u8 TestPlayerAvatarFlags(u8);
 u8 sub_80597D0(void);
@@ -95,14 +95,14 @@ void sub_8059BF4(void);
 // sub_8059C3C
 void sub_8059C94(u8);
 void sub_8059D08(u8);
-u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c);
-u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c);
-u8 sub_8059F40(struct Task *task, struct MapObject *b, struct MapObject *c);
-u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObject);
-u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject);
-u8 sub_805A100(struct Task *task, struct MapObject *mapObject);
-u8 sub_805A178(struct Task *task, struct MapObject *mapObject);
-u8 sub_805A1B8(struct Task *task, struct MapObject *mapObject);
+u8 sub_8059E84(struct Task *task, struct EventObject *b, struct EventObject *c);
+u8 sub_8059EA4(struct Task *task, struct EventObject *b, struct EventObject *c);
+u8 sub_8059F40(struct Task *task, struct EventObject *b, struct EventObject *c);
+u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject);
+u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject);
+u8 sub_805A100(struct Task *task, struct EventObject *eventObject);
+u8 sub_805A178(struct Task *task, struct EventObject *eventObject);
+u8 sub_805A1B8(struct Task *task, struct EventObject *eventObject);
 void sub_805A20C(u8 a);
 void StartFishing(u8 a);
 u8 Fishing1(struct Task *task);
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 5aa9eb360..a85f5b101 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -5,7 +5,6 @@
 extern struct BackupMapData gUnknown_03004870;
 struct MapHeader *mapconnection_get_mapheader(struct MapConnection *connection);
 int GetMapBorderIdAt(int x, int y);
-extern bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
 int CanCameraMoveInDirection(int direction);
 u32 GetBehaviorByMetatileId(u16 metatile);
 void MapGridSetMetatileEntryAt(int, int, u16);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index d87cd78f4..f200c0061 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -70,7 +70,7 @@ struct BackupMapData
     u16 *map;
 };
 
-struct MapObjectTemplate
+struct EventObjectTemplate
 {
     /*0x00*/ u8 localId;
     /*0x01*/ u8 graphicsId;
@@ -79,15 +79,13 @@ struct MapObjectTemplate
     /*0x06*/ s16 y;
     /*0x08*/ u8 elevation;
     /*0x09*/ u8 movementType;
-    /*0x0A*/ u8 unkA_0:4;
-             u8 unkA_4:4;
-    ///*0x0B*/ u8 fillerB[1];
-    /*0x0C*/ u16 unkC;
-    /*0x0E*/ u16 unkE;
+    /*0x0A*/ u8 movementRangeX:4;
+             u8 movementRangeY:4;
+    /*0x0C*/ u16 trainerType;
+    /*0x0E*/ u16 trainerRange_berryTreeId;
     /*0x10*/ u8 *script;
     /*0x14*/ u16 flagId;
-    /*0x16*/ u8 filler_16[2];
-};  /*size = 0x18*/
+};
 
 struct WarpEvent
 {
@@ -132,12 +130,12 @@ struct BgEvent
 
 struct MapEvents
 {
-    u8 mapObjectCount;
+    u8 eventObjectCount;
     u8 warpCount;
     u8 coordEventCount;
     u8 bgEventCount;
 
-    struct MapObjectTemplate *mapObjects;
+    struct EventObjectTemplate *eventObjects;
     struct WarpEvent *warps;
     struct CoordEvent *coordEvents;
     struct BgEvent *bgEvents;
@@ -175,16 +173,16 @@ struct MapHeader
     /* 0x1B */ u8 battleType;
 };
 
-struct MapObject
+struct EventObject
 {
     /*0x00*/ u32 active:1;
-             u32 regularAnimActive:1;
+             u32 singleMovementActive:1;
              u32 triggerGroundEffectsOnMove:1;
              u32 triggerGroundEffectsOnStop:1;
              u32 disableCoveringGroundEffects:1; // disables ground effects that cover parts of the object's sprite
              u32 landingJump:1;
-             u32 specialAnimActive:1;
-             u32 specialAnimFinished:1;
+             u32 heldMovementActive:1;
+             u32 heldMovementFinished:1;
     /*0x01*/ u32 frozen:1;
              u32 facingDirectionLocked:1;
              u32 disableAnim:1; // used to disable forced movement sliding animations (like on ice)
@@ -206,7 +204,7 @@ struct MapObject
              u32 fixedPriority:1;
     /*0x04*/ u8 spriteId;
     /*0x05*/ u8 graphicsId;
-    /*0x06*/ u8 animPattern;
+    /*0x06*/ u8 movementType;
     /*0x07*/ u8 trainerType;
     /*0x08*/ u8 localId;
     /*0x09*/ u8 mapNum;
@@ -227,17 +225,17 @@ struct MapObject
     }  range;
     /*0x1A*/ u8 fieldEffectSpriteId;
     /*0x1B*/ u8 warpArrowSpriteId;
-    /*0x1C*/ u8 animId;
+    /*0x1C*/ u8 movementActionId;
     /*0x1D*/ u8 trainerRange_berryTreeId;
     /*0x1E*/ u8 currentMetatileBehavior;
     /*0x1F*/ u8 previousMetatileBehavior;
     /*0x20*/ u8 previousMovementDirection;
     /*0x21*/ u8 directionSequenceIndex;
-    /*0x22*/ u8 playerAnimId;
+    /*0x22*/ u8 playerCopyableMovement; // used as an index to gCopyPlayerMovementFuncs for the "copy player" movement types
     /*size = 0x24*/
 };
 
-struct MapObjectGraphicsInfo
+struct EventObjectGraphicsInfo
 {
     /*0x00*/ u16 tileTag;
     /*0x02*/ u16 paletteTag1;
@@ -284,6 +282,10 @@ enum
     DIR_NORTH,
     DIR_WEST,
     DIR_EAST,
+    DIR_SOUTHWEST,
+    DIR_SOUTHEAST,
+    DIR_NORTHWEST,
+    DIR_NORTHEAST,
 };
 
 enum
@@ -314,7 +316,7 @@ struct PlayerAvatar /* 0x202E858 */
     /*0x02*/ u8 runningState; // this is a static running state. 00 is not moving, 01 is turn direction, 02 is moving.
     /*0x03*/ u8 tileTransitionState; // this is a transition running state: 00 is not moving, 01 is transition between tiles, 02 means you are on the frame in which you have centered on a tile but are about to keep moving, even if changing directions. 2 is also used for a ledge hop, since you are transitioning.
     /*0x04*/ u8 spriteId;
-    /*0x05*/ u8 mapObjectId;
+    /*0x05*/ u8 eventObjectId;
     /*0x06*/ bool8 preventStep;
     /*0x07*/ u8 gender;
     /*0x08*/ u8 acroBikeState; // 00 is normal, 01 is turning, 02 is standing wheelie, 03 is hopping wheelie
@@ -336,8 +338,8 @@ struct Camera
     s32 y;
 };
 
-extern struct MapObject gMapObjects[];
-extern u8 gSelectedMapObject;
+extern struct EventObject gEventObjects[];
+extern u8 gSelectedEventObject;
 extern struct MapHeader gMapHeader;
 extern struct PlayerAvatar gPlayerAvatar;
 
diff --git a/include/global.h b/include/global.h
index 857ae6f07..0f015745b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -96,7 +96,7 @@ enum LanguageId
 // capacities of various saveblock objects
 #define DAYCARE_MON_COUNT   2
 #define POKEBLOCKS_COUNT    40
-#define MAP_OBJECTS_COUNT   16
+#define EVENT_OBJECTS_COUNT   16
 #define BERRY_TREES_COUNT   128
 #define FLAGS_COUNT         288
 #define VARS_COUNT          256
@@ -668,8 +668,8 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x972*/ u8 filler_972[0x6];
     /*0x978*/ u16 trainerRematchStepCounter;
     /*0x97A*/ u8 trainerRematches[100];
-    /*0x9E0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
-    /*0xC20*/ struct MapObjectTemplate mapObjectTemplates[64];
+    /*0x9E0*/ struct EventObject eventObjects[EVENT_OBJECTS_COUNT];
+    /*0xC20*/ struct EventObjectTemplate eventObjectTemplates[64];
     /*0x1220*/ u8 flags[FLAGS_COUNT];
     /*0x1340*/ u16 vars[VARS_COUNT];
     /*0x1540*/ u32 gameStats[NUM_GAME_STATS];
diff --git a/include/macros/movement.inc b/include/macros/movement.inc
index 674ce7169..80a5b5dca 100644
--- a/include/macros/movement.inc
+++ b/include/macros/movement.inc
@@ -1,4 +1,4 @@
-	.macro create_movement name
+	.macro create_movement_action name
 	enum _\name
 	.macro \name
 	.byte _\name
@@ -6,111 +6,104 @@
 	.endm
 
 	enum_start
-	create_movement step_00
-	create_movement step_01
-	create_movement step_02
-	create_movement step_03
-	create_movement slow_step_down
-	create_movement slow_step_up
-	create_movement slow_step_left
-	create_movement slow_step_right
-	create_movement step_down
-	create_movement step_up
-	create_movement step_left
-	create_movement step_right
-	create_movement fast_step_down
-	create_movement fast_step_up
-	create_movement fast_step_left
-	create_movement fast_step_right
-	create_movement step_10
-	create_movement step_11
-	create_movement step_12
-	create_movement step_13
-	create_movement step_14
-	create_movement step_15
-	create_movement step_16
-	create_movement step_17
-	create_movement step_18
-	create_movement step_19
-	create_movement step_1a
-	create_movement step_1b
-	create_movement step_1c
-	create_movement step_1d
-	create_movement step_1e
-	create_movement step_1f
-	create_movement step_20
-	create_movement step_21
-	create_movement step_22
-	create_movement step_23
-	create_movement step_24
-	create_movement step_25
-	create_movement step_26
-	create_movement step_27
-	create_movement step_28
-	create_movement step_29
-	create_movement step_2a
-	create_movement step_2b
-	create_movement step_2c
-	create_movement step_2d
-	create_movement step_2e
-	create_movement step_2f
-	create_movement step_30
-	create_movement step_31
-	create_movement step_32
-	create_movement step_33
-	create_movement step_34
-	create_movement step_35
-	create_movement step_36
-	create_movement step_37
-	create_movement step_38
-	create_movement step_39
-	create_movement step_3a
-	create_movement step_3b
-	create_movement step_3c
-	create_movement step_3d
-	create_movement step_3e
-	create_movement step_3f
-	create_movement step_40
-	create_movement step_41
-	create_movement step_42
-	create_movement step_43
-	create_movement step_44
-	create_movement step_45
-	create_movement step_46
-	create_movement step_47
-	create_movement step_48
-	create_movement step_49
-	create_movement step_4a
-	create_movement step_4b
-	create_movement step_4c
-	create_movement step_4d
-	create_movement step_4e
-	create_movement step_4f
-	create_movement step_50
-	create_movement step_51
-	create_movement step_52
-	create_movement step_53
-	create_movement step_54
-	create_movement step_55
-	create_movement step_56
-	create_movement step_57
-	create_movement step_58
-	create_movement step_59
-	create_movement step_5a
-	create_movement step_5b
-	create_movement step_5c
-	create_movement step_5d
-	create_movement step_5e
-	create_movement step_5f
-	create_movement step_60
-	create_movement step_61
-
-	enum_start 0x91
-	create_movement step_91
-	create_movement step_92
-
-	enum_start 0x96
-	create_movement step_96
+	create_movement_action face_down
+	create_movement_action face_up
+	create_movement_action face_left
+	create_movement_action face_right
+	create_movement_action walk_slow_down
+	create_movement_action walk_slow_up
+	create_movement_action walk_slow_left
+	create_movement_action walk_slow_right
+	create_movement_action walk_down
+	create_movement_action walk_up
+	create_movement_action walk_left
+	create_movement_action walk_right
+	create_movement_action jump_2_down
+	create_movement_action jump_2_up
+	create_movement_action jump_2_left
+	create_movement_action jump_2_right
+	create_movement_action delay_1
+	create_movement_action delay_2
+	create_movement_action delay_4
+	create_movement_action delay_8
+	create_movement_action delay_16
+	create_movement_action walk_fast_down
+	create_movement_action walk_fast_up
+	create_movement_action walk_fast_left
+	create_movement_action walk_fast_right
+	create_movement_action walk_in_place_slow_down
+	create_movement_action walk_in_place_slow_up
+	create_movement_action walk_in_place_slow_left
+	create_movement_action walk_in_place_slow_right
+	create_movement_action walk_in_place_down
+	create_movement_action walk_in_place_up
+	create_movement_action walk_in_place_left
+	create_movement_action walk_in_place_right
+	create_movement_action walk_in_place_fast_down
+	create_movement_action walk_in_place_fast_up
+	create_movement_action walk_in_place_fast_left
+	create_movement_action walk_in_place_fast_right
+	create_movement_action walk_in_place_fastest_down
+	create_movement_action walk_in_place_fastest_up
+	create_movement_action walk_in_place_fastest_left
+	create_movement_action walk_in_place_fastest_right
+	create_movement_action ride_water_current_down
+	create_movement_action ride_water_current_up
+	create_movement_action ride_water_current_left
+	create_movement_action ride_water_current_right
+	create_movement_action walk_fastest_down
+	create_movement_action walk_fastest_up
+	create_movement_action walk_fastest_left
+	create_movement_action walk_fastest_right
+	create_movement_action slide_down
+	create_movement_action slide_up
+	create_movement_action slide_left
+	create_movement_action slide_right
+	create_movement_action player_run_down
+	create_movement_action player_run_up
+	create_movement_action player_run_left
+	create_movement_action player_run_right
+	create_movement_action start_anim_in_direction
+	create_movement_action jump_special_down
+	create_movement_action jump_special_up
+	create_movement_action jump_special_left
+	create_movement_action jump_special_right
+	create_movement_action face_player
+	create_movement_action face_away_player
+	create_movement_action lock_facing_direction
+	create_movement_action unlock_facing_direction
+	create_movement_action jump_down
+	create_movement_action jump_up
+	create_movement_action jump_left
+	create_movement_action jump_right
+	create_movement_action jump_in_place_down
+	create_movement_action jump_in_place_up
+	create_movement_action jump_in_place_left
+	create_movement_action jump_in_place_right
+	create_movement_action jump_in_place_down_up
+	create_movement_action jump_in_place_up_down
+	create_movement_action jump_in_place_left_right
+	create_movement_action jump_in_place_right_left
+	create_movement_action face_original_direction
+	create_movement_action nurse_joy_bow
+	create_movement_action enable_jump_landing_ground_effect
+	create_movement_action disable_jump_landing_ground_effect
+	create_movement_action disable_anim
+	create_movement_action restore_anim
+	create_movement_action set_invisible
+	create_movement_action set_visible
+	create_movement_action emote_exclamation_mark
+	create_movement_action emote_question_mark
+	create_movement_action emote_heart
+	create_movement_action reveal_trainer
+	create_movement_action rock_smash_break
+	create_movement_action cut_tree
+	create_movement_action set_fixed_priority
+	create_movement_action clear_fixed_priority
+	create_movement_action init_affine_anim
+	create_movement_action clear_affine_anim
+	create_movement_action walk_down_affine_0
+	create_movement_action walk_down_affine_1
 
 	enum_start 0xfe
-	create_movement step_end
+	create_movement_action end_movement
diff --git a/include/overworld.h b/include/overworld.h
index f9446c789..fa54b0906 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -9,11 +9,11 @@ struct UnkPlayerStruct
     u8 player_field_1;
 };
 
-struct LinkPlayerMapObject
+struct LinkPlayerEventObject
 {
     u8 active;
     u8 linkPlayerId;
-    u8 mapObjId;
+    u8 eventObjId;
     u8 mode;
 };
 
@@ -37,10 +37,10 @@ void ResetGameStats(void);
 void IncrementGameStat(u8 index);
 u32 GetGameStat(u8 index);
 void SetGameStat(u8, u32);
-// LoadMapObjTemplatesFromHeader
-// LoadSaveblockMapObjScripts
-void Overworld_SetMapObjTemplateCoords(u8, s16, s16);
-void Overworld_SetMapObjTemplateMovementType(u8, u8);
+// LoadEventObjTemplatesFromHeader
+// LoadSaveblockEventObjScripts
+void Overworld_SetEventObjTemplateCoords(u8, s16, s16);
+void Overworld_SetEventObjTemplateMovementType(u8, u8);
 // mapdata_load_assets_to_gpu_and_full_redraw
 // get_mapdata_header
 // ApplyCurrentWarp
@@ -209,11 +209,11 @@ bool32 sub_8055870(void);
 u32 sub_80558AC(void);
 u32 sub_8055910(void);
 u32 sub_8055940(void);
-// ZeroLinkPlayerMapObject
-void strange_npc_table_clear(void);
-// ZeroMapObject
-void SpawnLinkPlayerMapObject(u8, s16, s16, u8);
-void InitLinkPlayerMapObjectPos(struct MapObject *, s16, s16);
+// ClearLinkPlayerEventObject
+void ClearLinkPlayerEventObjects(void);
+// ZeroEventObject
+void SpawnLinkPlayerEventObject(u8, s16, s16, u8);
+void InitLinkPlayerEventObjectPos(struct EventObject *, s16, s16);
 // unref_sub_8055A6C
 // unref_sub_8055A9C
 u8 sub_8055AE8(u8);
diff --git a/include/shop.h b/include/shop.h
index 347d46d3c..4de58eaf2 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -11,7 +11,7 @@ enum
 // shop view window NPC info enum
 enum
 {
-    MAP_OBJ_ID,
+    EVENT_OBJ_ID,
     X_COORD,
     Y_COORD,
     ANIM_NUM
diff --git a/include/trainer_see.h b/include/trainer_see.h
index e36df981b..d67117743 100644
--- a/include/trainer_see.h
+++ b/include/trainer_see.h
@@ -5,7 +5,7 @@
 #include "task.h"
 
 bool8 CheckTrainers(void);
-void sub_8084794(struct MapObject *var);
+void sub_8084794(struct EventObject *var);
 void ScrSpecial_EndTrainerApproach(void);
 
 #endif // GUARD_TRAINER_SEE_H
diff --git a/ld_script.txt b/ld_script.txt
index a9314d060..f8cc8abf9 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -85,7 +85,7 @@ SECTIONS {
         src/field_player_avatar.o(.text);
         src/event_object_movement.o(.text);
         src/field_message_box.o(.text);
-        src/map_obj_lock.o(.text);
+        src/event_obj_lock.o(.text);
         src/text_window.o(.text);
         src/script.o(.text);
         src/scrcmd.o(.text);
diff --git a/src/battle/battle_records.c b/src/battle/battle_records.c
index 8b9cf9ea0..4375fc32f 100644
--- a/src/battle/battle_records.c
+++ b/src/battle/battle_records.c
@@ -14,7 +14,7 @@ struct DebugStruct1
     u8 var1[10];
 };
 
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
+extern struct LinkPlayerEventObject gLinkPlayerEventObjects[4];
 extern u8 gBattleOutcome;
 
 #if DEBUG
@@ -220,7 +220,7 @@ void UpdateLinkBattleRecords(int id)
         gTrainerCards[id].playerName,
         gTrainerCards[id].trainerId,
         gBattleOutcome,
-        gLinkPlayers[gLinkPlayerMapObjects[id].linkPlayerId].language);
+        gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language);
 }
 
 #if DEBUG
@@ -238,7 +238,7 @@ void debug_sub_81257E0(void)
             gUnknown_Debug_4245CC[id].var1,
             gUnknown_Debug_4245CC[id].var0,
             gUnknown_Debug_8424620[i].unk1,
-            gLinkPlayers[gLinkPlayerMapObjects[id].linkPlayerId].language);
+            gLinkPlayers[gLinkPlayerEventObjects[id].linkPlayerId].language);
     }
 }
 #endif
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 9e03b5d2d..b5c362258 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -38,7 +38,7 @@ extern void (*gFieldCallback)(void);
 
 EWRAM_DATA static u16 sTrainerBattleMode = 0;
 EWRAM_DATA u16 gTrainerBattleOpponent = 0;
-EWRAM_DATA static u16 sTrainerMapObjectLocalId = 0;
+EWRAM_DATA static u16 sTrainerEventObjectLocalId = 0;
 EWRAM_DATA static u8 *sTrainerIntroSpeech = NULL;
 EWRAM_DATA static u8 *sTrainerDefeatSpeech = NULL;
 EWRAM_DATA static u8 *sTrainerVictorySpeech = NULL;
@@ -50,7 +50,7 @@ extern u16 gBattleTypeFlags;
 extern u16 gSpecialVar_LastTalked;
 extern u8 gBattleOutcome;
 
-extern struct MapObject gMapObjects[];
+extern struct EventObject gEventObjects[];
 
 extern u8 gUnknown_0819F818[];
 extern u8 gUnknown_0819F840[];
@@ -99,7 +99,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_0[] =
 {
     {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -111,7 +111,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_1[] =
 {
     {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -123,7 +123,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_2[] =
 {
     {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -135,7 +135,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_3[] =
 {
     {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerIntroSpeech,         TRAINER_PARAM_CLEAR_VAL_32BIT},
     {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -147,7 +147,7 @@ static const struct TrainerBattleParameter gTrainerBattleSpecs_4[] =
 {
     {&sTrainerBattleMode,          TRAINER_PARAM_LOAD_VAL_8BIT},
     {&gTrainerBattleOpponent,      TRAINER_PARAM_LOAD_VAL_16BIT},
-    {&sTrainerMapObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
+    {&sTrainerEventObjectLocalId,    TRAINER_PARAM_LOAD_VAL_16BIT},
     {&sTrainerIntroSpeech,         TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerDefeatSpeech,        TRAINER_PARAM_LOAD_VAL_32BIT},
     {&sTrainerVictorySpeech,       TRAINER_PARAM_CLEAR_VAL_32BIT},
@@ -514,7 +514,7 @@ void BattleSetup_StartWildBattle(void)
 static void DoStandardWildBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_80597F4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = 0;
@@ -526,7 +526,7 @@ static void DoStandardWildBattle(void)
 void BattleSetup_StartRoamerBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_80597F4();
     gMain.savedCallback = CB2_EndWildBattle;
     gBattleTypeFlags = BATTLE_TYPE_ROAMER;
@@ -538,7 +538,7 @@ void BattleSetup_StartRoamerBattle(void)
 static void DoSafariBattle(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     sub_80597F4();
     gMain.savedCallback = sub_80C824C;
     gBattleTypeFlags = BATTLE_TYPE_SAFARI;
@@ -932,7 +932,7 @@ static void ResetTrainerOpponentIds(void)
 {
     sTrainerBattleMode = 0;
     gTrainerBattleOpponent = 0;
-    sTrainerMapObjectLocalId = 0;
+    sTrainerEventObjectLocalId = 0;
     sTrainerIntroSpeech = 0;
     sTrainerDefeatSpeech = 0;
     sTrainerVictorySpeech = 0;
@@ -978,10 +978,10 @@ static void TrainerBattleLoadArgs(const struct TrainerBattleParameter *specs, co
 
 static void SetMapVarsToTrainer(void)
 {
-    if (sTrainerMapObjectLocalId)
+    if (sTrainerEventObjectLocalId)
     {
-        gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
-        gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+        gSpecialVar_LastTalked = sTrainerEventObjectLocalId;
+        gSelectedEventObject = GetEventObjectIdByLocalIdAndMap(sTrainerEventObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
 }
 
@@ -1026,10 +1026,10 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
     }
 }
 
-void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
+void TrainerWantsBattle(u8 trainerEventObjId, u8 *trainerScript)
 {
-    gSelectedMapObject = trainerMapObjId;
-    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
+    gSelectedEventObject = trainerEventObjId;
+    gSpecialVar_LastTalked = gEventObjects[trainerEventObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_0819F80B);
     ScriptContext2_Enable();
@@ -1043,9 +1043,9 @@ bool32 GetTrainerFlagFromScriptPointer(u8 *data)
 
 void sub_8082524(void)
 {
-    struct MapObject *mapObject = &gMapObjects[gSelectedMapObject];
+    struct EventObject *eventObject = &gEventObjects[gSelectedEventObject];
 
-    npc_set_running_behaviour_etc(mapObject, npc_running_behaviour_by_direction(mapObject->facingDirection));
+    SetTrainerMovementType(eventObject, GetTrainerFacingDirectionMovementType(eventObject->facingDirection));
 }
 
 u8 ScrSpecial_GetTrainerBattleMode(void)
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 8659f202f..99e8af4b2 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -10,7 +10,7 @@
 #include "item.h"
 #include "constants/items.h"
 #include "main.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/moves.h"
 #include "new_game.h"
 #include "overworld.h"
@@ -163,60 +163,60 @@ static const u8 sFemaleTrainerClasses[] =
 
 static const u8 sMaleTrainerGfxIds[] =
 {
-    MAP_OBJ_GFX_HIKER,
-    MAP_OBJ_GFX_TUBER_M,
-    MAP_OBJ_GFX_MAN_4,
-    MAP_OBJ_GFX_BOY_4,
-    MAP_OBJ_GFX_MANIAC,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_M,
-    MAP_OBJ_GFX_BLACK_BELT,
-    MAP_OBJ_GFX_MAN_6,
-    MAP_OBJ_GFX_MAN_6,
-    MAP_OBJ_GFX_CAMPER,
-    MAP_OBJ_GFX_MANIAC,
-    MAP_OBJ_GFX_PSYCHIC_M,
-    MAP_OBJ_GFX_GENTLEMAN,
-    MAP_OBJ_GFX_SCHOOL_KID_M,
-    MAP_OBJ_GFX_MAN_3,
-    MAP_OBJ_GFX_OLD_MAN_1,
-    MAP_OBJ_GFX_YOUNGSTER,
-    MAP_OBJ_GFX_FISHERMAN,
-    MAP_OBJ_GFX_CYCLING_TRIATHLETE_M,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_M,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_M,
-    MAP_OBJ_GFX_MAN_4,
-    MAP_OBJ_GFX_MAN_6,
-    MAP_OBJ_GFX_LITTLE_BOY_1,
-    MAP_OBJ_GFX_SAILOR,
-    MAP_OBJ_GFX_MANIAC,
-    MAP_OBJ_GFX_MAN_5,
-    MAP_OBJ_GFX_CAMPER,
-    MAP_OBJ_GFX_BUG_CATCHER,
-    MAP_OBJ_GFX_HIKER,
+    EVENT_OBJ_GFX_HIKER,
+    EVENT_OBJ_GFX_TUBER_M,
+    EVENT_OBJ_GFX_MAN_4,
+    EVENT_OBJ_GFX_BOY_4,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_BLACK_BELT,
+    EVENT_OBJ_GFX_MAN_6,
+    EVENT_OBJ_GFX_MAN_6,
+    EVENT_OBJ_GFX_CAMPER,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_PSYCHIC_M,
+    EVENT_OBJ_GFX_GENTLEMAN,
+    EVENT_OBJ_GFX_SCHOOL_KID_M,
+    EVENT_OBJ_GFX_MAN_3,
+    EVENT_OBJ_GFX_OLD_MAN_1,
+    EVENT_OBJ_GFX_YOUNGSTER,
+    EVENT_OBJ_GFX_FISHERMAN,
+    EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M,
+    EVENT_OBJ_GFX_MAN_4,
+    EVENT_OBJ_GFX_MAN_6,
+    EVENT_OBJ_GFX_LITTLE_BOY_1,
+    EVENT_OBJ_GFX_SAILOR,
+    EVENT_OBJ_GFX_MANIAC,
+    EVENT_OBJ_GFX_MAN_5,
+    EVENT_OBJ_GFX_CAMPER,
+    EVENT_OBJ_GFX_BUG_CATCHER,
+    EVENT_OBJ_GFX_HIKER,
 };
 
 static const u8 sFemaleTrainerGfxIds[] =
 {
-    MAP_OBJ_GFX_WOMAN_3,
-    MAP_OBJ_GFX_TUBER_F,
-    MAP_OBJ_GFX_WOMAN_7,
-    MAP_OBJ_GFX_WOMAN_1,
-    MAP_OBJ_GFX_WOMAN_3,
-    MAP_OBJ_GFX_BEAUTY,
-    MAP_OBJ_GFX_LASS,
-    MAP_OBJ_GFX_GIRL_3,
-    MAP_OBJ_GFX_WOMAN_2,
-    MAP_OBJ_GFX_OLD_WOMAN_1,
-    MAP_OBJ_GFX_CYCLING_TRIATHLETE_F,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_F,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_F,
-    MAP_OBJ_GFX_GIRL_3,
-    MAP_OBJ_GFX_WOMAN_7,
-    MAP_OBJ_GFX_RUNNING_TRIATHLETE_F,
-    MAP_OBJ_GFX_PICNICKER,
-    MAP_OBJ_GFX_WOMAN_3,
-    MAP_OBJ_GFX_PICNICKER,
-    MAP_OBJ_GFX_LASS,
+    EVENT_OBJ_GFX_WOMAN_3,
+    EVENT_OBJ_GFX_TUBER_F,
+    EVENT_OBJ_GFX_WOMAN_7,
+    EVENT_OBJ_GFX_WOMAN_1,
+    EVENT_OBJ_GFX_WOMAN_3,
+    EVENT_OBJ_GFX_BEAUTY,
+    EVENT_OBJ_GFX_LASS,
+    EVENT_OBJ_GFX_GIRL_3,
+    EVENT_OBJ_GFX_WOMAN_2,
+    EVENT_OBJ_GFX_OLD_WOMAN_1,
+    EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_GIRL_3,
+    EVENT_OBJ_GFX_WOMAN_7,
+    EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F,
+    EVENT_OBJ_GFX_PICNICKER,
+    EVENT_OBJ_GFX_WOMAN_3,
+    EVENT_OBJ_GFX_PICNICKER,
+    EVENT_OBJ_GFX_LASS,
 };
 
 const u16 gBattleTowerBannedSpecies[] =
@@ -814,7 +814,7 @@ void SetBattleTowerTrainerGfxId(u8 trainerIndex)
         return;
     }
 
-    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BOY_1);
+    VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BOY_1);
 }
 
 void SetEReaderTrainerGfxId(void)
diff --git a/src/berry.c b/src/berry.c
index 8829407da..323cb39cf 100644
--- a/src/berry.c
+++ b/src/berry.c
@@ -1150,11 +1150,11 @@ static struct BerryTree *GetBerryTreeInfo(u8 id)
 // this was called because the berry script was successful: meaning the player chose to
 // water the tree. We need to check for the current tree stage and set the appropriate
 // water flag to true.
-bool32 FieldObjectInteractionWaterBerryTree(void)
+bool32 EventObjectInteractionWaterBerryTree(void)
 {
     // GetBerryTreeInfo does not sanitize the tree retrieved, but there are no known
     // instances where this can cause problems.
-    struct BerryTree *tree = GetBerryTreeInfo(FieldObjectGetBerryTreeId(gSelectedMapObject));
+    struct BerryTree *tree = GetBerryTreeInfo(EventObjectGetBerryTreeId(gSelectedEventObject));
 
     switch (tree->stage)
     {
@@ -1178,8 +1178,8 @@ bool32 FieldObjectInteractionWaterBerryTree(void)
 
 bool8 IsPlayerFacingUnplantedSoil(void)
 {
-    if (GetFieldObjectScriptPointerPlayerFacing() == S_BerryTree
-     && GetStageByBerryTreeId(FieldObjectGetBerryTreeId(gSelectedMapObject)) == BERRY_STAGE_NO_BERRY)
+    if (GetEventObjectScriptPointerPlayerFacing() == S_BerryTree
+     && GetStageByBerryTreeId(EventObjectGetBerryTreeId(gSelectedEventObject)) == BERRY_STAGE_NO_BERRY)
         return TRUE;
     else
         return FALSE;
@@ -1187,10 +1187,10 @@ bool8 IsPlayerFacingUnplantedSoil(void)
 
 bool8 TryToWaterBerryTree(void)
 {
-    if (GetFieldObjectScriptPointerPlayerFacing() != S_BerryTree)
+    if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree)
         return FALSE;
     else
-        return FieldObjectInteractionWaterBerryTree();
+        return EventObjectInteractionWaterBerryTree();
 }
 
 void ClearBerryTrees(void)
@@ -1413,7 +1413,7 @@ static u16 GetStageDurationByBerryType(u8 berry)
     return GetBerryInfo(berry)->stageDuration * 60;
 }
 
-void FieldObjectInteractionGetBerryTreeData(void)
+void EventObjectInteractionGetBerryTreeData(void)
 {
     u8 id;
     u8 berry;
@@ -1421,7 +1421,7 @@ void FieldObjectInteractionGetBerryTreeData(void)
     u8 group;
     u8 num;
 
-    id = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    id = EventObjectGetBerryTreeId(gSelectedEventObject);
     berry = GetBerryTypeByBerryTreeId(id);
     ResetBerryTreeSparkleFlag(id);
     localId = gSpecialVar_LastTalked;
@@ -1446,25 +1446,25 @@ void Berry_FadeAndGoToBerryBagMenu(void)
     SetMainCallback2(sub_80A68CC);
 }
 
-void FieldObjectInteractionPlantBerryTree(void)
+void EventObjectInteractionPlantBerryTree(void)
 {
     u8 berry = ItemIdToBerryType(gSpecialVar_ItemId);
 
-    PlantBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject), berry, 1, TRUE);
-    FieldObjectInteractionGetBerryTreeData();
+    PlantBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject), berry, 1, TRUE);
+    EventObjectInteractionGetBerryTreeData();
 }
 
-void FieldObjectInteractionPickBerryTree(void)
+void EventObjectInteractionPickBerryTree(void)
 {
-    u8 id = FieldObjectGetBerryTreeId(gSelectedMapObject);
+    u8 id = EventObjectGetBerryTreeId(gSelectedEventObject);
     u8 berry = GetBerryTypeByBerryTreeId(id);
 
     gSpecialVar_0x8004 = AddBagItem(BerryTypeToItemId(berry), GetBerryCountByBerryTreeId(id));
 }
 
-void FieldObjectInteractionRemoveBerryTree(void)
+void EventObjectInteractionRemoveBerryTree(void)
 {
-    RemoveBerryTree(FieldObjectGetBerryTreeId(gSelectedMapObject));
+    RemoveBerryTree(EventObjectGetBerryTreeId(gSelectedEventObject));
     sub_8060288(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
 }
 
@@ -1493,13 +1493,13 @@ static const u8 gUnknown_Debug_083F7FD3[] = _("");
 
 u8* DebugOpenBerryInfo(void)
 {
-    if (GetFieldObjectScriptPointerPlayerFacing() != S_BerryTree)
+    if (GetEventObjectScriptPointerPlayerFacing() != S_BerryTree)
     {
         return NULL;
     }
     else
     {
-        u32 berryTreeId = FieldObjectGetBerryTreeId(gSelectedMapObject);
+        u32 berryTreeId = EventObjectGetBerryTreeId(gSelectedEventObject);
         struct BerryTree *berryTree = GetBerryTreeInfo(berryTreeId);
         s32 i;
 
@@ -1541,14 +1541,14 @@ void ResetBerryTreeSparkleFlags(void)
     top = cam_top + 3;
     right = cam_left + 14;
     bottom = top + 8;
-    for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1.mapObjects); i++)
+    for (i = 0; i < (u8)ARRAY_COUNT(gSaveBlock1.eventObjects); i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].animPattern == 12) // is the object an active berry tree?
+        if (gEventObjects[i].active && gEventObjects[i].movementType == MOVEMENT_TYPE_BERRY_TREE_GROWTH)
         {
-            cam_left = gMapObjects[i].currentCoords.x;
-            cam_top = gMapObjects[i].currentCoords.y;
+            cam_left = gEventObjects[i].currentCoords.x;
+            cam_top = gEventObjects[i].currentCoords.y;
             if (left <= cam_left && cam_left <= right && top <= cam_top && cam_top <= bottom)
-                ResetBerryTreeSparkleFlag(gMapObjects[i].trainerRange_berryTreeId);
+                ResetBerryTreeSparkleFlag(gEventObjects[i].trainerRange_berryTreeId);
         }
     }
 }
diff --git a/src/bike.c b/src/bike.c
index 25419c6cf..e1539ab7d 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -53,7 +53,7 @@ static void Bike_UpdateDirTimerHistory(u8);
 static void Bike_UpdateABStartSelectHistory(u8);
 static u8 Bike_DPadToDirection(u16);
 static u8 get_some_collision(u8);
-static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *, s16, s16, u8, u8);
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *, s16, s16, u8, u8);
 static bool8 IsRunningDisallowedByMetatile(u8);
 static void Bike_TryAdvanceCyclingRoadCollisions();
 static u8 CanBikeFaceDirOnMetatile(u8, u8);
@@ -153,7 +153,7 @@ static void MovePlayerOnMachBike(u8 direction, u16 newKeys, u16 heldKeys)
 static u8 GetMachBikeTransition(u8 *dirTraveling)
 {
     // if the dir updated before this function, get the relevent new direction to check later.
-    u8 direction = player_get_direction_upper_nybble();
+    u8 direction = GetPlayerMovementDirection();
 
     // is the player standing still?
     if (*dirTraveling == 0)
@@ -197,31 +197,31 @@ static void MachBikeTransition_FaceDirection(u8 direction)
 
 static void MachBikeTransition_TurnDirection(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior))
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior))
     {
         PlayerTurnInPlace(direction);
         Bike_SetBikeStill();
     }
     else
     {
-        MachBikeTransition_FaceDirection(playerMapObj->facingDirection);
+        MachBikeTransition_FaceDirection(playerEventObj->facingDirection);
     }
 }
 
 static void MachBikeTransition_TrySpeedUp(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     u8 collision;
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == FALSE)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == FALSE)
     {
         // we cannot go forward, so either slow down or, if we are stopped, idle face direction.
         if (gPlayerAvatar.bikeSpeed)
-            MachBikeTransition_TrySlowDown(playerMapObj->movementDirection);
+            MachBikeTransition_TrySlowDown(playerEventObj->movementDirection);
         else
-            MachBikeTransition_FaceDirection(playerMapObj->movementDirection);
+            MachBikeTransition_FaceDirection(playerEventObj->movementDirection);
     }
     else
     {
@@ -301,7 +301,7 @@ static u8 CheckMovementInputAcroBike(u8 *newDirection, u16 newKeys, u16 heldKeys
 
 static u8 AcroBikeHandleInputNormal(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
-    u8 direction = player_get_direction_upper_nybble();
+    u8 direction = GetPlayerMovementDirection();
 
     gPlayerAvatar.bikeFrameCounter = 0;
     if (*newDirection == DIR_NONE)
@@ -354,7 +354,7 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys
         Bike_SetBikeStill();
         return ACRO_TRANS_TURN_DIRECTION;
     }
-    direction = player_get_direction_upper_nybble();
+    direction = GetPlayerMovementDirection();
     if (*newDirection == AcroBike_GetJumpDirection())
     {
         Bike_SetBikeStill(); // Bike_SetBikeStill sets speed to standing, but the next line immediately overrides it. could have just reset acroBikeState to 0 here instead of wasting a jump.
@@ -381,10 +381,10 @@ static u8 AcroBikeHandleInputTurning(u8 *newDirection, u16 newKeys, u16 heldKeys
 static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_upper_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerMovementDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     gPlayerAvatar.runningState = NOT_MOVING;
 
     if (heldKeys & B_BUTTON)
@@ -393,7 +393,7 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
     {
         // B button was released.
         gPlayerAvatar.bikeFrameCounter = 0;
-        if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+        if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // Go back to normal on flat ground
             *newDirection = direction;
@@ -428,15 +428,15 @@ static u8 AcroBikeHandleInputWheelieStanding(u8 *newDirection, u16 newKeys, u16
 static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_upper_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerMovementDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (!(heldKeys & B_BUTTON))
     {
         // B button was released
         Bike_SetBikeStill();
-        if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+        if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // even though B was released, dont undo the wheelie on the bumpy slope.
             gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
@@ -475,15 +475,15 @@ static u8 AcroBikeHandleInputBunnyHop(u8 *newDirection, u16 newKeys, u16 heldKey
 static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 heldKeys)
 {
     u8 direction;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
-    direction = player_get_direction_lower_nybble();
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    direction = GetPlayerFacingDirection();
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (!(heldKeys & B_BUTTON))
     {
         // we were moving on a wheelie, but we let go while moving. reset bike still status
         Bike_SetBikeStill();
-        if (!MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+        if (!MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
         {
             // we let go of B and arent on a bumpy slope, set state to normal because now we need to handle this
             gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
@@ -529,10 +529,10 @@ static u8 AcroBikeHandleInputWheelieMoving(u8 *newDirection, u16 newKeys, u16 he
 
 static u8 AcroBikeHandleInputSidewaysJump(u8 *ptr, u16 newKeys, u16 heldKeys)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    playerMapObj->facingDirectionLocked = 0;
-    FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection);
+    playerEventObj->facingDirectionLocked = 0;
+    SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection);
     gPlayerAvatar.acroBikeState = ACRO_STATE_NORMAL;
     return CheckMovementInputAcroBike(ptr, newKeys, heldKeys);
 }
@@ -550,21 +550,21 @@ static void AcroBikeTransition_FaceDirection(u8 direction)
 
 static void AcroBikeTransition_TurnDirection(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerFaceDirection(direction);
 }
 
 static void AcroBikeTransition_Moving(u8 direction)
 {
     u8 collision;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_FaceDirection(playerMapObj->movementDirection);
+        AcroBikeTransition_FaceDirection(playerEventObj->movementDirection);
         return;
     }
     collision = get_some_collision(direction);
@@ -583,48 +583,48 @@ static void AcroBikeTransition_Moving(u8 direction)
 
 static void AcroBikeTransition_NormalToWheelie(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerStartWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieToNormal(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerEndWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieIdle(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerIdleWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieHoppingStanding(u8 direction)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
-        direction = playerMapObj->movementDirection;
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
+        direction = playerEventObj->movementDirection;
     PlayerStandingHoppingWheelie(direction);
 }
 
 static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
 {
     u8 var;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        AcroBikeTransition_WheelieHoppingStanding(playerMapObj->movementDirection);
+        AcroBikeTransition_WheelieHoppingStanding(playerEventObj->movementDirection);
         return;
     }
     var = get_some_collision(direction);
@@ -654,7 +654,7 @@ static void AcroBikeTransition_WheelieHoppingMoving(u8 direction)
 static void AcroBikeTransition_SideJump(u8 direction)
 {
     u8 var;
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
 
     var = get_some_collision(direction);
     if (var != 0)
@@ -672,9 +672,9 @@ static void AcroBikeTransition_SideJump(u8 direction)
             return;
         }
     }
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
     PlaySE(SE_JITE_PYOKO);
-    playerMapObj->facingDirectionLocked = 1;
+    playerEventObj->facingDirectionLocked = 1;
     PlayerSetAnimId(sub_80608A4(direction), 2);
 }
 
@@ -686,11 +686,11 @@ static void AcroBikeTransition_TurnJump(u8 direction)
 static void AcroBikeTransition_WheelieMoving(u8 direction)
 {
     u8 var;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerIdleWheelie(playerMapObj->movementDirection);
+        PlayerIdleWheelie(playerEventObj->movementDirection);
         return;
     }
     var = get_some_collision(direction);
@@ -706,7 +706,7 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
         }
         else if (var <= 4)
         {
-            if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+            if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
                 PlayerIdleWheelie(direction);
             else
                 sub_80595DC(direction);  //hit wall?
@@ -720,11 +720,11 @@ static void AcroBikeTransition_WheelieMoving(u8 direction)
 static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
 {
     u8 var;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerStartWheelie(playerMapObj->movementDirection);
+        PlayerStartWheelie(playerEventObj->movementDirection);
         return;
     }
     var = get_some_collision(direction);
@@ -740,7 +740,7 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
         }
         else if (var <= 4)
         {
-            if (MetatileBehavior_IsBumpySlope(playerMapObj->currentMetatileBehavior))
+            if (MetatileBehavior_IsBumpySlope(playerEventObj->currentMetatileBehavior))
                 PlayerIdleWheelie(direction);
             else
                 sub_80595DC(direction);  //hit wall?
@@ -754,11 +754,11 @@ static void AcroBikeTransition_WheelieRisingMoving(u8 direction)
 static void AcroBikeTransition_WheelieLoweringMoving(u8 direction)
 {
     u8 var;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (CanBikeFaceDirOnMetatile(direction, playerMapObj->currentMetatileBehavior) == 0)
+    if (CanBikeFaceDirOnMetatile(direction, playerEventObj->currentMetatileBehavior) == 0)
     {
-        PlayerEndWheelie(playerMapObj->movementDirection);
+        PlayerEndWheelie(playerEventObj->movementDirection);
         return;
     }
     var = get_some_collision(direction);
@@ -883,18 +883,18 @@ static u8 get_some_collision(u8 direction)
     s16 x;
     s16 y;
     u8 metatitleBehavior;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    x = playerMapObj->currentCoords.x;
-    y = playerMapObj->currentCoords.y;
+    x = playerEventObj->currentCoords.x;
+    y = playerEventObj->currentCoords.y;
     MoveCoords(direction, &x, &y);
     metatitleBehavior = MapGridGetMetatileBehaviorAt(x, y);
-    return Bike_CheckCollisionTryAdvanceCollisionCount(playerMapObj, x, y, direction, metatitleBehavior);
+    return Bike_CheckCollisionTryAdvanceCollisionCount(playerEventObj, x, y, direction, metatitleBehavior);
 }
 
-static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct MapObject *mapObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
+static u8 Bike_CheckCollisionTryAdvanceCollisionCount(struct EventObject *eventObject, s16 x, s16 y, u8 direction, u8 metatitleBehavior)
 {
-    u8 collision = CheckForFieldObjectCollision(mapObject, x, y, direction, metatitleBehavior);
+    u8 collision = CheckForEventObjectCollision(eventObject, x, y, direction, metatitleBehavior);
 
     if (collision > 4)
         return collision;
@@ -982,7 +982,7 @@ bool8 IsBikingDisallowedByPlayer(void)
 
 bool8 player_should_look_direction_be_enforced_upon_movement(void)
 {
-    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) != FALSE)
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) != FALSE && MetatileBehavior_IsBumpySlope(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) != FALSE)
         return FALSE;
     else
         return TRUE;
@@ -1065,7 +1065,7 @@ void Bike_HandleBumpySlopeJump(void)
         if (MetatileBehavior_IsBumpySlope(tileBehavior))
         {
             gPlayerAvatar.acroBikeState = ACRO_STATE_WHEELIE_STANDING;
-            sub_8059C94(player_get_direction_upper_nybble());
+            sub_8059C94(GetPlayerMovementDirection());
         }
     }
 }
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index e7132a313..f81861ca0 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -5,7 +5,7 @@
 #include "field_effect.h"
 #include "fieldmap.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu.h"
 #include "rom6.h"
 #include "script.h"
diff --git a/src/cable_car.c b/src/cable_car.c
index 38ea86096..bae6f020a 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -18,7 +18,7 @@
 #include "scanline_effect.h"
 #include "event_data.h"
 #include "cable_car_util.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/weather.h"
 
 extern u8 (*gMenuCallback)(void);
@@ -818,15 +818,15 @@ static void LoadSprites(void)
     u8 i;
 
     u8 playerGraphicsIds[2] = {
-        MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
-        MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+        EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL,
+        EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
     };
     u16 rval = Random();
     u8 hikerGraphicsIds[4] = {
-        MAP_OBJ_GFX_HIKER,
-        MAP_OBJ_GFX_CAMPER,
-        MAP_OBJ_GFX_PICNICKER,
-        MAP_OBJ_GFX_POOCHYENA
+        EVENT_OBJ_GFX_HIKER,
+        EVENT_OBJ_GFX_CAMPER,
+        EVENT_OBJ_GFX_PICNICKER,
+        EVENT_OBJ_GFX_POOCHYENA
     };
     s16 hikerCoords[2][2] = {
         {   0,  80 },
@@ -847,7 +847,7 @@ static void LoadSprites(void)
     {
         case 0:
         default:
-            spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66);
+            spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0xc8, 0x49, 0x66);
             if (spriteId != MAX_SPRITES)
             {
                 gSprites[spriteId].oam.priority = 2;
@@ -871,7 +871,7 @@ static void LoadSprites(void)
             break;
         case 1:
             CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03);
-            spriteId = AddPseudoFieldObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66);
+            spriteId = AddPseudoEventObject(playerGraphicsIds[gSaveBlock2.playerGender], sub_8123D98, 0x80, 0x27, 0x66);
             if (spriteId != MAX_SPRITES)
             {
                 gSprites[spriteId].oam.priority = 2;
@@ -902,7 +902,7 @@ static void LoadSprites(void)
     }
     if ((rval % 64) == 0)
     {
-        spriteId = AddPseudoFieldObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a);
+        spriteId = AddPseudoEventObject(hikerGraphicsIds[rval % 3], callbacks[gSpecialVar_0x8004], hikerCoords[gSpecialVar_0x8004][0], hikerCoords[gSpecialVar_0x8004][1], 0x6a);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].oam.priority = 2;
diff --git a/src/contest.c b/src/contest.c
index d9c19f773..fcadd8ae1 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
 #include "constants/species.h"
@@ -2138,9 +2138,9 @@ void Contest_CreatePlayerMon(u8 partyIndex)
     }
     memcpy(gContestMons[gContestPlayerMonIndex].trainerName, name, 8);
     if (gSaveBlock2.playerGender == MALE)
-        gContestMons[gContestPlayerMonIndex].trainerGfxId = MAP_OBJ_GFX_LINK_BRENDAN;
+        gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_BRENDAN;
     else
-        gContestMons[gContestPlayerMonIndex].trainerGfxId = MAP_OBJ_GFX_LINK_MAY;
+        gContestMons[gContestPlayerMonIndex].trainerGfxId = EVENT_OBJ_GFX_LINK_MAY;
     gContestMons[gContestPlayerMonIndex].flags = 0;
     gContestMons[gContestPlayerMonIndex].unk2C[0] = 0;
     gContestMons[gContestPlayerMonIndex].species = GetMonData(&gPlayerParty[partyIndex], MON_DATA_SPECIES);
diff --git a/src/data/field_map_obj/base_oam.h b/src/data/field_event_obj/base_oam.h
index 49c14e8c2..49c14e8c2 100644
--- a/src/data/field_map_obj/base_oam.h
+++ b/src/data/field_event_obj/base_oam.h
diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h
new file mode 100644
index 000000000..185efc68e
--- /dev/null
+++ b/src/data/field_event_obj/berry_tree_graphics_tables.h
@@ -0,0 +1,573 @@
+//
+
+//
+
+#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
+#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
+
+const struct SpriteFrameImage gEventObjectPicTable_PechaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PechaBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_KelpsyBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_KelpsyBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_WepearBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_WepearBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_IapapaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_IapapaBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_CheriBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_CheriBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_FigyBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_FigyBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_MagoBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LumBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LumBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_RazzBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RazzBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_GrepaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_GrepaBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_RabutaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RabutaBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_NomelBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_NomelBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LeppaBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LeppaBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_LiechiBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LiechiBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_HondewBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_HondewBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
+
+const struct SpriteFrameImage gEventObjectPicTable_AguavBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_AguavBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_WikiBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_WikiBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_PomegBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PomegBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_RawstBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_RawstBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_SpelonBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_SpelonBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_ChestoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_ChestoBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_OranBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_OranBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_PersimBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PersimBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_SitrusBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_SitrusBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_AspearBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_AspearBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
+
+const struct SpriteFrameImage gEventObjectPicTable_PamtreBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_PamtreBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_CornnBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_CornnBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_LansatBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_LansatBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
+
+const struct SpriteFrameImage gEventObjectPicTable_DurinBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_DurinBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
+
+const struct SpriteFrameImage gEventObjectPicTable_TamatoBerryTree[] = {
+    obj_frame_tiles(gEventObjectPic_BerryTreeDirtPile),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_0),
+    obj_frame_tiles(gEventObjectPic_BerryTreeSprout_1),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_0),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_1),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_2),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_3),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_4),
+    obj_frame_tiles(gEventObjectPic_TamatoBerryTree_5)
+};
+
+const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
+
+const u8 gDeadBerryTreeGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
+
+const u8 gBerryTreeGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES};
+
+const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
+    gEventObjectPicTable_CheriBerryTree,
+    gEventObjectPicTable_ChestoBerryTree,
+    gEventObjectPicTable_PechaBerryTree,
+    gEventObjectPicTable_RawstBerryTree,
+    gEventObjectPicTable_AspearBerryTree,
+    gEventObjectPicTable_LeppaBerryTree,
+    gEventObjectPicTable_OranBerryTree,
+    gEventObjectPicTable_PersimBerryTree,
+    gEventObjectPicTable_LumBerryTree,
+    gEventObjectPicTable_SitrusBerryTree,
+    gEventObjectPicTable_FigyBerryTree,
+    gEventObjectPicTable_WikiBerryTree,
+    gEventObjectPicTable_MagoBerryTree,
+    gEventObjectPicTable_AguavBerryTree,
+    gEventObjectPicTable_IapapaBerryTree,
+    gEventObjectPicTable_RazzBerryTree,
+    gEventObjectPicTable_RazzBerryTree,
+    gEventObjectPicTable_MagoBerryTree,
+    gEventObjectPicTable_WepearBerryTree,
+    gEventObjectPicTable_IapapaBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_KelpsyBerryTree,
+    gEventObjectPicTable_WepearBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_GrepaBerryTree,
+    gEventObjectPicTable_TamatoBerryTree,
+    gEventObjectPicTable_CornnBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_RabutaBerryTree,
+    gEventObjectPicTable_NomelBerryTree,
+    gEventObjectPicTable_SpelonBerryTree,
+    gEventObjectPicTable_PamtreBerryTree,
+    gEventObjectPicTable_RabutaBerryTree,
+    gEventObjectPicTable_DurinBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_LiechiBerryTree,
+    gEventObjectPicTable_HondewBerryTree,
+    gEventObjectPicTable_AguavBerryTree,
+    gEventObjectPicTable_PomegBerryTree,
+    gEventObjectPicTable_GrepaBerryTree,
+    gEventObjectPicTable_LansatBerryTree,
+    gEventObjectPicTable_CornnBerryTree,
+    gEventObjectPicTable_DurinBerryTree
+};
+
+const u8 *const gBerryTreePaletteSlotTablePointers[] = {
+    gBerryTreePaletteSlotTable_Cheri,
+    gBerryTreePaletteSlotTable_Chesto,
+    gBerryTreePaletteSlotTable_Pecha,
+    gBerryTreePaletteSlotTable_Rawst,
+    gBerryTreePaletteSlotTable_Aspear,
+    gBerryTreePaletteSlotTable_Leppa,
+    gBerryTreePaletteSlotTable_Oran,
+    gBerryTreePaletteSlotTable_Persim,
+    gBerryTreePaletteSlotTable_Lum,
+    gBerryTreePaletteSlotTable_Sitrus,
+    gBerryTreePaletteSlotTable_Figy,
+    gBerryTreePaletteSlotTable_Wiki,
+    gBerryTreePaletteSlotTable_Mago,
+    gBerryTreePaletteSlotTable_Aguav,
+    gBerryTreePaletteSlotTable_Iapapa,
+    gBerryTreePaletteSlotTable_Razz,
+    gBerryTreePaletteSlotTable_Razz,
+    gBerryTreePaletteSlotTable_Mago,
+    gBerryTreePaletteSlotTable_Wepear,
+    gBerryTreePaletteSlotTable_Iapapa,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Kelpsy,
+    gBerryTreePaletteSlotTable_Wepear,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Grepa,
+    gBerryTreePaletteSlotTable_Tamato,
+    gBerryTreePaletteSlotTable_Cornn,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Rabuta,
+    gBerryTreePaletteSlotTable_Nomel,
+    gBerryTreePaletteSlotTable_Spelon,
+    gBerryTreePaletteSlotTable_Pamtre,
+    gBerryTreePaletteSlotTable_Rabuta,
+    gBerryTreePaletteSlotTable_Durin,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Liechi,
+    gBerryTreePaletteSlotTable_Hondew,
+    gBerryTreePaletteSlotTable_Aguav,
+    gBerryTreePaletteSlotTable_Pomeg,
+    gBerryTreePaletteSlotTable_Grepa,
+    gBerryTreePaletteSlotTable_Lansat,
+    gBerryTreePaletteSlotTable_Cornn,
+    gBerryTreePaletteSlotTable_Durin
+};
+
+const u8 *const gBerryTreeGraphicsIdTablePointers[] = {
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable,
+    gBerryTreeGraphicsIdTable
+};
+
+#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
diff --git a/src/data/field_event_obj/event_object_anims.h b/src/data/field_event_obj/event_object_anims.h
new file mode 100644
index 000000000..f1733b627
--- /dev/null
+++ b/src/data/field_event_obj/event_object_anims.h
@@ -0,0 +1,886 @@
+//
+
+//
+
+#ifndef POKERUBY_EVENT_OBJECT_ANIMS_H
+#define POKERUBY_EVENT_OBJECT_ANIMS_H
+
+
+const union AnimCmd gEventObjectImageAnim_83708C8[] = {
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83708DC[] = {
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83708E4[] = {
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83708EC[] = {
+    ANIMCMD_FRAME(2, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83708F4[] = {
+    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83708FC[] = {
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(3, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370910[] = {
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(4, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370924[] = {
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(6, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370938[] = {
+    ANIMCMD_FRAME(5, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_837094C[] = {
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370960[] = {
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(4, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370974[] = {
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370988[] = {
+    ANIMCMD_FRAME(5, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_837099C[] = {
+    ANIMCMD_FRAME(3, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(3, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83709B0[] = {
+    ANIMCMD_FRAME(4, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(4, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83709C4[] = {
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83709D8[] = {
+    ANIMCMD_FRAME(5, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_83709EC[] = {
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(3, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A00[] = {
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_FRAME(4, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A14[] = {
+    ANIMCMD_FRAME(5, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_FRAME(6, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A28[] = {
+    ANIMCMD_FRAME(5, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(6, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A3C[] = {
+    ANIMCMD_FRAME(0, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A44[] = {
+    ANIMCMD_FRAME(1, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A4C[] = {
+    ANIMCMD_FRAME(2, 16),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A54[] = {
+    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A5C[] = {
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A70[] = {
+    ANIMCMD_FRAME(5, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(6, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A84[] = {
+    ANIMCMD_FRAME(7, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(8, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370A98[] = {
+    ANIMCMD_FRAME(7, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 8, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370AAC[] = {
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370AC0[] = {
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370AD4[] = {
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370AE8[] = {
+    ANIMCMD_FRAME(7, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370AFC[] = {
+    ANIMCMD_FRAME(3, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_FRAME(4, 2),
+    ANIMCMD_FRAME(0, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B10[] = {
+    ANIMCMD_FRAME(5, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_FRAME(6, 2),
+    ANIMCMD_FRAME(1, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B24[] = {
+    ANIMCMD_FRAME(7, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_FRAME(8, 2),
+    ANIMCMD_FRAME(2, 2),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B38[] = {
+    ANIMCMD_FRAME(7, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 2, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B4C[] = {
+    ANIMCMD_FRAME(3, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_FRAME(4, 1),
+    ANIMCMD_FRAME(0, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B60[] = {
+    ANIMCMD_FRAME(5, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_FRAME(6, 1),
+    ANIMCMD_FRAME(1, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B74[] = {
+    ANIMCMD_FRAME(7, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_FRAME(8, 1),
+    ANIMCMD_FRAME(2, 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B88[] = {
+    ANIMCMD_FRAME(7, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 1, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370B9C[] = {
+    ANIMCMD_FRAME(12, 5),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_FRAME(13, 5),
+    ANIMCMD_FRAME(9, 3),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370BB0[] = {
+    ANIMCMD_FRAME(14, 5),
+    ANIMCMD_FRAME(10, 3),
+    ANIMCMD_FRAME(15, 5),
+    ANIMCMD_FRAME(10, 3),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370BC4[] = {
+    ANIMCMD_FRAME(16, 5),
+    ANIMCMD_FRAME(11, 3),
+    ANIMCMD_FRAME(17, 5),
+    ANIMCMD_FRAME(11, 3),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370BD8[] = {
+    ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
+    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
+    ANIMCMD_FRAME(17, 5, .hFlip = TRUE),
+    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370BEC[] = {
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(4, 8),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C04[] = {
+    ANIMCMD_FRAME(9, 32),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C0C[] = {
+    ANIMCMD_FRAME(10, 32),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C14[] = {
+    ANIMCMD_FRAME(11, 32),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C1C[] = {
+    ANIMCMD_FRAME(11, 32, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C24[] = {
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C30[] = {
+    ANIMCMD_FRAME(13, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C3C[] = {
+    ANIMCMD_FRAME(17, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C48[] = {
+    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C54[] = {
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(12, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C60[] = {
+    ANIMCMD_FRAME(15, 4),
+    ANIMCMD_FRAME(16, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C6C[] = {
+    ANIMCMD_FRAME(19, 4),
+    ANIMCMD_FRAME(20, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C78[] = {
+    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(20, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C84[] = {
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C90[] = {
+    ANIMCMD_FRAME(13, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370C9C[] = {
+    ANIMCMD_FRAME(17, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CA8[] = {
+    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CB4[] = {
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CC0[] = {
+    ANIMCMD_FRAME(15, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CCC[] = {
+    ANIMCMD_FRAME(19, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CD8[] = {
+    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CE4[] = {
+    ANIMCMD_FRAME(21, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_FRAME(22, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370CF8[] = {
+    ANIMCMD_FRAME(23, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_FRAME(24, 4),
+    ANIMCMD_FRAME(14, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D0C[] = {
+    ANIMCMD_FRAME(25, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_FRAME(26, 4),
+    ANIMCMD_FRAME(18, 4),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D20[] = {
+    ANIMCMD_FRAME(25, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(26, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D34[] = {
+    ANIMCMD_FRAME(0, 32),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D3C[] = {
+    ANIMCMD_FRAME(1, 32),
+    ANIMCMD_FRAME(2, 32),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D48[] = {
+    ANIMCMD_FRAME(3, 48),
+    ANIMCMD_FRAME(4, 48),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D54[] = {
+    ANIMCMD_FRAME(5, 32),
+    ANIMCMD_FRAME(5, 32),
+    ANIMCMD_FRAME(6, 32),
+    ANIMCMD_FRAME(6, 32),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D68[] = {
+    ANIMCMD_FRAME(7, 48),
+    ANIMCMD_FRAME(7, 48),
+    ANIMCMD_FRAME(8, 48),
+    ANIMCMD_FRAME(8, 48),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D7C[] = {
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(9, 32),
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370D8C[] = {
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_FRAME(1, 8),
+    ANIMCMD_FRAME(2, 8),
+    ANIMCMD_FRAME(3, 8),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370DA0[] = {
+    ANIMCMD_FRAME(0, 6),
+    ANIMCMD_FRAME(1, 6),
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370DB4[] = {
+    ANIMCMD_FRAME(8, 4),
+    ANIMCMD_FRAME(9, 4),
+    ANIMCMD_FRAME(10, 4),
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370DC8[] = {
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(5, 4),
+    ANIMCMD_FRAME(6, 4),
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370DDC[] = {
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370DF0[] = {
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E04[] = {
+    ANIMCMD_FRAME(11, 4),
+    ANIMCMD_FRAME(10, 6),
+    ANIMCMD_FRAME(9, 6),
+    ANIMCMD_FRAME(8, 6),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E18[] = {
+    ANIMCMD_FRAME(7, 4),
+    ANIMCMD_FRAME(6, 6),
+    ANIMCMD_FRAME(5, 6),
+    ANIMCMD_FRAME(4, 6),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E2C[] = {
+    ANIMCMD_FRAME(3, 4),
+    ANIMCMD_FRAME(2, 4),
+    ANIMCMD_FRAME(1, 4),
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E40[] = {
+    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
+    ANIMCMD_END
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E54[] = {
+    ANIMCMD_FRAME(10, 6),
+    ANIMCMD_FRAME(11, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(11, 30),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E68[] = {
+    ANIMCMD_FRAME(6, 6),
+    ANIMCMD_FRAME(7, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(7, 30),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E7C[] = {
+    ANIMCMD_FRAME(2, 6),
+    ANIMCMD_FRAME(3, 6),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(3, 30),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gEventObjectImageAnim_8370E90[] = {
+    ANIMCMD_FRAME(2, 6, .hFlip = TRUE),
+    ANIMCMD_FRAME(3, 6, .hFlip = TRUE),
+    ANIMCMD_LOOP(1),
+    ANIMCMD_FRAME(3, 30, .hFlip = TRUE),
+    ANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8370EA4[] = {
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(7),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AffineAnimCmd gEventObjectRotScalAnim_8370ED4[] = {
+    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(15),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
+    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
+    AFFINEANIMCMD_LOOP(15),
+    AFFINEANIMCMD_JUMP(0)
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Inanimate[] = {
+    gEventObjectImageAnim_83708C8
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_QuintyPlump[] = {
+    gEventObjectImageAnim_83708DC,
+    gEventObjectImageAnim_83708E4,
+    gEventObjectImageAnim_83708EC,
+    gEventObjectImageAnim_83708F4,
+    gEventObjectImageAnim_83708FC,
+    gEventObjectImageAnim_8370910,
+    gEventObjectImageAnim_8370924,
+    gEventObjectImageAnim_8370938,
+    gEventObjectImageAnim_837094C,
+    gEventObjectImageAnim_8370960,
+    gEventObjectImageAnim_8370974,
+    gEventObjectImageAnim_8370988,
+    gEventObjectImageAnim_837099C,
+    gEventObjectImageAnim_83709B0,
+    gEventObjectImageAnim_83709C4,
+    gEventObjectImageAnim_83709D8,
+    gEventObjectImageAnim_83709EC,
+    gEventObjectImageAnim_8370A00,
+    gEventObjectImageAnim_8370A14,
+    gEventObjectImageAnim_8370A28
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Standard[] = {
+    gEventObjectImageAnim_8370A3C,
+    gEventObjectImageAnim_8370A44,
+    gEventObjectImageAnim_8370A4C,
+    gEventObjectImageAnim_8370A54,
+    gEventObjectImageAnim_8370A5C,
+    gEventObjectImageAnim_8370A70,
+    gEventObjectImageAnim_8370A84,
+    gEventObjectImageAnim_8370A98,
+    gEventObjectImageAnim_8370AAC,
+    gEventObjectImageAnim_8370AC0,
+    gEventObjectImageAnim_8370AD4,
+    gEventObjectImageAnim_8370AE8,
+    gEventObjectImageAnim_8370AFC,
+    gEventObjectImageAnim_8370B10,
+    gEventObjectImageAnim_8370B24,
+    gEventObjectImageAnim_8370B38,
+    gEventObjectImageAnim_8370B4C,
+    gEventObjectImageAnim_8370B60,
+    gEventObjectImageAnim_8370B74,
+    gEventObjectImageAnim_8370B88
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BrendanMayNormal[] = {
+    gEventObjectImageAnim_8370A3C,
+    gEventObjectImageAnim_8370A44,
+    gEventObjectImageAnim_8370A4C,
+    gEventObjectImageAnim_8370A54,
+    gEventObjectImageAnim_8370A5C,
+    gEventObjectImageAnim_8370A70,
+    gEventObjectImageAnim_8370A84,
+    gEventObjectImageAnim_8370A98,
+    gEventObjectImageAnim_8370AAC,
+    gEventObjectImageAnim_8370AC0,
+    gEventObjectImageAnim_8370AD4,
+    gEventObjectImageAnim_8370AE8,
+    gEventObjectImageAnim_8370AFC,
+    gEventObjectImageAnim_8370B10,
+    gEventObjectImageAnim_8370B24,
+    gEventObjectImageAnim_8370B38,
+    gEventObjectImageAnim_8370B4C,
+    gEventObjectImageAnim_8370B60,
+    gEventObjectImageAnim_8370B74,
+    gEventObjectImageAnim_8370B88,
+    gEventObjectImageAnim_8370B9C,
+    gEventObjectImageAnim_8370BB0,
+    gEventObjectImageAnim_8370BC4,
+    gEventObjectImageAnim_8370BD8
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_AcroBike[] = {
+    gEventObjectImageAnim_8370A3C,
+    gEventObjectImageAnim_8370A44,
+    gEventObjectImageAnim_8370A4C,
+    gEventObjectImageAnim_8370A54,
+    gEventObjectImageAnim_8370A5C,
+    gEventObjectImageAnim_8370A70,
+    gEventObjectImageAnim_8370A84,
+    gEventObjectImageAnim_8370A98,
+    gEventObjectImageAnim_8370AAC,
+    gEventObjectImageAnim_8370AC0,
+    gEventObjectImageAnim_8370AD4,
+    gEventObjectImageAnim_8370AE8,
+    gEventObjectImageAnim_8370AFC,
+    gEventObjectImageAnim_8370B10,
+    gEventObjectImageAnim_8370B24,
+    gEventObjectImageAnim_8370B38,
+    gEventObjectImageAnim_8370B4C,
+    gEventObjectImageAnim_8370B60,
+    gEventObjectImageAnim_8370B74,
+    gEventObjectImageAnim_8370B88,
+    gEventObjectImageAnim_8370C24,
+    gEventObjectImageAnim_8370C30,
+    gEventObjectImageAnim_8370C3C,
+    gEventObjectImageAnim_8370C48,
+    gEventObjectImageAnim_8370C54,
+    gEventObjectImageAnim_8370C60,
+    gEventObjectImageAnim_8370C6C,
+    gEventObjectImageAnim_8370C78,
+    gEventObjectImageAnim_8370C84,
+    gEventObjectImageAnim_8370C90,
+    gEventObjectImageAnim_8370C9C,
+    gEventObjectImageAnim_8370CA8,
+    gEventObjectImageAnim_8370CB4,
+    gEventObjectImageAnim_8370CC0,
+    gEventObjectImageAnim_8370CCC,
+    gEventObjectImageAnim_8370CD8,
+    gEventObjectImageAnim_8370CE4,
+    gEventObjectImageAnim_8370CF8,
+    gEventObjectImageAnim_8370D0C,
+    gEventObjectImageAnim_8370D20
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Surfing[] = {
+    gEventObjectImageAnim_8370A3C,
+    gEventObjectImageAnim_8370A44,
+    gEventObjectImageAnim_8370A4C,
+    gEventObjectImageAnim_8370A54,
+    gEventObjectImageAnim_8370A5C,
+    gEventObjectImageAnim_8370A70,
+    gEventObjectImageAnim_8370A84,
+    gEventObjectImageAnim_8370A98,
+    gEventObjectImageAnim_8370AAC,
+    gEventObjectImageAnim_8370AC0,
+    gEventObjectImageAnim_8370AD4,
+    gEventObjectImageAnim_8370AE8,
+    gEventObjectImageAnim_8370AFC,
+    gEventObjectImageAnim_8370B10,
+    gEventObjectImageAnim_8370B24,
+    gEventObjectImageAnim_8370B38,
+    gEventObjectImageAnim_8370B4C,
+    gEventObjectImageAnim_8370B60,
+    gEventObjectImageAnim_8370B74,
+    gEventObjectImageAnim_8370B88,
+    gEventObjectImageAnim_8370C04,
+    gEventObjectImageAnim_8370C0C,
+    gEventObjectImageAnim_8370C14,
+    gEventObjectImageAnim_8370C1C
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Nurse[] = {
+    gEventObjectImageAnim_8370A3C,
+    gEventObjectImageAnim_8370A44,
+    gEventObjectImageAnim_8370A4C,
+    gEventObjectImageAnim_8370A54,
+    gEventObjectImageAnim_8370A5C,
+    gEventObjectImageAnim_8370A70,
+    gEventObjectImageAnim_8370A84,
+    gEventObjectImageAnim_8370A98,
+    gEventObjectImageAnim_8370AAC,
+    gEventObjectImageAnim_8370AC0,
+    gEventObjectImageAnim_8370AD4,
+    gEventObjectImageAnim_8370AE8,
+    gEventObjectImageAnim_8370AFC,
+    gEventObjectImageAnim_8370B10,
+    gEventObjectImageAnim_8370B24,
+    gEventObjectImageAnim_8370B38,
+    gEventObjectImageAnim_8370B4C,
+    gEventObjectImageAnim_8370B60,
+    gEventObjectImageAnim_8370B74,
+    gEventObjectImageAnim_8370B88,
+    gEventObjectImageAnim_8370D7C
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_FieldMove[] = {
+    gEventObjectImageAnim_8370BEC
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BerryTree[] = {
+    gEventObjectImageAnim_8370D34,
+    gEventObjectImageAnim_8370D3C,
+    gEventObjectImageAnim_8370D48,
+    gEventObjectImageAnim_8370D54,
+    gEventObjectImageAnim_8370D68
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_BreakableRock[] = {
+    gEventObjectImageAnim_83708C8,
+    gEventObjectImageAnim_8370D8C
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_CuttableTree[] = {
+    gEventObjectImageAnim_83708C8,
+    gEventObjectImageAnim_8370DA0
+};
+
+const union AnimCmd *const gEventObjectImageAnimTable_Fishing[] = {
+    gEventObjectImageAnim_8370DB4,
+    gEventObjectImageAnim_8370DC8,
+    gEventObjectImageAnim_8370DDC,
+    gEventObjectImageAnim_8370DF0,
+    gEventObjectImageAnim_8370E04,
+    gEventObjectImageAnim_8370E18,
+    gEventObjectImageAnim_8370E2C,
+    gEventObjectImageAnim_8370E40,
+    gEventObjectImageAnim_8370E54,
+    gEventObjectImageAnim_8370E68,
+    gEventObjectImageAnim_8370E7C,
+    gEventObjectImageAnim_8370E90
+};
+
+const union AffineAnimCmd *const gEventObjectRotScalAnimTable_KyogreGroudon[] = {
+    gEventObjectRotScalAnim_8370EA4,
+    gEventObjectRotScalAnim_8370ED4
+};
+
+#endif //POKERUBY_EVENT_OBJECT_ANIMS_H
diff --git a/src/data/field_event_obj/event_object_graphics.h b/src/data/field_event_obj/event_object_graphics.h
new file mode 100755
index 000000000..8f1bb96a8
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics.h
@@ -0,0 +1,1319 @@
+#ifndef POKERUBY_EVENT_OBJECT_GFX_H
+#define POKERUBY_EVENT_OBJECT_GFX_H
+
+const u32 gEventObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/00.4bpp");
+const u32 gEventObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/01.4bpp");
+const u32 gEventObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/02.4bpp");
+const u32 gEventObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/03.4bpp");
+const u32 gEventObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/04.4bpp");
+const u32 gEventObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/05.4bpp");
+const u32 gEventObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/06.4bpp");
+const u32 gEventObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/07.4bpp");
+const u32 gEventObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/08.4bpp");
+const u32 gEventObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/09.4bpp");
+const u32 gEventObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/10.4bpp");
+const u32 gEventObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/11.4bpp");
+const u32 gEventObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/12.4bpp");
+const u32 gEventObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/13.4bpp");
+const u32 gEventObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/14.4bpp");
+const u32 gEventObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/15.4bpp");
+const u32 gEventObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/16.4bpp");
+const u32 gEventObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/normal/17.4bpp");
+const u16 gEventObjectPalette8[] = INCBIN_U16("graphics/event_objects/palettes/08.gbapal");
+const u16 NullPalette_8310F68[16] = {};
+const u16 NullPalette_8310F88[16] = {};
+const u16 NullPalette_8310FA8[16] = {};
+const u16 NullPalette_8310FC8[16] = {};
+const u16 NullPalette_8310FE8[16] = {};
+const u16 NullPalette_8311008[16] = {};
+const u16 NullPalette_8311028[16] = {};
+const u16 NullPalette_8311048[16] = {};
+const u16 NullPalette_8311068[16] = {};
+const u16 NullPalette_8311088[16] = {};
+const u16 NullPalette_83110A8[16] = {};
+const u16 NullPalette_83110C8[16] = {};
+const u16 NullPalette_83110E8[16] = {};
+const u16 NullPalette_8311108[16] = {};
+const u16 NullPalette_8311128[16] = {};
+const u16 gEventObjectPalette9[] = INCBIN_U16("graphics/event_objects/palettes/09.gbapal");
+const u16 gEventObjectPalette10[] = INCBIN_U16("graphics/event_objects/palettes/10.gbapal");
+const u32 gEventObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/0.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/1.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/2.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/3.4bpp");
+const u32 gEventObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/field_move/4.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/0.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/3.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/1.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/4.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/2.4bpp");
+const u32 gEventObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/surfing/5.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/0.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/1.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/2.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/3.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/4.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/5.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/6.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/7.4bpp");
+const u32 gEventObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/mach_bike/8.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/00.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/01.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/02.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/03.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/04.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/05.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/06.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/07.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/08.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/09.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/10.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/11.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/12.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/13.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/14.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/15.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/16.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/17.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/18.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/19.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/20.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/21.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/22.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/23.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/24.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/25.4bpp");
+const u32 gEventObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/acro_bike/26.4bpp");
+const u32 gEventObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/00.4bpp");
+const u32 gEventObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/01.4bpp");
+const u32 gEventObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/02.4bpp");
+const u32 gEventObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/03.4bpp");
+const u32 gEventObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/04.4bpp");
+const u32 gEventObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/05.4bpp");
+const u32 gEventObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/06.4bpp");
+const u32 gEventObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/07.4bpp");
+const u32 gEventObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/08.4bpp");
+const u32 gEventObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/09.4bpp");
+const u32 gEventObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/10.4bpp");
+const u32 gEventObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/fishing/11.4bpp");
+const u32 gEventObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/0.4bpp");
+const u32 gEventObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/3.4bpp");
+const u32 gEventObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/1.4bpp");
+const u32 gEventObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/4.4bpp");
+const u32 gEventObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/2.4bpp");
+const u32 gEventObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/watering/5.4bpp");
+const u32 gEventObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/decorating.4bpp");
+const u32 gEventObjectPic_MayDecorating[] = INCBIN_U32("graphics/event_objects/pics/people/may/decorating.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/0.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/1.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/2.4bpp");
+const u32 gEventObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/brendan/underwater/3.4bpp");
+const u32 gEventObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/0.4bpp");
+const u32 gEventObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/1.4bpp");
+const u32 gEventObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/2.4bpp");
+const u32 gEventObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/underwater/3.4bpp");
+const u16 gEventObjectPalette11[] = INCBIN_U16("graphics/event_objects/palettes/11.gbapal");
+const u32 gEventObjectPic_MayNormal_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/00.4bpp");
+const u32 gEventObjectPic_MayNormal_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/01.4bpp");
+const u32 gEventObjectPic_MayNormal_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/02.4bpp");
+const u32 gEventObjectPic_MayNormal_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/03.4bpp");
+const u32 gEventObjectPic_MayNormal_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/04.4bpp");
+const u32 gEventObjectPic_MayNormal_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/05.4bpp");
+const u32 gEventObjectPic_MayNormal_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/06.4bpp");
+const u32 gEventObjectPic_MayNormal_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/07.4bpp");
+const u32 gEventObjectPic_MayNormal_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/08.4bpp");
+const u32 gEventObjectPic_MayNormal_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/09.4bpp");
+const u32 gEventObjectPic_MayNormal_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/10.4bpp");
+const u32 gEventObjectPic_MayNormal_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/11.4bpp");
+const u32 gEventObjectPic_MayNormal_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/12.4bpp");
+const u32 gEventObjectPic_MayNormal_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/13.4bpp");
+const u32 gEventObjectPic_MayNormal_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/14.4bpp");
+const u32 gEventObjectPic_MayNormal_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/15.4bpp");
+const u32 gEventObjectPic_MayNormal_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/16.4bpp");
+const u32 gEventObjectPic_MayNormal_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/normal/17.4bpp");
+const u16 gEventObjectPalette17[] = INCBIN_U16("graphics/event_objects/palettes/17.gbapal");
+const u16 gEventObjectPalette18[] = INCBIN_U16("graphics/event_objects/palettes/18.gbapal");
+const u16 NullPalette_831B7E8[16] = {};
+const u16 NullPalette_831B808[16] = {};
+const u16 NullPalette_831B828[16] = {};
+const u16 NullPalette_831B848[16] = {};
+const u16 NullPalette_831B868[16] = {};
+const u16 NullPalette_831B888[16] = {};
+const u16 NullPalette_831B8A8[16] = {};
+const u16 NullPalette_831B8C8[16] = {};
+const u16 NullPalette_831B8E8[16] = {};
+const u16 NullPalette_831B908[16] = {};
+const u16 NullPalette_831B928[16] = {};
+const u16 NullPalette_831B948[16] = {};
+const u16 NullPalette_831B968[16] = {};
+const u16 NullPalette_831B988[16] = {};
+const u32 gEventObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/0.4bpp");
+const u32 gEventObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/1.4bpp");
+const u32 gEventObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/2.4bpp");
+const u32 gEventObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/3.4bpp");
+const u32 gEventObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/4.4bpp");
+const u32 gEventObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/5.4bpp");
+const u32 gEventObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/6.4bpp");
+const u32 gEventObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/7.4bpp");
+const u32 gEventObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/mach_bike/8.4bpp");
+const u32 gEventObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/00.4bpp");
+const u32 gEventObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/01.4bpp");
+const u32 gEventObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/02.4bpp");
+const u32 gEventObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/03.4bpp");
+const u32 gEventObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/04.4bpp");
+const u32 gEventObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/05.4bpp");
+const u32 gEventObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/06.4bpp");
+const u32 gEventObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/07.4bpp");
+const u32 gEventObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/08.4bpp");
+const u32 gEventObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/09.4bpp");
+const u32 gEventObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/10.4bpp");
+const u32 gEventObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/11.4bpp");
+const u32 gEventObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/12.4bpp");
+const u32 gEventObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/13.4bpp");
+const u32 gEventObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/14.4bpp");
+const u32 gEventObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/15.4bpp");
+const u32 gEventObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/16.4bpp");
+const u32 gEventObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/17.4bpp");
+const u32 gEventObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/18.4bpp");
+const u32 gEventObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/19.4bpp");
+const u32 gEventObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/20.4bpp");
+const u32 gEventObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/21.4bpp");
+const u32 gEventObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/22.4bpp");
+const u32 gEventObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/23.4bpp");
+const u32 gEventObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/24.4bpp");
+const u32 gEventObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/25.4bpp");
+const u32 gEventObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/event_objects/pics/people/may/acro_bike/26.4bpp");
+const u32 gEventObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/0.4bpp");
+const u32 gEventObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/3.4bpp");
+const u32 gEventObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/1.4bpp");
+const u32 gEventObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/4.4bpp");
+const u32 gEventObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/2.4bpp");
+const u32 gEventObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/surfing/5.4bpp");
+const u32 gEventObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/0.4bpp");
+const u32 gEventObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/1.4bpp");
+const u32 gEventObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/2.4bpp");
+const u32 gEventObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/3.4bpp");
+const u32 gEventObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/field_move/4.4bpp");
+const u32 gEventObjectPic_MayFishing_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/00.4bpp");
+const u32 gEventObjectPic_MayFishing_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/01.4bpp");
+const u32 gEventObjectPic_MayFishing_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/02.4bpp");
+const u32 gEventObjectPic_MayFishing_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/03.4bpp");
+const u32 gEventObjectPic_MayFishing_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/04.4bpp");
+const u32 gEventObjectPic_MayFishing_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/05.4bpp");
+const u32 gEventObjectPic_MayFishing_6[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/06.4bpp");
+const u32 gEventObjectPic_MayFishing_7[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/07.4bpp");
+const u32 gEventObjectPic_MayFishing_8[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/08.4bpp");
+const u32 gEventObjectPic_MayFishing_9[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/09.4bpp");
+const u32 gEventObjectPic_MayFishing_10[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/10.4bpp");
+const u32 gEventObjectPic_MayFishing_11[] = INCBIN_U32("graphics/event_objects/pics/people/may/fishing/11.4bpp");
+const u32 gEventObjectPic_MayWatering_0[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/0.4bpp");
+const u32 gEventObjectPic_MayWatering_3[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/3.4bpp");
+const u32 gEventObjectPic_MayWatering_1[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/1.4bpp");
+const u32 gEventObjectPic_MayWatering_4[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/4.4bpp");
+const u32 gEventObjectPic_MayWatering_2[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/2.4bpp");
+const u32 gEventObjectPic_MayWatering_5[] = INCBIN_U32("graphics/event_objects/pics/people/may/watering/5.4bpp");
+const u16 gEventObjectPalette0[] = INCBIN_U16("graphics/event_objects/palettes/00.gbapal");
+const u16 gEventObjectPalette1[] = INCBIN_U16("graphics/event_objects/palettes/01.gbapal");
+const u16 gEventObjectPalette2[] = INCBIN_U16("graphics/event_objects/palettes/02.gbapal");
+const u16 gEventObjectPalette3[] = INCBIN_U16("graphics/event_objects/palettes/03.gbapal");
+const u16 gEventObjectPalette4[] = INCBIN_U16("graphics/event_objects/palettes/04.gbapal");
+const u16 gEventObjectPalette5[] = INCBIN_U16("graphics/event_objects/palettes/05.gbapal");
+const u16 gEventObjectPalette6[] = INCBIN_U16("graphics/event_objects/palettes/06.gbapal");
+const u16 gEventObjectPalette7[] = INCBIN_U16("graphics/event_objects/palettes/07.gbapal");
+const u32 gEventObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/0.4bpp");
+const u32 gEventObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/1.4bpp");
+const u32 gEventObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/2.4bpp");
+const u32 gEventObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/3.4bpp");
+const u32 gEventObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/4.4bpp");
+const u32 gEventObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/5.4bpp");
+const u32 gEventObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/6.4bpp");
+const u32 gEventObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/7.4bpp");
+const u32 gEventObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_1/8.4bpp");
+const u32 gEventObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/0.4bpp");
+const u32 gEventObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/1.4bpp");
+const u32 gEventObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/2.4bpp");
+const u32 gEventObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/3.4bpp");
+const u32 gEventObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/4.4bpp");
+const u32 gEventObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/5.4bpp");
+const u32 gEventObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/6.4bpp");
+const u32 gEventObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/7.4bpp");
+const u32 gEventObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_1/8.4bpp");
+const u32 gEventObjectPic_Boy1_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/0.4bpp");
+const u32 gEventObjectPic_Boy1_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/1.4bpp");
+const u32 gEventObjectPic_Boy1_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/2.4bpp");
+const u32 gEventObjectPic_Boy1_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/3.4bpp");
+const u32 gEventObjectPic_Boy1_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/4.4bpp");
+const u32 gEventObjectPic_Boy1_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/5.4bpp");
+const u32 gEventObjectPic_Boy1_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/6.4bpp");
+const u32 gEventObjectPic_Boy1_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/7.4bpp");
+const u32 gEventObjectPic_Boy1_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_1/8.4bpp");
+const u32 gEventObjectPic_Girl1_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/0.4bpp");
+const u32 gEventObjectPic_Girl1_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/1.4bpp");
+const u32 gEventObjectPic_Girl1_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/2.4bpp");
+const u32 gEventObjectPic_Girl1_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/3.4bpp");
+const u32 gEventObjectPic_Girl1_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/4.4bpp");
+const u32 gEventObjectPic_Girl1_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/5.4bpp");
+const u32 gEventObjectPic_Girl1_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/6.4bpp");
+const u32 gEventObjectPic_Girl1_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/7.4bpp");
+const u32 gEventObjectPic_Girl1_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_1/8.4bpp");
+const u32 gEventObjectPic_Boy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/0.4bpp");
+const u32 gEventObjectPic_Boy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/1.4bpp");
+const u32 gEventObjectPic_Boy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/2.4bpp");
+const u32 gEventObjectPic_Boy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/3.4bpp");
+const u32 gEventObjectPic_Boy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/4.4bpp");
+const u32 gEventObjectPic_Boy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/5.4bpp");
+const u32 gEventObjectPic_Boy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/6.4bpp");
+const u32 gEventObjectPic_Boy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/7.4bpp");
+const u32 gEventObjectPic_Boy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_2/8.4bpp");
+const u32 gEventObjectPic_Girl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/0.4bpp");
+const u32 gEventObjectPic_Girl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/1.4bpp");
+const u32 gEventObjectPic_Girl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/2.4bpp");
+const u32 gEventObjectPic_Girl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/3.4bpp");
+const u32 gEventObjectPic_Girl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/4.4bpp");
+const u32 gEventObjectPic_Girl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/5.4bpp");
+const u32 gEventObjectPic_Girl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/6.4bpp");
+const u32 gEventObjectPic_Girl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/7.4bpp");
+const u32 gEventObjectPic_Girl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_2/8.4bpp");
+const u32 gEventObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/0.4bpp");
+const u32 gEventObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/1.4bpp");
+const u32 gEventObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/2.4bpp");
+const u32 gEventObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/3.4bpp");
+const u32 gEventObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/4.4bpp");
+const u32 gEventObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/5.4bpp");
+const u32 gEventObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/6.4bpp");
+const u32 gEventObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/7.4bpp");
+const u32 gEventObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_2/8.4bpp");
+const u32 gEventObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/0.4bpp");
+const u32 gEventObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/1.4bpp");
+const u32 gEventObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/2.4bpp");
+const u32 gEventObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/3.4bpp");
+const u32 gEventObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/4.4bpp");
+const u32 gEventObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/5.4bpp");
+const u32 gEventObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/6.4bpp");
+const u32 gEventObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/7.4bpp");
+const u32 gEventObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_girl_2/8.4bpp");
+const u32 gEventObjectPic_Boy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/0.4bpp");
+const u32 gEventObjectPic_Boy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/1.4bpp");
+const u32 gEventObjectPic_Boy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/2.4bpp");
+const u32 gEventObjectPic_Boy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/3.4bpp");
+const u32 gEventObjectPic_Boy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/4.4bpp");
+const u32 gEventObjectPic_Boy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/5.4bpp");
+const u32 gEventObjectPic_Boy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/6.4bpp");
+const u32 gEventObjectPic_Boy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/7.4bpp");
+const u32 gEventObjectPic_Boy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_3/8.4bpp");
+const u32 gEventObjectPic_Girl3_0[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/0.4bpp");
+const u32 gEventObjectPic_Girl3_1[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/1.4bpp");
+const u32 gEventObjectPic_Girl3_2[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/2.4bpp");
+const u32 gEventObjectPic_Girl3_3[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/3.4bpp");
+const u32 gEventObjectPic_Girl3_4[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/4.4bpp");
+const u32 gEventObjectPic_Girl3_5[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/5.4bpp");
+const u32 gEventObjectPic_Girl3_6[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/6.4bpp");
+const u32 gEventObjectPic_Girl3_7[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/7.4bpp");
+const u32 gEventObjectPic_Girl3_8[] = INCBIN_U32("graphics/event_objects/pics/people/girl_3/8.4bpp");
+const u32 gEventObjectPic_Boy4_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/0.4bpp");
+const u32 gEventObjectPic_Boy4_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/1.4bpp");
+const u32 gEventObjectPic_Boy4_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/2.4bpp");
+const u32 gEventObjectPic_Boy4_3[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/3.4bpp");
+const u32 gEventObjectPic_Boy4_4[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/4.4bpp");
+const u32 gEventObjectPic_Boy4_5[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/5.4bpp");
+const u32 gEventObjectPic_Boy4_6[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/6.4bpp");
+const u32 gEventObjectPic_Boy4_7[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/7.4bpp");
+const u32 gEventObjectPic_Boy4_8[] = INCBIN_U32("graphics/event_objects/pics/people/boy_4/8.4bpp");
+const u32 gEventObjectPic_Woman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/0.4bpp");
+const u32 gEventObjectPic_Woman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/1.4bpp");
+const u32 gEventObjectPic_Woman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/2.4bpp");
+const u32 gEventObjectPic_Woman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/3.4bpp");
+const u32 gEventObjectPic_Woman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/4.4bpp");
+const u32 gEventObjectPic_Woman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/5.4bpp");
+const u32 gEventObjectPic_Woman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/6.4bpp");
+const u32 gEventObjectPic_Woman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/7.4bpp");
+const u32 gEventObjectPic_Woman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_1/8.4bpp");
+const u32 gEventObjectPic_FatMan_0[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/0.4bpp");
+const u32 gEventObjectPic_FatMan_1[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/1.4bpp");
+const u32 gEventObjectPic_FatMan_2[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/2.4bpp");
+const u32 gEventObjectPic_FatMan_3[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/3.4bpp");
+const u32 gEventObjectPic_FatMan_4[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/4.4bpp");
+const u32 gEventObjectPic_FatMan_5[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/5.4bpp");
+const u32 gEventObjectPic_FatMan_6[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/6.4bpp");
+const u32 gEventObjectPic_FatMan_7[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/7.4bpp");
+const u32 gEventObjectPic_FatMan_8[] = INCBIN_U32("graphics/event_objects/pics/people/fat_man/8.4bpp");
+const u32 gEventObjectPic_Woman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/0.4bpp");
+const u32 gEventObjectPic_Woman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/1.4bpp");
+const u32 gEventObjectPic_Woman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/2.4bpp");
+const u32 gEventObjectPic_Woman2_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/3.4bpp");
+const u32 gEventObjectPic_Woman2_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/4.4bpp");
+const u32 gEventObjectPic_Woman2_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/5.4bpp");
+const u32 gEventObjectPic_Woman2_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/6.4bpp");
+const u32 gEventObjectPic_Woman2_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/7.4bpp");
+const u32 gEventObjectPic_Woman2_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_2/8.4bpp");
+const u32 gEventObjectPic_Man1_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/0.4bpp");
+const u32 gEventObjectPic_Man1_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/1.4bpp");
+const u32 gEventObjectPic_Man1_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/2.4bpp");
+const u32 gEventObjectPic_Man1_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/3.4bpp");
+const u32 gEventObjectPic_Man1_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/4.4bpp");
+const u32 gEventObjectPic_Man1_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/5.4bpp");
+const u32 gEventObjectPic_Man1_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/6.4bpp");
+const u32 gEventObjectPic_Man1_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/7.4bpp");
+const u32 gEventObjectPic_Man1_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_1/8.4bpp");
+const u32 gEventObjectPic_Woman3_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/0.4bpp");
+const u32 gEventObjectPic_Woman3_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/1.4bpp");
+const u32 gEventObjectPic_Woman3_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/2.4bpp");
+const u32 gEventObjectPic_Woman3_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/3.4bpp");
+const u32 gEventObjectPic_Woman3_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/4.4bpp");
+const u32 gEventObjectPic_Woman3_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/5.4bpp");
+const u32 gEventObjectPic_Woman3_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/6.4bpp");
+const u32 gEventObjectPic_Woman3_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/7.4bpp");
+const u32 gEventObjectPic_Woman3_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_3/8.4bpp");
+const u32 gEventObjectPic_OldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/0.4bpp");
+const u32 gEventObjectPic_OldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/1.4bpp");
+const u32 gEventObjectPic_OldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/2.4bpp");
+const u32 gEventObjectPic_OldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/3.4bpp");
+const u32 gEventObjectPic_OldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/4.4bpp");
+const u32 gEventObjectPic_OldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/5.4bpp");
+const u32 gEventObjectPic_OldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/6.4bpp");
+const u32 gEventObjectPic_OldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/7.4bpp");
+const u32 gEventObjectPic_OldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_1/8.4bpp");
+const u32 gEventObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/0.4bpp");
+const u32 gEventObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/1.4bpp");
+const u32 gEventObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/2.4bpp");
+const u32 gEventObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/3.4bpp");
+const u32 gEventObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/4.4bpp");
+const u32 gEventObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/5.4bpp");
+const u32 gEventObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/6.4bpp");
+const u32 gEventObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/7.4bpp");
+const u32 gEventObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_1/8.4bpp");
+const u32 gEventObjectPic_Man2_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/0.4bpp");
+const u32 gEventObjectPic_Man2_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/1.4bpp");
+const u32 gEventObjectPic_Man2_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/2.4bpp");
+const u32 gEventObjectPic_Man2_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/3.4bpp");
+const u32 gEventObjectPic_Man2_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/4.4bpp");
+const u32 gEventObjectPic_Man2_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/5.4bpp");
+const u32 gEventObjectPic_Man2_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/6.4bpp");
+const u32 gEventObjectPic_Man2_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/7.4bpp");
+const u32 gEventObjectPic_Man2_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_2/8.4bpp");
+const u32 gEventObjectPic_Woman4_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/0.4bpp");
+const u32 gEventObjectPic_Woman4_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/1.4bpp");
+const u32 gEventObjectPic_Woman4_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/2.4bpp");
+const u32 gEventObjectPic_Woman4_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/3.4bpp");
+const u32 gEventObjectPic_Woman4_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/4.4bpp");
+const u32 gEventObjectPic_Woman4_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/5.4bpp");
+const u32 gEventObjectPic_Woman4_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/6.4bpp");
+const u32 gEventObjectPic_Woman4_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/7.4bpp");
+const u32 gEventObjectPic_Woman4_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_4/8.4bpp");
+const u32 gEventObjectPic_Man3_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/0.4bpp");
+const u32 gEventObjectPic_Man3_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/1.4bpp");
+const u32 gEventObjectPic_Man3_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/2.4bpp");
+const u32 gEventObjectPic_Man3_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/3.4bpp");
+const u32 gEventObjectPic_Man3_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/4.4bpp");
+const u32 gEventObjectPic_Man3_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/5.4bpp");
+const u32 gEventObjectPic_Man3_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/6.4bpp");
+const u32 gEventObjectPic_Man3_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/7.4bpp");
+const u32 gEventObjectPic_Man3_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_3/8.4bpp");
+const u32 gEventObjectPic_Woman5_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/0.4bpp");
+const u32 gEventObjectPic_Woman5_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/1.4bpp");
+const u32 gEventObjectPic_Woman5_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/2.4bpp");
+const u32 gEventObjectPic_Woman5_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/3.4bpp");
+const u32 gEventObjectPic_Woman5_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/4.4bpp");
+const u32 gEventObjectPic_Woman5_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/5.4bpp");
+const u32 gEventObjectPic_Woman5_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/6.4bpp");
+const u32 gEventObjectPic_Woman5_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/7.4bpp");
+const u32 gEventObjectPic_Woman5_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_5/8.4bpp");
+const u32 gEventObjectPic_Cook_0[] = INCBIN_U32("graphics/event_objects/pics/people/cook/0.4bpp");
+const u32 gEventObjectPic_Cook_1[] = INCBIN_U32("graphics/event_objects/pics/people/cook/1.4bpp");
+const u32 gEventObjectPic_Cook_2[] = INCBIN_U32("graphics/event_objects/pics/people/cook/2.4bpp");
+const u32 gEventObjectPic_Woman6_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/0.4bpp");
+const u32 gEventObjectPic_Woman6_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/1.4bpp");
+const u32 gEventObjectPic_Woman6_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/2.4bpp");
+const u32 gEventObjectPic_Woman6_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/3.4bpp");
+const u32 gEventObjectPic_Woman6_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/4.4bpp");
+const u32 gEventObjectPic_Woman6_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/5.4bpp");
+const u32 gEventObjectPic_Woman6_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/6.4bpp");
+const u32 gEventObjectPic_Woman6_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/7.4bpp");
+const u32 gEventObjectPic_Woman6_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_6/8.4bpp");
+const u32 gEventObjectPic_OldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/0.4bpp");
+const u32 gEventObjectPic_OldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/1.4bpp");
+const u32 gEventObjectPic_OldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_man_2/2.4bpp");
+const u32 gEventObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/0.4bpp");
+const u32 gEventObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/1.4bpp");
+const u32 gEventObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/event_objects/pics/people/old_woman_2/2.4bpp");
+const u32 gEventObjectPic_Camper_0[] = INCBIN_U32("graphics/event_objects/pics/people/camper/0.4bpp");
+const u32 gEventObjectPic_Camper_1[] = INCBIN_U32("graphics/event_objects/pics/people/camper/1.4bpp");
+const u32 gEventObjectPic_Camper_2[] = INCBIN_U32("graphics/event_objects/pics/people/camper/2.4bpp");
+const u32 gEventObjectPic_Camper_3[] = INCBIN_U32("graphics/event_objects/pics/people/camper/3.4bpp");
+const u32 gEventObjectPic_Camper_4[] = INCBIN_U32("graphics/event_objects/pics/people/camper/4.4bpp");
+const u32 gEventObjectPic_Camper_5[] = INCBIN_U32("graphics/event_objects/pics/people/camper/5.4bpp");
+const u32 gEventObjectPic_Camper_6[] = INCBIN_U32("graphics/event_objects/pics/people/camper/6.4bpp");
+const u32 gEventObjectPic_Camper_7[] = INCBIN_U32("graphics/event_objects/pics/people/camper/7.4bpp");
+const u32 gEventObjectPic_Camper_8[] = INCBIN_U32("graphics/event_objects/pics/people/camper/8.4bpp");
+const u32 gEventObjectPic_Picnicker_0[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/0.4bpp");
+const u32 gEventObjectPic_Picnicker_1[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/1.4bpp");
+const u32 gEventObjectPic_Picnicker_2[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/2.4bpp");
+const u32 gEventObjectPic_Picnicker_3[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/3.4bpp");
+const u32 gEventObjectPic_Picnicker_4[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/4.4bpp");
+const u32 gEventObjectPic_Picnicker_5[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/5.4bpp");
+const u32 gEventObjectPic_Picnicker_6[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/6.4bpp");
+const u32 gEventObjectPic_Picnicker_7[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/7.4bpp");
+const u32 gEventObjectPic_Picnicker_8[] = INCBIN_U32("graphics/event_objects/pics/people/picnicker/8.4bpp");
+const u32 gEventObjectPic_Man4_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/0.4bpp");
+const u32 gEventObjectPic_Man4_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/1.4bpp");
+const u32 gEventObjectPic_Man4_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/2.4bpp");
+const u32 gEventObjectPic_Man4_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/3.4bpp");
+const u32 gEventObjectPic_Man4_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/4.4bpp");
+const u32 gEventObjectPic_Man4_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/5.4bpp");
+const u32 gEventObjectPic_Man4_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/6.4bpp");
+const u32 gEventObjectPic_Man4_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/7.4bpp");
+const u32 gEventObjectPic_Man4_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_4/8.4bpp");
+const u32 gEventObjectPic_Woman7_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/0.4bpp");
+const u32 gEventObjectPic_Woman7_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/1.4bpp");
+const u32 gEventObjectPic_Woman7_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/2.4bpp");
+const u32 gEventObjectPic_Woman7_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/3.4bpp");
+const u32 gEventObjectPic_Woman7_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/4.4bpp");
+const u32 gEventObjectPic_Woman7_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/5.4bpp");
+const u32 gEventObjectPic_Woman7_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/6.4bpp");
+const u32 gEventObjectPic_Woman7_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/7.4bpp");
+const u32 gEventObjectPic_Woman7_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_7/8.4bpp");
+const u32 gEventObjectPic_Youngster_0[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/0.4bpp");
+const u32 gEventObjectPic_Youngster_1[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/1.4bpp");
+const u32 gEventObjectPic_Youngster_2[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/2.4bpp");
+const u32 gEventObjectPic_Youngster_3[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/3.4bpp");
+const u32 gEventObjectPic_Youngster_4[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/4.4bpp");
+const u32 gEventObjectPic_Youngster_5[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/5.4bpp");
+const u32 gEventObjectPic_Youngster_6[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/6.4bpp");
+const u32 gEventObjectPic_Youngster_7[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/7.4bpp");
+const u32 gEventObjectPic_Youngster_8[] = INCBIN_U32("graphics/event_objects/pics/people/youngster/8.4bpp");
+const u32 gEventObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/0.4bpp");
+const u32 gEventObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/1.4bpp");
+const u32 gEventObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/2.4bpp");
+const u32 gEventObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/3.4bpp");
+const u32 gEventObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/4.4bpp");
+const u32 gEventObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/5.4bpp");
+const u32 gEventObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/6.4bpp");
+const u32 gEventObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/7.4bpp");
+const u32 gEventObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/event_objects/pics/people/bug_catcher/8.4bpp");
+const u32 gEventObjectPic_PsychicM_0[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/0.4bpp");
+const u32 gEventObjectPic_PsychicM_1[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/1.4bpp");
+const u32 gEventObjectPic_PsychicM_2[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/2.4bpp");
+const u32 gEventObjectPic_PsychicM_3[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/3.4bpp");
+const u32 gEventObjectPic_PsychicM_4[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/4.4bpp");
+const u32 gEventObjectPic_PsychicM_5[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/5.4bpp");
+const u32 gEventObjectPic_PsychicM_6[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/6.4bpp");
+const u32 gEventObjectPic_PsychicM_7[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/7.4bpp");
+const u32 gEventObjectPic_PsychicM_8[] = INCBIN_U32("graphics/event_objects/pics/people/psychic_m/8.4bpp");
+const u32 gEventObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/0.4bpp");
+const u32 gEventObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/1.4bpp");
+const u32 gEventObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/2.4bpp");
+const u32 gEventObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/3.4bpp");
+const u32 gEventObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/4.4bpp");
+const u32 gEventObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/5.4bpp");
+const u32 gEventObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/6.4bpp");
+const u32 gEventObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/7.4bpp");
+const u32 gEventObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/event_objects/pics/people/school_kid_m/8.4bpp");
+const u32 gEventObjectPic_Maniac_0[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/0.4bpp");
+const u32 gEventObjectPic_Maniac_1[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/1.4bpp");
+const u32 gEventObjectPic_Maniac_2[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/2.4bpp");
+const u32 gEventObjectPic_Maniac_3[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/3.4bpp");
+const u32 gEventObjectPic_Maniac_4[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/4.4bpp");
+const u32 gEventObjectPic_Maniac_5[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/5.4bpp");
+const u32 gEventObjectPic_Maniac_6[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/6.4bpp");
+const u32 gEventObjectPic_Maniac_7[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/7.4bpp");
+const u32 gEventObjectPic_Maniac_8[] = INCBIN_U32("graphics/event_objects/pics/people/maniac/8.4bpp");
+const u32 gEventObjectPic_HexManiac_0[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/0.4bpp");
+const u32 gEventObjectPic_HexManiac_1[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/1.4bpp");
+const u32 gEventObjectPic_HexManiac_2[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/2.4bpp");
+const u32 gEventObjectPic_HexManiac_3[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/3.4bpp");
+const u32 gEventObjectPic_HexManiac_4[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/4.4bpp");
+const u32 gEventObjectPic_HexManiac_5[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/5.4bpp");
+const u32 gEventObjectPic_HexManiac_6[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/6.4bpp");
+const u32 gEventObjectPic_HexManiac_7[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/7.4bpp");
+const u32 gEventObjectPic_HexManiac_8[] = INCBIN_U32("graphics/event_objects/pics/people/hex_maniac/8.4bpp");
+const u32 gEventObjectPic_Woman8_0[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/0.4bpp");
+const u32 gEventObjectPic_Woman8_1[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/1.4bpp");
+const u32 gEventObjectPic_Woman8_2[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/2.4bpp");
+const u32 gEventObjectPic_Woman8_3[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/3.4bpp");
+const u32 gEventObjectPic_Woman8_4[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/4.4bpp");
+const u32 gEventObjectPic_Woman8_5[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/5.4bpp");
+const u32 gEventObjectPic_Woman8_6[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/6.4bpp");
+const u32 gEventObjectPic_Woman8_7[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/7.4bpp");
+const u32 gEventObjectPic_Woman8_8[] = INCBIN_U32("graphics/event_objects/pics/people/woman_8/8.4bpp");
+const u32 gEventObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/0.4bpp");
+const u32 gEventObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/1.4bpp");
+const u32 gEventObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/2.4bpp");
+const u32 gEventObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/3.4bpp");
+const u32 gEventObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/4.4bpp");
+const u32 gEventObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/5.4bpp");
+const u32 gEventObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/6.4bpp");
+const u32 gEventObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/7.4bpp");
+const u32 gEventObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_m/8.4bpp");
+const u32 gEventObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/0.4bpp");
+const u32 gEventObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/1.4bpp");
+const u32 gEventObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/2.4bpp");
+const u32 gEventObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/3.4bpp");
+const u32 gEventObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/4.4bpp");
+const u32 gEventObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/5.4bpp");
+const u32 gEventObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/6.4bpp");
+const u32 gEventObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/7.4bpp");
+const u32 gEventObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/event_objects/pics/people/swimmer_f/8.4bpp");
+const u32 gEventObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/0.4bpp");
+const u32 gEventObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/1.4bpp");
+const u32 gEventObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/2.4bpp");
+const u32 gEventObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/3.4bpp");
+const u32 gEventObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/4.4bpp");
+const u32 gEventObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/5.4bpp");
+const u32 gEventObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/6.4bpp");
+const u32 gEventObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/7.4bpp");
+const u32 gEventObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/event_objects/pics/people/black_belt/8.4bpp");
+const u32 gEventObjectPic_Beauty_0[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/0.4bpp");
+const u32 gEventObjectPic_Beauty_1[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/1.4bpp");
+const u32 gEventObjectPic_Beauty_2[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/2.4bpp");
+const u32 gEventObjectPic_Beauty_3[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/3.4bpp");
+const u32 gEventObjectPic_Beauty_4[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/4.4bpp");
+const u32 gEventObjectPic_Beauty_5[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/5.4bpp");
+const u32 gEventObjectPic_Beauty_6[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/6.4bpp");
+const u32 gEventObjectPic_Beauty_7[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/7.4bpp");
+const u32 gEventObjectPic_Beauty_8[] = INCBIN_U32("graphics/event_objects/pics/people/beauty/8.4bpp");
+const u32 gEventObjectPic_Scientist1_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/0.4bpp");
+const u32 gEventObjectPic_Scientist1_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/1.4bpp");
+const u32 gEventObjectPic_Scientist1_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/2.4bpp");
+const u32 gEventObjectPic_Scientist1_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/3.4bpp");
+const u32 gEventObjectPic_Scientist1_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/4.4bpp");
+const u32 gEventObjectPic_Scientist1_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/5.4bpp");
+const u32 gEventObjectPic_Scientist1_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/6.4bpp");
+const u32 gEventObjectPic_Scientist1_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/7.4bpp");
+const u32 gEventObjectPic_Scientist1_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_1/8.4bpp");
+const u32 gEventObjectPic_Lass_0[] = INCBIN_U32("graphics/event_objects/pics/people/lass/0.4bpp");
+const u32 gEventObjectPic_Lass_1[] = INCBIN_U32("graphics/event_objects/pics/people/lass/1.4bpp");
+const u32 gEventObjectPic_Lass_2[] = INCBIN_U32("graphics/event_objects/pics/people/lass/2.4bpp");
+const u32 gEventObjectPic_Lass_3[] = INCBIN_U32("graphics/event_objects/pics/people/lass/3.4bpp");
+const u32 gEventObjectPic_Lass_4[] = INCBIN_U32("graphics/event_objects/pics/people/lass/4.4bpp");
+const u32 gEventObjectPic_Lass_5[] = INCBIN_U32("graphics/event_objects/pics/people/lass/5.4bpp");
+const u32 gEventObjectPic_Lass_6[] = INCBIN_U32("graphics/event_objects/pics/people/lass/6.4bpp");
+const u32 gEventObjectPic_Lass_7[] = INCBIN_U32("graphics/event_objects/pics/people/lass/7.4bpp");
+const u32 gEventObjectPic_Lass_8[] = INCBIN_U32("graphics/event_objects/pics/people/lass/8.4bpp");
+const u32 gEventObjectPic_Gentleman_0[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/0.4bpp");
+const u32 gEventObjectPic_Gentleman_1[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/1.4bpp");
+const u32 gEventObjectPic_Gentleman_2[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/2.4bpp");
+const u32 gEventObjectPic_Gentleman_3[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/3.4bpp");
+const u32 gEventObjectPic_Gentleman_4[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/4.4bpp");
+const u32 gEventObjectPic_Gentleman_5[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/5.4bpp");
+const u32 gEventObjectPic_Gentleman_6[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/6.4bpp");
+const u32 gEventObjectPic_Gentleman_7[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/7.4bpp");
+const u32 gEventObjectPic_Gentleman_8[] = INCBIN_U32("graphics/event_objects/pics/people/gentleman/8.4bpp");
+const u32 gEventObjectPic_Sailor_0[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/0.4bpp");
+const u32 gEventObjectPic_Sailor_1[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/1.4bpp");
+const u32 gEventObjectPic_Sailor_2[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/2.4bpp");
+const u32 gEventObjectPic_Sailor_3[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/3.4bpp");
+const u32 gEventObjectPic_Sailor_4[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/4.4bpp");
+const u32 gEventObjectPic_Sailor_5[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/5.4bpp");
+const u32 gEventObjectPic_Sailor_6[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/6.4bpp");
+const u32 gEventObjectPic_Sailor_7[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/7.4bpp");
+const u32 gEventObjectPic_Sailor_8[] = INCBIN_U32("graphics/event_objects/pics/people/sailor/8.4bpp");
+const u32 gEventObjectPic_Fisherman_0[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/0.4bpp");
+const u32 gEventObjectPic_Fisherman_1[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/1.4bpp");
+const u32 gEventObjectPic_Fisherman_2[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/2.4bpp");
+const u32 gEventObjectPic_Fisherman_3[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/3.4bpp");
+const u32 gEventObjectPic_Fisherman_4[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/4.4bpp");
+const u32 gEventObjectPic_Fisherman_5[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/5.4bpp");
+const u32 gEventObjectPic_Fisherman_6[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/6.4bpp");
+const u32 gEventObjectPic_Fisherman_7[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/7.4bpp");
+const u32 gEventObjectPic_Fisherman_8[] = INCBIN_U32("graphics/event_objects/pics/people/fisherman/8.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/0.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/1.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/2.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/3.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/4.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/5.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/6.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/7.4bpp");
+const u32 gEventObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_m/8.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/0.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/1.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/2.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/3.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/4.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/5.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/6.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/7.4bpp");
+const u32 gEventObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/running_triathlete_f/8.4bpp");
+const u32 gEventObjectPic_TuberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/0.4bpp");
+const u32 gEventObjectPic_TuberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/1.4bpp");
+const u32 gEventObjectPic_TuberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/2.4bpp");
+const u32 gEventObjectPic_TuberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/3.4bpp");
+const u32 gEventObjectPic_TuberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/4.4bpp");
+const u32 gEventObjectPic_TuberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/5.4bpp");
+const u32 gEventObjectPic_TuberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/6.4bpp");
+const u32 gEventObjectPic_TuberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/7.4bpp");
+const u32 gEventObjectPic_TuberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_f/8.4bpp");
+const u32 gEventObjectPic_TuberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/0.4bpp");
+const u32 gEventObjectPic_TuberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/1.4bpp");
+const u32 gEventObjectPic_TuberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/2.4bpp");
+const u32 gEventObjectPic_TuberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/3.4bpp");
+const u32 gEventObjectPic_TuberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/4.4bpp");
+const u32 gEventObjectPic_TuberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/5.4bpp");
+const u32 gEventObjectPic_TuberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/6.4bpp");
+const u32 gEventObjectPic_TuberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/7.4bpp");
+const u32 gEventObjectPic_TuberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m/8.4bpp");
+const u32 gEventObjectPic_Hiker_0[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/0.4bpp");
+const u32 gEventObjectPic_Hiker_1[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/1.4bpp");
+const u32 gEventObjectPic_Hiker_2[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/2.4bpp");
+const u32 gEventObjectPic_Hiker_3[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/3.4bpp");
+const u32 gEventObjectPic_Hiker_4[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/4.4bpp");
+const u32 gEventObjectPic_Hiker_5[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/5.4bpp");
+const u32 gEventObjectPic_Hiker_6[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/6.4bpp");
+const u32 gEventObjectPic_Hiker_7[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/7.4bpp");
+const u32 gEventObjectPic_Hiker_8[] = INCBIN_U32("graphics/event_objects/pics/people/hiker/8.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/0.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/1.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/2.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/3.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/4.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/5.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/6.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/7.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_m/8.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/0.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/1.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/2.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/3.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/4.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/5.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/6.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/7.4bpp");
+const u32 gEventObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/event_objects/pics/people/cycling_triathlete_f/8.4bpp");
+const u32 gEventObjectPic_Man5_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/0.4bpp");
+const u32 gEventObjectPic_Man5_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/1.4bpp");
+const u32 gEventObjectPic_Man5_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/2.4bpp");
+const u32 gEventObjectPic_Man5_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/3.4bpp");
+const u32 gEventObjectPic_Man5_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/4.4bpp");
+const u32 gEventObjectPic_Man5_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/5.4bpp");
+const u32 gEventObjectPic_Man5_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/6.4bpp");
+const u32 gEventObjectPic_Man5_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/7.4bpp");
+const u32 gEventObjectPic_Man5_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_5/8.4bpp");
+const u32 gEventObjectPic_Man6_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/0.4bpp");
+const u32 gEventObjectPic_Man6_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/1.4bpp");
+const u32 gEventObjectPic_Man6_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/2.4bpp");
+const u32 gEventObjectPic_Man6_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/3.4bpp");
+const u32 gEventObjectPic_Man6_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/4.4bpp");
+const u32 gEventObjectPic_Man6_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/5.4bpp");
+const u32 gEventObjectPic_Man6_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/6.4bpp");
+const u32 gEventObjectPic_Man6_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/7.4bpp");
+const u32 gEventObjectPic_Man6_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_6/8.4bpp");
+const u32 gEventObjectPic_Nurse_0[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/0.4bpp");
+const u32 gEventObjectPic_Nurse_1[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/1.4bpp");
+const u32 gEventObjectPic_Nurse_2[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/2.4bpp");
+const u32 gEventObjectPic_Nurse_3[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/3.4bpp");
+const u32 gEventObjectPic_Nurse_4[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/4.4bpp");
+const u32 gEventObjectPic_Nurse_5[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/5.4bpp");
+const u32 gEventObjectPic_Nurse_6[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/6.4bpp");
+const u32 gEventObjectPic_Nurse_7[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/7.4bpp");
+const u32 gEventObjectPic_Nurse_8[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/8.4bpp");
+const u32 gEventObjectPic_Nurse_9[] = INCBIN_U32("graphics/event_objects/pics/people/nurse/9.4bpp");
+const u32 gEventObjectPic_ItemBall[] = INCBIN_U32("graphics/event_objects/pics/misc/item_ball.4bpp");
+const u32 gEventObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/0.4bpp");
+const u32 gEventObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/1.4bpp");
+const u32 gEventObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/2.4bpp");
+const u32 gEventObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/3.4bpp");
+const u32 gEventObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/4.4bpp");
+const u32 gEventObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/5.4bpp");
+const u32 gEventObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/6.4bpp");
+const u32 gEventObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/7.4bpp");
+const u32 gEventObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/event_objects/pics/people/prof_birch/8.4bpp");
+const u32 gEventObjectPic_ReporterM_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/0.4bpp");
+const u32 gEventObjectPic_ReporterM_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/1.4bpp");
+const u32 gEventObjectPic_ReporterM_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/2.4bpp");
+const u32 gEventObjectPic_ReporterM_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/3.4bpp");
+const u32 gEventObjectPic_ReporterM_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/4.4bpp");
+const u32 gEventObjectPic_ReporterM_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/5.4bpp");
+const u32 gEventObjectPic_ReporterM_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/6.4bpp");
+const u32 gEventObjectPic_ReporterM_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/7.4bpp");
+const u32 gEventObjectPic_ReporterM_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_m/8.4bpp");
+const u32 gEventObjectPic_ReporterF_0[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/0.4bpp");
+const u32 gEventObjectPic_ReporterF_1[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/1.4bpp");
+const u32 gEventObjectPic_ReporterF_2[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/2.4bpp");
+const u32 gEventObjectPic_ReporterF_3[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/3.4bpp");
+const u32 gEventObjectPic_ReporterF_4[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/4.4bpp");
+const u32 gEventObjectPic_ReporterF_5[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/5.4bpp");
+const u32 gEventObjectPic_ReporterF_6[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/6.4bpp");
+const u32 gEventObjectPic_ReporterF_7[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/7.4bpp");
+const u32 gEventObjectPic_ReporterF_8[] = INCBIN_U32("graphics/event_objects/pics/people/reporter_f/8.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/0.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/1.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/2.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/3.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/4.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/5.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/6.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/7.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_1/8.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/0.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/1.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/2.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/3.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/4.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/5.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/6.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/7.4bpp");
+const u32 gEventObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/event_objects/pics/people/mauville_old_man_2/8.4bpp");
+const u32 gEventObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/0.4bpp");
+const u32 gEventObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/1.4bpp");
+const u32 gEventObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/2.4bpp");
+const u32 gEventObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/3.4bpp");
+const u32 gEventObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/4.4bpp");
+const u32 gEventObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/5.4bpp");
+const u32 gEventObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/6.4bpp");
+const u32 gEventObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/7.4bpp");
+const u32 gEventObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/event_objects/pics/people/mart_employee/8.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/0.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/1.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/2.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/3.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/4.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/5.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/6.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/7.4bpp");
+const u32 gEventObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/rooftop_sale_woman/8.4bpp");
+const u32 gEventObjectPic_Teala_0[] = INCBIN_U32("graphics/event_objects/pics/people/teala/0.4bpp");
+const u32 gEventObjectPic_Teala_1[] = INCBIN_U32("graphics/event_objects/pics/people/teala/1.4bpp");
+const u32 gEventObjectPic_Teala_2[] = INCBIN_U32("graphics/event_objects/pics/people/teala/2.4bpp");
+const u32 gEventObjectPic_Teala_3[] = INCBIN_U32("graphics/event_objects/pics/people/teala/3.4bpp");
+const u32 gEventObjectPic_Teala_4[] = INCBIN_U32("graphics/event_objects/pics/people/teala/4.4bpp");
+const u32 gEventObjectPic_Teala_5[] = INCBIN_U32("graphics/event_objects/pics/people/teala/5.4bpp");
+const u32 gEventObjectPic_Teala_6[] = INCBIN_U32("graphics/event_objects/pics/people/teala/6.4bpp");
+const u32 gEventObjectPic_Teala_7[] = INCBIN_U32("graphics/event_objects/pics/people/teala/7.4bpp");
+const u32 gEventObjectPic_Teala_8[] = INCBIN_U32("graphics/event_objects/pics/people/teala/8.4bpp");
+const u32 gEventObjectPic_Artist_0[] = INCBIN_U32("graphics/event_objects/pics/people/artist/0.4bpp");
+const u32 gEventObjectPic_Artist_1[] = INCBIN_U32("graphics/event_objects/pics/people/artist/1.4bpp");
+const u32 gEventObjectPic_Artist_2[] = INCBIN_U32("graphics/event_objects/pics/people/artist/2.4bpp");
+const u32 gEventObjectPic_Artist_3[] = INCBIN_U32("graphics/event_objects/pics/people/artist/3.4bpp");
+const u32 gEventObjectPic_Artist_4[] = INCBIN_U32("graphics/event_objects/pics/people/artist/4.4bpp");
+const u32 gEventObjectPic_Artist_5[] = INCBIN_U32("graphics/event_objects/pics/people/artist/5.4bpp");
+const u32 gEventObjectPic_Artist_6[] = INCBIN_U32("graphics/event_objects/pics/people/artist/6.4bpp");
+const u32 gEventObjectPic_Artist_7[] = INCBIN_U32("graphics/event_objects/pics/people/artist/7.4bpp");
+const u32 gEventObjectPic_Artist_8[] = INCBIN_U32("graphics/event_objects/pics/people/artist/8.4bpp");
+const u32 gEventObjectPic_Cameraman_0[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/0.4bpp");
+const u32 gEventObjectPic_Cameraman_1[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/1.4bpp");
+const u32 gEventObjectPic_Cameraman_2[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/2.4bpp");
+const u32 gEventObjectPic_Cameraman_3[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/3.4bpp");
+const u32 gEventObjectPic_Cameraman_4[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/4.4bpp");
+const u32 gEventObjectPic_Cameraman_5[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/5.4bpp");
+const u32 gEventObjectPic_Cameraman_6[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/6.4bpp");
+const u32 gEventObjectPic_Cameraman_7[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/7.4bpp");
+const u32 gEventObjectPic_Cameraman_8[] = INCBIN_U32("graphics/event_objects/pics/people/cameraman/8.4bpp");
+const u32 gEventObjectPic_Scientist2_0[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/0.4bpp");
+const u32 gEventObjectPic_Scientist2_1[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/1.4bpp");
+const u32 gEventObjectPic_Scientist2_2[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/2.4bpp");
+const u32 gEventObjectPic_Scientist2_3[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/3.4bpp");
+const u32 gEventObjectPic_Scientist2_4[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/4.4bpp");
+const u32 gEventObjectPic_Scientist2_5[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/5.4bpp");
+const u32 gEventObjectPic_Scientist2_6[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/6.4bpp");
+const u32 gEventObjectPic_Scientist2_7[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/7.4bpp");
+const u32 gEventObjectPic_Scientist2_8[] = INCBIN_U32("graphics/event_objects/pics/people/scientist_2/8.4bpp");
+const u32 gEventObjectPic_Man7_0[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/0.4bpp");
+const u32 gEventObjectPic_Man7_1[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/1.4bpp");
+const u32 gEventObjectPic_Man7_2[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/2.4bpp");
+const u32 gEventObjectPic_Man7_3[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/3.4bpp");
+const u32 gEventObjectPic_Man7_4[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/4.4bpp");
+const u32 gEventObjectPic_Man7_5[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/5.4bpp");
+const u32 gEventObjectPic_Man7_6[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/6.4bpp");
+const u32 gEventObjectPic_Man7_7[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/7.4bpp");
+const u32 gEventObjectPic_Man7_8[] = INCBIN_U32("graphics/event_objects/pics/people/man_7/8.4bpp");
+const u32 gEventObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/0.4bpp");
+const u32 gEventObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/1.4bpp");
+const u32 gEventObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/2.4bpp");
+const u32 gEventObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/3.4bpp");
+const u32 gEventObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/4.4bpp");
+const u32 gEventObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/5.4bpp");
+const u32 gEventObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/6.4bpp");
+const u32 gEventObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/7.4bpp");
+const u32 gEventObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_m/8.4bpp");
+const u32 gEventObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/0.4bpp");
+const u32 gEventObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/1.4bpp");
+const u32 gEventObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/2.4bpp");
+const u32 gEventObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/3.4bpp");
+const u32 gEventObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/4.4bpp");
+const u32 gEventObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/5.4bpp");
+const u32 gEventObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/6.4bpp");
+const u32 gEventObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/7.4bpp");
+const u32 gEventObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/aqua_member_f/8.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/0.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/1.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/2.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/3.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/4.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/5.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/6.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/7.4bpp");
+const u32 gEventObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_m/8.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/0.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/1.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/2.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/3.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/4.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/5.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/6.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/7.4bpp");
+const u32 gEventObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/event_objects/pics/people/magma_member_f/8.4bpp");
+const u32 gEventObjectPic_Sidney_0[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/0.4bpp");
+const u32 gEventObjectPic_Sidney_1[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/1.4bpp");
+const u32 gEventObjectPic_Sidney_2[] = INCBIN_U32("graphics/event_objects/pics/people/sidney/2.4bpp");
+const u32 gEventObjectPic_Phoebe_0[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/0.4bpp");
+const u32 gEventObjectPic_Phoebe_1[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/1.4bpp");
+const u32 gEventObjectPic_Phoebe_2[] = INCBIN_U32("graphics/event_objects/pics/people/phoebe/2.4bpp");
+const u32 gEventObjectPic_Glacia_0[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/0.4bpp");
+const u32 gEventObjectPic_Glacia_1[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/1.4bpp");
+const u32 gEventObjectPic_Glacia_2[] = INCBIN_U32("graphics/event_objects/pics/people/glacia/2.4bpp");
+const u32 gEventObjectPic_Drake_0[] = INCBIN_U32("graphics/event_objects/pics/people/drake/0.4bpp");
+const u32 gEventObjectPic_Drake_1[] = INCBIN_U32("graphics/event_objects/pics/people/drake/1.4bpp");
+const u32 gEventObjectPic_Drake_2[] = INCBIN_U32("graphics/event_objects/pics/people/drake/2.4bpp");
+const u32 gEventObjectPic_Roxanne_0[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/0.4bpp");
+const u32 gEventObjectPic_Roxanne_1[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/1.4bpp");
+const u32 gEventObjectPic_Roxanne_2[] = INCBIN_U32("graphics/event_objects/pics/people/roxanne/2.4bpp");
+const u32 gEventObjectPic_Brawly_0[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/0.4bpp");
+const u32 gEventObjectPic_Brawly_1[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/1.4bpp");
+const u32 gEventObjectPic_Brawly_2[] = INCBIN_U32("graphics/event_objects/pics/people/brawly/2.4bpp");
+const u32 gEventObjectPic_Wattson_0[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/0.4bpp");
+const u32 gEventObjectPic_Wattson_1[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/1.4bpp");
+const u32 gEventObjectPic_Wattson_2[] = INCBIN_U32("graphics/event_objects/pics/people/wattson/2.4bpp");
+const u32 gEventObjectPic_Flannery_0[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/0.4bpp");
+const u32 gEventObjectPic_Flannery_1[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/1.4bpp");
+const u32 gEventObjectPic_Flannery_2[] = INCBIN_U32("graphics/event_objects/pics/people/flannery/2.4bpp");
+const u32 gEventObjectPic_Norman_0[] = INCBIN_U32("graphics/event_objects/pics/people/norman/0.4bpp");
+const u32 gEventObjectPic_Norman_1[] = INCBIN_U32("graphics/event_objects/pics/people/norman/1.4bpp");
+const u32 gEventObjectPic_Norman_2[] = INCBIN_U32("graphics/event_objects/pics/people/norman/2.4bpp");
+const u32 gEventObjectPic_Norman_3[] = INCBIN_U32("graphics/event_objects/pics/people/norman/3.4bpp");
+const u32 gEventObjectPic_Norman_4[] = INCBIN_U32("graphics/event_objects/pics/people/norman/4.4bpp");
+const u32 gEventObjectPic_Norman_5[] = INCBIN_U32("graphics/event_objects/pics/people/norman/5.4bpp");
+const u32 gEventObjectPic_Norman_6[] = INCBIN_U32("graphics/event_objects/pics/people/norman/6.4bpp");
+const u32 gEventObjectPic_Norman_7[] = INCBIN_U32("graphics/event_objects/pics/people/norman/7.4bpp");
+const u32 gEventObjectPic_Norman_8[] = INCBIN_U32("graphics/event_objects/pics/people/norman/8.4bpp");
+const u32 gEventObjectPic_Winona_0[] = INCBIN_U32("graphics/event_objects/pics/people/winona/0.4bpp");
+const u32 gEventObjectPic_Winona_1[] = INCBIN_U32("graphics/event_objects/pics/people/winona/1.4bpp");
+const u32 gEventObjectPic_Winona_2[] = INCBIN_U32("graphics/event_objects/pics/people/winona/2.4bpp");
+const u32 gEventObjectPic_Liza_0[] = INCBIN_U32("graphics/event_objects/pics/people/liza/0.4bpp");
+const u32 gEventObjectPic_Liza_1[] = INCBIN_U32("graphics/event_objects/pics/people/liza/1.4bpp");
+const u32 gEventObjectPic_Liza_2[] = INCBIN_U32("graphics/event_objects/pics/people/liza/2.4bpp");
+const u32 gEventObjectPic_Tate_0[] = INCBIN_U32("graphics/event_objects/pics/people/tate/0.4bpp");
+const u32 gEventObjectPic_Tate_1[] = INCBIN_U32("graphics/event_objects/pics/people/tate/1.4bpp");
+const u32 gEventObjectPic_Tate_2[] = INCBIN_U32("graphics/event_objects/pics/people/tate/2.4bpp");
+const u32 gEventObjectPic_Wallace_0[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/0.4bpp");
+const u32 gEventObjectPic_Wallace_1[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/1.4bpp");
+const u32 gEventObjectPic_Wallace_2[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/2.4bpp");
+const u32 gEventObjectPic_Wallace_3[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/3.4bpp");
+const u32 gEventObjectPic_Wallace_4[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/4.4bpp");
+const u32 gEventObjectPic_Wallace_5[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/5.4bpp");
+const u32 gEventObjectPic_Wallace_6[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/6.4bpp");
+const u32 gEventObjectPic_Wallace_7[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/7.4bpp");
+const u32 gEventObjectPic_Wallace_8[] = INCBIN_U32("graphics/event_objects/pics/people/wallace/8.4bpp");
+const u32 gEventObjectPic_Steven_0[] = INCBIN_U32("graphics/event_objects/pics/people/steven/0.4bpp");
+const u32 gEventObjectPic_Steven_1[] = INCBIN_U32("graphics/event_objects/pics/people/steven/1.4bpp");
+const u32 gEventObjectPic_Steven_2[] = INCBIN_U32("graphics/event_objects/pics/people/steven/2.4bpp");
+const u32 gEventObjectPic_Steven_3[] = INCBIN_U32("graphics/event_objects/pics/people/steven/3.4bpp");
+const u32 gEventObjectPic_Steven_4[] = INCBIN_U32("graphics/event_objects/pics/people/steven/4.4bpp");
+const u32 gEventObjectPic_Steven_5[] = INCBIN_U32("graphics/event_objects/pics/people/steven/5.4bpp");
+const u32 gEventObjectPic_Steven_6[] = INCBIN_U32("graphics/event_objects/pics/people/steven/6.4bpp");
+const u32 gEventObjectPic_Steven_7[] = INCBIN_U32("graphics/event_objects/pics/people/steven/7.4bpp");
+const u32 gEventObjectPic_Steven_8[] = INCBIN_U32("graphics/event_objects/pics/people/steven/8.4bpp");
+const u32 gEventObjectPic_Wally_0[] = INCBIN_U32("graphics/event_objects/pics/people/wally/0.4bpp");
+const u32 gEventObjectPic_Wally_1[] = INCBIN_U32("graphics/event_objects/pics/people/wally/1.4bpp");
+const u32 gEventObjectPic_Wally_2[] = INCBIN_U32("graphics/event_objects/pics/people/wally/2.4bpp");
+const u32 gEventObjectPic_Wally_3[] = INCBIN_U32("graphics/event_objects/pics/people/wally/3.4bpp");
+const u32 gEventObjectPic_Wally_4[] = INCBIN_U32("graphics/event_objects/pics/people/wally/4.4bpp");
+const u32 gEventObjectPic_Wally_5[] = INCBIN_U32("graphics/event_objects/pics/people/wally/5.4bpp");
+const u32 gEventObjectPic_Wally_6[] = INCBIN_U32("graphics/event_objects/pics/people/wally/6.4bpp");
+const u32 gEventObjectPic_Wally_7[] = INCBIN_U32("graphics/event_objects/pics/people/wally/7.4bpp");
+const u32 gEventObjectPic_Wally_8[] = INCBIN_U32("graphics/event_objects/pics/people/wally/8.4bpp");
+const u32 gEventObjectPic_LittleBoy3_0[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/0.4bpp");
+const u32 gEventObjectPic_LittleBoy3_1[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/1.4bpp");
+const u32 gEventObjectPic_LittleBoy3_2[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/2.4bpp");
+const u32 gEventObjectPic_LittleBoy3_3[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/3.4bpp");
+const u32 gEventObjectPic_LittleBoy3_4[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/4.4bpp");
+const u32 gEventObjectPic_LittleBoy3_5[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/5.4bpp");
+const u32 gEventObjectPic_LittleBoy3_6[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/6.4bpp");
+const u32 gEventObjectPic_LittleBoy3_7[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/7.4bpp");
+const u32 gEventObjectPic_LittleBoy3_8[] = INCBIN_U32("graphics/event_objects/pics/people/little_boy_3/8.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/0.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/1.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/2.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/3.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/4.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/5.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/6.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/7.4bpp");
+const u32 gEventObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/event_objects/pics/people/hot_springs_old_woman/8.4bpp");
+const u32 gEventObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/0.4bpp");
+const u32 gEventObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/1.4bpp");
+const u32 gEventObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/latias_latios/2.4bpp");
+const u32 gEventObjectPic_Boy5_0[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/0.4bpp");
+const u32 gEventObjectPic_Boy5_1[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/1.4bpp");
+const u32 gEventObjectPic_Boy5_2[] = INCBIN_U32("graphics/event_objects/pics/people/boy_5/2.4bpp");
+const u32 gEventObjectPic_ContestJudge_0[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/0.4bpp");
+const u32 gEventObjectPic_ContestJudge_1[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/1.4bpp");
+const u32 gEventObjectPic_ContestJudge_2[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/2.4bpp");
+const u32 gEventObjectPic_ContestJudge_3[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/3.4bpp");
+const u32 gEventObjectPic_ContestJudge_4[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/4.4bpp");
+const u32 gEventObjectPic_ContestJudge_5[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/5.4bpp");
+const u32 gEventObjectPic_ContestJudge_6[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/6.4bpp");
+const u32 gEventObjectPic_ContestJudge_7[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/7.4bpp");
+const u32 gEventObjectPic_ContestJudge_8[] = INCBIN_U32("graphics/event_objects/pics/people/contest_judge/8.4bpp");
+const u32 gEventObjectPic_Archie_0[] = INCBIN_U32("graphics/event_objects/pics/people/archie/0.4bpp");
+const u32 gEventObjectPic_Archie_1[] = INCBIN_U32("graphics/event_objects/pics/people/archie/1.4bpp");
+const u32 gEventObjectPic_Archie_2[] = INCBIN_U32("graphics/event_objects/pics/people/archie/2.4bpp");
+const u32 gEventObjectPic_Archie_3[] = INCBIN_U32("graphics/event_objects/pics/people/archie/3.4bpp");
+const u32 gEventObjectPic_Archie_4[] = INCBIN_U32("graphics/event_objects/pics/people/archie/4.4bpp");
+const u32 gEventObjectPic_Archie_5[] = INCBIN_U32("graphics/event_objects/pics/people/archie/5.4bpp");
+const u32 gEventObjectPic_Archie_6[] = INCBIN_U32("graphics/event_objects/pics/people/archie/6.4bpp");
+const u32 gEventObjectPic_Archie_7[] = INCBIN_U32("graphics/event_objects/pics/people/archie/7.4bpp");
+const u32 gEventObjectPic_Archie_8[] = INCBIN_U32("graphics/event_objects/pics/people/archie/8.4bpp");
+const u32 gEventObjectPic_Maxie_0[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/0.4bpp");
+const u32 gEventObjectPic_Maxie_1[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/1.4bpp");
+const u32 gEventObjectPic_Maxie_2[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/2.4bpp");
+const u32 gEventObjectPic_Maxie_3[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/3.4bpp");
+const u32 gEventObjectPic_Maxie_4[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/4.4bpp");
+const u32 gEventObjectPic_Maxie_5[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/5.4bpp");
+const u32 gEventObjectPic_Maxie_6[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/6.4bpp");
+const u32 gEventObjectPic_Maxie_7[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/7.4bpp");
+const u32 gEventObjectPic_Maxie_8[] = INCBIN_U32("graphics/event_objects/pics/people/maxie/8.4bpp");
+const u32 gEventObjectPic_Kyogre_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/0.4bpp");
+const u32 gEventObjectPic_Kyogre_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kyogre/1.4bpp");
+const u32 gEventObjectPic_Groudon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/0.4bpp");
+const u32 gEventObjectPic_Groudon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/groudon/1.4bpp");
+const u32 gEventObjectPic_Regi[] = INCBIN_U32("graphics/event_objects/pics/pokemon/regi.4bpp");
+const u32 gEventObjectPic_Skitty_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/0.4bpp");
+const u32 gEventObjectPic_Skitty_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/1.4bpp");
+const u32 gEventObjectPic_Skitty_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/skitty/2.4bpp");
+const u32 gEventObjectPic_Kecleon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/0.4bpp");
+const u32 gEventObjectPic_Kecleon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/1.4bpp");
+const u32 gEventObjectPic_Kecleon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/kecleon/2.4bpp");
+const u32 gEventObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/0.4bpp");
+const u32 gEventObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/rayquaza/1.4bpp");
+const u32 gEventObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/0.4bpp");
+const u32 gEventObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/1.4bpp");
+const u32 gEventObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/zigzagoon/2.4bpp");
+const u32 gEventObjectPic_Pikachu_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/0.4bpp");
+const u32 gEventObjectPic_Pikachu_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/1.4bpp");
+const u32 gEventObjectPic_Pikachu_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/pikachu/2.4bpp");
+const u32 gEventObjectPic_Azumarill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/0.4bpp");
+const u32 gEventObjectPic_Azumarill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/1.4bpp");
+const u32 gEventObjectPic_Azumarill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azumarill/2.4bpp");
+const u32 gEventObjectPic_Wingull_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/0.4bpp");
+const u32 gEventObjectPic_Wingull_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/3.4bpp");
+const u32 gEventObjectPic_Wingull_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/1.4bpp");
+const u32 gEventObjectPic_Wingull_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/4.4bpp");
+const u32 gEventObjectPic_Wingull_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/2.4bpp");
+const u32 gEventObjectPic_Wingull_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/wingull/5.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/0.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/1.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/2.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/3.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/4.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/5.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/6.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/7.4bpp");
+const u32 gEventObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/event_objects/pics/people/tuber_m_swimming/8.4bpp");
+const u32 gEventObjectPic_Azurill_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/0.4bpp");
+const u32 gEventObjectPic_Azurill_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/1.4bpp");
+const u32 gEventObjectPic_Azurill_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/azurill/2.4bpp");
+const u32 gEventObjectPic_Mom_0[] = INCBIN_U32("graphics/event_objects/pics/people/mom/0.4bpp");
+const u32 gEventObjectPic_Mom_1[] = INCBIN_U32("graphics/event_objects/pics/people/mom/1.4bpp");
+const u32 gEventObjectPic_Mom_2[] = INCBIN_U32("graphics/event_objects/pics/people/mom/2.4bpp");
+const u32 gEventObjectPic_Mom_3[] = INCBIN_U32("graphics/event_objects/pics/people/mom/3.4bpp");
+const u32 gEventObjectPic_Mom_4[] = INCBIN_U32("graphics/event_objects/pics/people/mom/4.4bpp");
+const u32 gEventObjectPic_Mom_5[] = INCBIN_U32("graphics/event_objects/pics/people/mom/5.4bpp");
+const u32 gEventObjectPic_Mom_6[] = INCBIN_U32("graphics/event_objects/pics/people/mom/6.4bpp");
+const u32 gEventObjectPic_Mom_7[] = INCBIN_U32("graphics/event_objects/pics/people/mom/7.4bpp");
+const u32 gEventObjectPic_Mom_8[] = INCBIN_U32("graphics/event_objects/pics/people/mom/8.4bpp");
+const u16 gEventObjectPalette22[] = INCBIN_U16("graphics/event_objects/palettes/22.gbapal");
+const u16 gEventObjectPalette23[] = INCBIN_U16("graphics/event_objects/palettes/23.gbapal");
+const u16 gEventObjectPalette24[] = INCBIN_U16("graphics/event_objects/palettes/24.gbapal");
+const u16 gEventObjectPalette25[] = INCBIN_U16("graphics/event_objects/palettes/25.gbapal");
+const u32 gEventObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_natu_doll.4bpp");
+const u32 gEventObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_magnemite_doll.4bpp");
+const u32 gEventObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_squirtle_doll.4bpp");
+const u32 gEventObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_wooper_doll.4bpp");
+const u32 gEventObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_pikachu_doll.4bpp");
+const u32 gEventObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/event_objects/pics/dolls/unused_porygon2_doll.4bpp");
+const u32 gEventObjectPic_PichuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pichu_doll.4bpp");
+const u32 gEventObjectPic_PikachuDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/pikachu_doll.4bpp");
+const u32 gEventObjectPic_MarillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/marill_doll.4bpp");
+const u32 gEventObjectPic_TogepiDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/togepi_doll.4bpp");
+const u32 gEventObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/cyndaquil_doll.4bpp");
+const u32 gEventObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/chikorita_doll.4bpp");
+const u32 gEventObjectPic_TotodileDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/totodile_doll.4bpp");
+const u32 gEventObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/jigglypuff_doll.4bpp");
+const u32 gEventObjectPic_MeowthDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/meowth_doll.4bpp");
+const u32 gEventObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/clefairy_doll.4bpp");
+const u32 gEventObjectPic_DittoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/ditto_doll.4bpp");
+const u32 gEventObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/smoochum_doll.4bpp");
+const u32 gEventObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/treecko_doll.4bpp");
+const u32 gEventObjectPic_TorchicDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/torchic_doll.4bpp");
+const u32 gEventObjectPic_MudkipDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/mudkip_doll.4bpp");
+const u32 gEventObjectPic_DuskullDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/duskull_doll.4bpp");
+const u32 gEventObjectPic_WynautDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/wynaut_doll.4bpp");
+const u32 gEventObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/baltoy_doll.4bpp");
+const u32 gEventObjectPic_KecleonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/kecleon_doll.4bpp");
+const u32 gEventObjectPic_AzurillDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/azurill_doll.4bpp");
+const u32 gEventObjectPic_SkittyDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/skitty_doll.4bpp");
+const u32 gEventObjectPic_SwabluDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/swablu_doll.4bpp");
+const u32 gEventObjectPic_GulpinDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/gulpin_doll.4bpp");
+const u32 gEventObjectPic_LotadDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/lotad_doll.4bpp");
+const u32 gEventObjectPic_SeedotDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/seedot_doll.4bpp");
+const u32 gEventObjectPic_PikaCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/pika_cushion.4bpp");
+const u32 gEventObjectPic_RoundCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/round_cushion.4bpp");
+const u32 gEventObjectPic_KissCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/kiss_cushion.4bpp");
+const u32 gEventObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/zigzag_cushion.4bpp");
+const u32 gEventObjectPic_SpinCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/spin_cushion.4bpp");
+const u32 gEventObjectPic_DiamondCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/diamond_cushion.4bpp");
+const u32 gEventObjectPic_BallCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/ball_cushion.4bpp");
+const u32 gEventObjectPic_GrassCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/grass_cushion.4bpp");
+const u32 gEventObjectPic_FireCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/fire_cushion.4bpp");
+const u32 gEventObjectPic_WaterCushion[] = INCBIN_U32("graphics/event_objects/pics/cushions/water_cushion.4bpp");
+const u32 gEventObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_snorlax_doll.4bpp");
+const u32 gEventObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_rhydon_doll.4bpp");
+const u32 gEventObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_lapras_doll.4bpp");
+const u32 gEventObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_venusaur_doll.4bpp");
+const u32 gEventObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_charizard_doll.4bpp");
+const u32 gEventObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_blastoise_doll.4bpp");
+const u32 gEventObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_wailmer_doll.4bpp");
+const u32 gEventObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regirock_doll.4bpp");
+const u32 gEventObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_regice_doll.4bpp");
+const u32 gEventObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/event_objects/pics/dolls/big_registeel_doll.4bpp");
+const u32 gEventObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/0.4bpp");
+const u32 gEventObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/1.4bpp");
+const u32 gEventObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/2.4bpp");
+const u32 gEventObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/event_objects/pics/misc/cuttable_tree/3.4bpp");
+const u32 gEventObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/0.4bpp");
+const u32 gEventObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/1.4bpp");
+const u32 gEventObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/2.4bpp");
+const u32 gEventObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/event_objects/pics/misc/breakable_rock/3.4bpp");
+const u32 gEventObjectPic_PushableBoulder[] = INCBIN_U32("graphics/event_objects/pics/misc/pushable_boulder.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/0.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/1.4bpp");
+const u32 gEventObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/event_objects/pics/misc/mr_brineys_boat/2.4bpp");
+const u32 gEventObjectPic_Fossil[] = INCBIN_U32("graphics/event_objects/pics/misc/fossil.4bpp");
+const u32 gEventObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/event_objects/pics/misc/submarine_shadow.4bpp");
+const u16 gEventObjectPalette26[] = INCBIN_U16("graphics/event_objects/palettes/26.gbapal");
+const u32 gEventObjectPic_Truck[] = INCBIN_U32("graphics/event_objects/pics/misc/truck.4bpp");
+const u16 gEventObjectPalette14[] = INCBIN_U16("graphics/event_objects/palettes/14.gbapal");
+const u32 gEventObjectPic_MachokeCarryingBox_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/0.4bpp");
+const u32 gEventObjectPic_MachokeCarryingBox_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/1.4bpp");
+const u32 gEventObjectPic_MachokeCarryingBox_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_carrying_box/2.4bpp");
+const u32 gEventObjectPic_MachokeFacingAway_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/0.4bpp");
+const u32 gEventObjectPic_MachokeFacingAway_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/machoke_facing_away/1.4bpp");
+const u16 gEventObjectPalette15[] = INCBIN_U16("graphics/event_objects/palettes/15.gbapal");
+const u32 gEventObjectPic_BirchsBag[] = INCBIN_U32("graphics/event_objects/pics/misc/birchs_bag.4bpp");
+const u32 gEventObjectPic_Poochyena_0[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/0.4bpp");
+const u32 gEventObjectPic_Poochyena_1[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/1.4bpp");
+const u32 gEventObjectPic_Poochyena_2[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/2.4bpp");
+const u32 gEventObjectPic_Poochyena_3[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/3.4bpp");
+const u32 gEventObjectPic_Poochyena_4[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/4.4bpp");
+const u32 gEventObjectPic_Poochyena_5[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/5.4bpp");
+const u32 gEventObjectPic_Poochyena_6[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/6.4bpp");
+const u32 gEventObjectPic_Poochyena_7[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/7.4bpp");
+const u32 gEventObjectPic_Poochyena_8[] = INCBIN_U32("graphics/event_objects/pics/pokemon/poochyena/8.4bpp");
+const u16 gEventObjectPalette16[] = INCBIN_U16("graphics/event_objects/palettes/16.gbapal");
+const u32 gEventObjectPic_CableCar[] = INCBIN_U32("graphics/event_objects/pics/misc/cable_car.4bpp");
+const u16 gEventObjectPalette20[] = INCBIN_U16("graphics/event_objects/palettes/20.gbapal");
+const u32 gEventObjectPic_SSTidal[] = INCBIN_U32("graphics/event_objects/pics/misc/ss_tidal.4bpp");
+const u16 gEventObjectPalette21[] = INCBIN_U16("graphics/event_objects/palettes/21.gbapal");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.4bpp");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.4bpp");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.4bpp");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.4bpp");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.4bpp");
+const u32 gFieldEffectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.4bpp");
+const u32 gEventObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/dirt_pile.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/0.4bpp");
+const u32 gEventObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sprout/1.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/0.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/1.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/2.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/3.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/4.4bpp");
+const u32 gEventObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pecha/5.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/0.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/1.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/2.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/3.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/4.4bpp");
+const u32 gEventObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/kelpsy/5.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/0.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/1.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/2.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/3.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/4.4bpp");
+const u32 gEventObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wepear/5.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/0.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/1.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/2.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/3.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/4.4bpp");
+const u32 gEventObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/iapapa/5.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/0.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/1.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/2.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/3.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/4.4bpp");
+const u32 gEventObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cheri/5.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/0.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/1.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/2.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/3.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/4.4bpp");
+const u32 gEventObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/figy/5.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/0.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/1.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/2.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/3.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/4.4bpp");
+const u32 gEventObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/mago/5.4bpp");
+const u32 gEventObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/0.4bpp");
+const u32 gEventObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/1.4bpp");
+const u32 gEventObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/2.4bpp");
+const u32 gEventObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/3.4bpp");
+const u32 gEventObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/4.4bpp");
+const u32 gEventObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lum/5.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/0.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/1.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/2.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/3.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/4.4bpp");
+const u32 gEventObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/razz/5.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/0.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/1.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/2.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/3.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/4.4bpp");
+const u32 gEventObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/grepa/5.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/0.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/1.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/2.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/3.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/4.4bpp");
+const u32 gEventObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rabuta/5.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/0.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/1.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/2.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/3.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/4.4bpp");
+const u32 gEventObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/nomel/5.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/0.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/1.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/2.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/3.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/4.4bpp");
+const u32 gEventObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/leppa/5.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/0.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/1.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/2.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/3.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/4.4bpp");
+const u32 gEventObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/liechi/5.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/0.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/1.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/2.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/3.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/4.4bpp");
+const u32 gEventObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/hondew/5.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/0.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/1.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/2.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/3.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/4.4bpp");
+const u32 gEventObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aguav/5.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/0.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/1.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/2.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/3.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/4.4bpp");
+const u32 gEventObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/wiki/5.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/0.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/1.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/2.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/3.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/4.4bpp");
+const u32 gEventObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pomeg/5.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/0.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/1.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/2.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/3.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/4.4bpp");
+const u32 gEventObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/rawst/5.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/0.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/1.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/2.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/3.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/4.4bpp");
+const u32 gEventObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/spelon/5.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/0.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/1.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/2.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/3.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/4.4bpp");
+const u32 gEventObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/chesto/5.4bpp");
+const u32 gEventObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/0.4bpp");
+const u32 gEventObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/1.4bpp");
+const u32 gEventObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/2.4bpp");
+const u32 gEventObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/3.4bpp");
+const u32 gEventObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/4.4bpp");
+const u32 gEventObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/oran/5.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/0.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/1.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/2.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/3.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/4.4bpp");
+const u32 gEventObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/persim/5.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/0.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/1.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/2.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/3.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/4.4bpp");
+const u32 gEventObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/sitrus/5.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/0.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/1.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/2.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/3.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/4.4bpp");
+const u32 gEventObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/aspear/5.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/0.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/1.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/2.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/3.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/4.4bpp");
+const u32 gEventObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/pamtre/5.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/0.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/1.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/2.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/3.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/4.4bpp");
+const u32 gEventObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/cornn/5.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/0.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/1.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/2.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/3.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/4.4bpp");
+const u32 gEventObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/lansat/5.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/0.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/1.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/2.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/3.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/4.4bpp");
+const u32 gEventObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/durin/5.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/0.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/1.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/2.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/3.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/4.4bpp");
+const u32 gEventObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/event_objects/pics/berry_trees/tamato/5.4bpp");
+const u32 gFieldEffectPic_SurfBlob_0[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/0.4bpp");
+const u32 gFieldEffectPic_SurfBlob_1[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/1.4bpp");
+const u32 gFieldEffectPic_SurfBlob_2[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/2.4bpp");
+const u32 gEventObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/0.4bpp");
+const u32 gEventObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/1.4bpp");
+const u32 gEventObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/2.4bpp");
+const u32 gEventObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/3.4bpp");
+const u32 gEventObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/4.4bpp");
+const u32 gEventObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/5.4bpp");
+const u32 gEventObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/event_objects/pics/people/quinty_plump/6.4bpp");
+const u16 gEventObjectPalette12[] = INCBIN_U16("graphics/event_objects/palettes/12.gbapal");
+const u16 gEventObjectPalette13[] = INCBIN_U16("graphics/event_objects/palettes/13.gbapal");
+
+#endif //POKERUBY_EVENT_OBJECT_GFX_H
diff --git a/src/data/field_event_obj/event_object_graphics_info.h b/src/data/field_event_obj/event_object_graphics_info.h
new file mode 100644
index 000000000..88085980b
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics_info.h
@@ -0,0 +1,227 @@
+//
+
+//
+
+#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H
+#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H
+
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_QuintyPlump, gEventObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cook, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman6, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Camper, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man4, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maniac, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HexManiac, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Woman8, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Beauty, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Lass, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Gentleman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sailor, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Fisherman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Hiker, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Nurse, gEventObjectPicTable_Nurse, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ItemBall, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BerryTree, gEventObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man6, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_CuttableTree, gEventObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Teala, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_BreakableRock, gEventObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_Truck, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Truck, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Poochyena, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Artist, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_AcroBike, gEventObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Surfing, gEventObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_FieldMove, gEventObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Cameraman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gEventObjectSubspriteTables_CableCar, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Man7, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Sidney, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Phoebe, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Glacia, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Drake, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Roxanne, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Brawly, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wattson, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Flannery, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Norman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Winona, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Liza, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Tate, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wallace, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Steven, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wally, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LittleBoy3, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Fishing, gEventObjectPicTable_MayFishing, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SSTidal, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SSTidal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gEventObjectSubspriteTables_SubmarineShadow, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_KissCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BallCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_FireCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Boy5, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Archie, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Maxie, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Inanimate, gEventObjectPicTable_Fossil, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Skitty, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kyogre, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Groudon, gEventObjectRotScalAnimTable_KyogreGroudon};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gEventObjectSubspriteTables_32x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Pikachu, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azumarill, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Wingull, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gEventObjectSubspriteTables_16x16, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Azurill, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_Standard, gEventObjectPicTable_Mom, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gEventObjectSubspriteTables_16x32, gEventObjectImageAnimTable_BrendanMayNormal, gEventObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
+
+#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_H
diff --git a/src/data/field_event_obj/event_object_graphics_info_pointers.h b/src/data/field_event_obj/event_object_graphics_info_pointers.h
new file mode 100644
index 000000000..87b7c85a6
--- /dev/null
+++ b/src/data/field_event_obj/event_object_graphics_info_pointers.h
@@ -0,0 +1,448 @@
+//
+
+//
+
+#ifndef POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
+#define POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
+
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanSurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_QuintyPlump;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleGirl2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Girl3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FatMan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cook;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman6;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldMan2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_OldWoman2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Camper;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Picnicker;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man4;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Youngster;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BugCatcher;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PsychicM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SchoolKidM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maniac;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HexManiac;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Woman8;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwimmerF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BlackBelt;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Beauty;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Lass;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Gentleman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sailor;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fisherman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RunningTriathleteF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hiker;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyclingTriathleteF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Nurse;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ItemBall;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTree;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeEarlyStages;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BerryTreeLateStages;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ProfBirch;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man6;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ReporterF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Bard;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Hipster;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Trader;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Storyteller;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Giddy;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMauvilleOldMan2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedNatuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedMagnemiteDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedSquirtleDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedWooperDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPikachuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_UnusedPorygon2Doll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CuttableTree;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MartEmployee;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RooftopSaleWoman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Teala;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BreakableRock;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PushableBoulder;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MrBrineysBoat;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MaySurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Truck;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeCarryingBox;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MachokeFacingAway;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BirchsBag;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Poochyena;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Artist;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanSurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalBrendanFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayNormal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayMachBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayAcroBike;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMaySurfing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RivalMayFieldMove;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Cameraman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanUnderwater;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayUnderwater;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MovingBox;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CableCar;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Scientist2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Man7;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AquaMemberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberM;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MagmaMemberF;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Sidney;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Phoebe;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Glacia;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Drake;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Roxanne;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Brawly;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wattson;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Flannery;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Norman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Winona;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Liza;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Tate;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wallace;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Steven;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wally;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LittleBoy3;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanFishing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayFishing;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_HotSpringsOldWoman;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SSTidal;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SubmarineShadow;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PichuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikachuDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MarillDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TogepiDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_CyndaquilDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ChikoritaDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TotodileDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_JigglypuffDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MeowthDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ClefairyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DittoDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SmoochumDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TreeckoDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TorchicDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MudkipDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DuskullDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WynautDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BaltoyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KecleonDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_AzurillDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SkittyDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SwabluDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GulpinDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LotadDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SeedotDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_PikaCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_RoundCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_KissCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ZigzagCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_SpinCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_DiamondCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BallCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_GrassCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_FireCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_WaterCushion;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigSnorlaxDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRhydonDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigLaprasDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigVenusaurDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigCharizardDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigBlastoiseDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigWailmerDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegirockDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegiceDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BigRegisteelDoll;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latias;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Latios;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Boy5;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_ContestJudge;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanWatering;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayWatering;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_BrendanDecorating;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_MayDecorating;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Archie;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Maxie;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Fossil;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regirock;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Regice;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Registeel;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Skitty;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon1;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kyogre2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Groudon2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Rayquaza;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Zigzagoon;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Pikachu;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azumarill;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Wingull;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Kecleon2;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_TuberMSwimming;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Azurill;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_Mom;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkBrendan;
+const struct EventObjectGraphicsInfo gEventObjectGraphicsInfo_LinkMay;
+
+const struct EventObjectGraphicsInfo *const gEventObjectGraphicsInfoPointers[] = {
+    &gEventObjectGraphicsInfo_BrendanNormal,
+    &gEventObjectGraphicsInfo_BrendanMachBike,
+    &gEventObjectGraphicsInfo_BrendanSurfing,
+    &gEventObjectGraphicsInfo_BrendanFieldMove,
+    &gEventObjectGraphicsInfo_QuintyPlump,
+    &gEventObjectGraphicsInfo_LittleBoy1,
+    &gEventObjectGraphicsInfo_LittleGirl1,
+    &gEventObjectGraphicsInfo_Boy1,
+    &gEventObjectGraphicsInfo_Girl1,
+    &gEventObjectGraphicsInfo_Boy2,
+    &gEventObjectGraphicsInfo_Girl2,
+    &gEventObjectGraphicsInfo_LittleBoy2,
+    &gEventObjectGraphicsInfo_LittleGirl2,
+    &gEventObjectGraphicsInfo_Boy3,
+    &gEventObjectGraphicsInfo_Girl3,
+    &gEventObjectGraphicsInfo_Boy4,
+    &gEventObjectGraphicsInfo_Woman1,
+    &gEventObjectGraphicsInfo_FatMan,
+    &gEventObjectGraphicsInfo_Woman2,
+    &gEventObjectGraphicsInfo_Man1,
+    &gEventObjectGraphicsInfo_Woman3,
+    &gEventObjectGraphicsInfo_OldMan1,
+    &gEventObjectGraphicsInfo_OldWoman1,
+    &gEventObjectGraphicsInfo_Man2,
+    &gEventObjectGraphicsInfo_Woman4,
+    &gEventObjectGraphicsInfo_Man3,
+    &gEventObjectGraphicsInfo_Woman5,
+    &gEventObjectGraphicsInfo_Cook,
+    &gEventObjectGraphicsInfo_Woman6,
+    &gEventObjectGraphicsInfo_OldMan2,
+    &gEventObjectGraphicsInfo_OldWoman2,
+    &gEventObjectGraphicsInfo_Camper,
+    &gEventObjectGraphicsInfo_Picnicker,
+    &gEventObjectGraphicsInfo_Man4,
+    &gEventObjectGraphicsInfo_Woman7,
+    &gEventObjectGraphicsInfo_Youngster,
+    &gEventObjectGraphicsInfo_BugCatcher,
+    &gEventObjectGraphicsInfo_PsychicM,
+    &gEventObjectGraphicsInfo_SchoolKidM,
+    &gEventObjectGraphicsInfo_Maniac,
+    &gEventObjectGraphicsInfo_HexManiac,
+    &gEventObjectGraphicsInfo_Woman8,
+    &gEventObjectGraphicsInfo_SwimmerM,
+    &gEventObjectGraphicsInfo_SwimmerF,
+    &gEventObjectGraphicsInfo_BlackBelt,
+    &gEventObjectGraphicsInfo_Beauty,
+    &gEventObjectGraphicsInfo_Scientist1,
+    &gEventObjectGraphicsInfo_Lass,
+    &gEventObjectGraphicsInfo_Gentleman,
+    &gEventObjectGraphicsInfo_Sailor,
+    &gEventObjectGraphicsInfo_Fisherman,
+    &gEventObjectGraphicsInfo_RunningTriathleteM,
+    &gEventObjectGraphicsInfo_RunningTriathleteF,
+    &gEventObjectGraphicsInfo_TuberF,
+    &gEventObjectGraphicsInfo_TuberM,
+    &gEventObjectGraphicsInfo_Hiker,
+    &gEventObjectGraphicsInfo_CyclingTriathleteM,
+    &gEventObjectGraphicsInfo_CyclingTriathleteF,
+    &gEventObjectGraphicsInfo_Nurse,
+    &gEventObjectGraphicsInfo_ItemBall,
+    &gEventObjectGraphicsInfo_BerryTree,
+    &gEventObjectGraphicsInfo_BerryTreeEarlyStages,
+    &gEventObjectGraphicsInfo_BerryTreeLateStages,
+    &gEventObjectGraphicsInfo_BrendanAcroBike,
+    &gEventObjectGraphicsInfo_ProfBirch,
+    &gEventObjectGraphicsInfo_Man5,
+    &gEventObjectGraphicsInfo_Man6,
+    &gEventObjectGraphicsInfo_ReporterM,
+    &gEventObjectGraphicsInfo_ReporterF,
+    &gEventObjectGraphicsInfo_Bard,
+    &gEventObjectGraphicsInfo_Hipster,
+    &gEventObjectGraphicsInfo_Trader,
+    &gEventObjectGraphicsInfo_Storyteller,
+    &gEventObjectGraphicsInfo_Giddy,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan1,
+    &gEventObjectGraphicsInfo_UnusedMauvilleOldMan2,
+    &gEventObjectGraphicsInfo_UnusedNatuDoll,
+    &gEventObjectGraphicsInfo_UnusedMagnemiteDoll,
+    &gEventObjectGraphicsInfo_UnusedSquirtleDoll,
+    &gEventObjectGraphicsInfo_UnusedWooperDoll,
+    &gEventObjectGraphicsInfo_UnusedPikachuDoll,
+    &gEventObjectGraphicsInfo_UnusedPorygon2Doll,
+    &gEventObjectGraphicsInfo_CuttableTree,
+    &gEventObjectGraphicsInfo_MartEmployee,
+    &gEventObjectGraphicsInfo_RooftopSaleWoman,
+    &gEventObjectGraphicsInfo_Teala,
+    &gEventObjectGraphicsInfo_BreakableRock,
+    &gEventObjectGraphicsInfo_PushableBoulder,
+    &gEventObjectGraphicsInfo_MrBrineysBoat,
+    &gEventObjectGraphicsInfo_MayNormal,
+    &gEventObjectGraphicsInfo_MayMachBike,
+    &gEventObjectGraphicsInfo_MayAcroBike,
+    &gEventObjectGraphicsInfo_MaySurfing,
+    &gEventObjectGraphicsInfo_MayFieldMove,
+    &gEventObjectGraphicsInfo_Truck,
+    &gEventObjectGraphicsInfo_MachokeCarryingBox,
+    &gEventObjectGraphicsInfo_MachokeFacingAway,
+    &gEventObjectGraphicsInfo_BirchsBag,
+    &gEventObjectGraphicsInfo_Poochyena,
+    &gEventObjectGraphicsInfo_Artist,
+    &gEventObjectGraphicsInfo_RivalBrendanNormal,
+    &gEventObjectGraphicsInfo_RivalBrendanMachBike,
+    &gEventObjectGraphicsInfo_RivalBrendanAcroBike,
+    &gEventObjectGraphicsInfo_RivalBrendanSurfing,
+    &gEventObjectGraphicsInfo_RivalBrendanFieldMove,
+    &gEventObjectGraphicsInfo_RivalMayNormal,
+    &gEventObjectGraphicsInfo_RivalMayMachBike,
+    &gEventObjectGraphicsInfo_RivalMayAcroBike,
+    &gEventObjectGraphicsInfo_RivalMaySurfing,
+    &gEventObjectGraphicsInfo_RivalMayFieldMove,
+    &gEventObjectGraphicsInfo_Cameraman,
+    &gEventObjectGraphicsInfo_BrendanUnderwater,
+    &gEventObjectGraphicsInfo_MayUnderwater,
+    &gEventObjectGraphicsInfo_MovingBox,
+    &gEventObjectGraphicsInfo_CableCar,
+    &gEventObjectGraphicsInfo_Scientist2,
+    &gEventObjectGraphicsInfo_Man7,
+    &gEventObjectGraphicsInfo_AquaMemberM,
+    &gEventObjectGraphicsInfo_AquaMemberF,
+    &gEventObjectGraphicsInfo_MagmaMemberM,
+    &gEventObjectGraphicsInfo_MagmaMemberF,
+    &gEventObjectGraphicsInfo_Sidney,
+    &gEventObjectGraphicsInfo_Phoebe,
+    &gEventObjectGraphicsInfo_Glacia,
+    &gEventObjectGraphicsInfo_Drake,
+    &gEventObjectGraphicsInfo_Roxanne,
+    &gEventObjectGraphicsInfo_Brawly,
+    &gEventObjectGraphicsInfo_Wattson,
+    &gEventObjectGraphicsInfo_Flannery,
+    &gEventObjectGraphicsInfo_Norman,
+    &gEventObjectGraphicsInfo_Winona,
+    &gEventObjectGraphicsInfo_Liza,
+    &gEventObjectGraphicsInfo_Tate,
+    &gEventObjectGraphicsInfo_Wallace,
+    &gEventObjectGraphicsInfo_Steven,
+    &gEventObjectGraphicsInfo_Wally,
+    &gEventObjectGraphicsInfo_LittleBoy3,
+    &gEventObjectGraphicsInfo_BrendanFishing,
+    &gEventObjectGraphicsInfo_MayFishing,
+    &gEventObjectGraphicsInfo_HotSpringsOldWoman,
+    &gEventObjectGraphicsInfo_SSTidal,
+    &gEventObjectGraphicsInfo_SubmarineShadow,
+    &gEventObjectGraphicsInfo_PichuDoll,
+    &gEventObjectGraphicsInfo_PikachuDoll,
+    &gEventObjectGraphicsInfo_MarillDoll,
+    &gEventObjectGraphicsInfo_TogepiDoll,
+    &gEventObjectGraphicsInfo_CyndaquilDoll,
+    &gEventObjectGraphicsInfo_ChikoritaDoll,
+    &gEventObjectGraphicsInfo_TotodileDoll,
+    &gEventObjectGraphicsInfo_JigglypuffDoll,
+    &gEventObjectGraphicsInfo_MeowthDoll,
+    &gEventObjectGraphicsInfo_ClefairyDoll,
+    &gEventObjectGraphicsInfo_DittoDoll,
+    &gEventObjectGraphicsInfo_SmoochumDoll,
+    &gEventObjectGraphicsInfo_TreeckoDoll,
+    &gEventObjectGraphicsInfo_TorchicDoll,
+    &gEventObjectGraphicsInfo_MudkipDoll,
+    &gEventObjectGraphicsInfo_DuskullDoll,
+    &gEventObjectGraphicsInfo_WynautDoll,
+    &gEventObjectGraphicsInfo_BaltoyDoll,
+    &gEventObjectGraphicsInfo_KecleonDoll,
+    &gEventObjectGraphicsInfo_AzurillDoll,
+    &gEventObjectGraphicsInfo_SkittyDoll,
+    &gEventObjectGraphicsInfo_SwabluDoll,
+    &gEventObjectGraphicsInfo_GulpinDoll,
+    &gEventObjectGraphicsInfo_LotadDoll,
+    &gEventObjectGraphicsInfo_SeedotDoll,
+    &gEventObjectGraphicsInfo_PikaCushion,
+    &gEventObjectGraphicsInfo_RoundCushion,
+    &gEventObjectGraphicsInfo_KissCushion,
+    &gEventObjectGraphicsInfo_ZigzagCushion,
+    &gEventObjectGraphicsInfo_SpinCushion,
+    &gEventObjectGraphicsInfo_DiamondCushion,
+    &gEventObjectGraphicsInfo_BallCushion,
+    &gEventObjectGraphicsInfo_GrassCushion,
+    &gEventObjectGraphicsInfo_FireCushion,
+    &gEventObjectGraphicsInfo_WaterCushion,
+    &gEventObjectGraphicsInfo_BigSnorlaxDoll,
+    &gEventObjectGraphicsInfo_BigRhydonDoll,
+    &gEventObjectGraphicsInfo_BigLaprasDoll,
+    &gEventObjectGraphicsInfo_BigVenusaurDoll,
+    &gEventObjectGraphicsInfo_BigCharizardDoll,
+    &gEventObjectGraphicsInfo_BigBlastoiseDoll,
+    &gEventObjectGraphicsInfo_BigWailmerDoll,
+    &gEventObjectGraphicsInfo_BigRegirockDoll,
+    &gEventObjectGraphicsInfo_BigRegiceDoll,
+    &gEventObjectGraphicsInfo_BigRegisteelDoll,
+    &gEventObjectGraphicsInfo_Latias,
+    &gEventObjectGraphicsInfo_Latios,
+    &gEventObjectGraphicsInfo_Boy5,
+    &gEventObjectGraphicsInfo_ContestJudge,
+    &gEventObjectGraphicsInfo_BrendanWatering,
+    &gEventObjectGraphicsInfo_MayWatering,
+    &gEventObjectGraphicsInfo_BrendanDecorating,
+    &gEventObjectGraphicsInfo_MayDecorating,
+    &gEventObjectGraphicsInfo_Archie,
+    &gEventObjectGraphicsInfo_Maxie,
+    &gEventObjectGraphicsInfo_Kyogre1,
+    &gEventObjectGraphicsInfo_Groudon1,
+    &gEventObjectGraphicsInfo_Fossil,
+    &gEventObjectGraphicsInfo_Regirock,
+    &gEventObjectGraphicsInfo_Regice,
+    &gEventObjectGraphicsInfo_Registeel,
+    &gEventObjectGraphicsInfo_Skitty,
+    &gEventObjectGraphicsInfo_Kecleon1,
+    &gEventObjectGraphicsInfo_Kyogre2,
+    &gEventObjectGraphicsInfo_Groudon2,
+    &gEventObjectGraphicsInfo_Rayquaza,
+    &gEventObjectGraphicsInfo_Zigzagoon,
+    &gEventObjectGraphicsInfo_Pikachu,
+    &gEventObjectGraphicsInfo_Azumarill,
+    &gEventObjectGraphicsInfo_Wingull,
+    &gEventObjectGraphicsInfo_Kecleon2,
+    &gEventObjectGraphicsInfo_TuberMSwimming,
+    &gEventObjectGraphicsInfo_Azurill,
+    &gEventObjectGraphicsInfo_Mom,
+    &gEventObjectGraphicsInfo_LinkBrendan,
+    &gEventObjectGraphicsInfo_LinkMay
+};
+
+#endif //POKERUBY_EVENT_OBJECT_GRAPHICS_INFO_POINTERS_H
diff --git a/src/data/field_event_obj/event_object_pic_tables.h b/src/data/field_event_obj/event_object_pic_tables.h
new file mode 100644
index 000000000..f7ed77f93
--- /dev/null
+++ b/src/data/field_event_obj/event_object_pic_tables.h
@@ -0,0 +1,1879 @@
+//
+
+//
+
+#ifndef POKERUBY_EVENT_OBJECT_PIC_TABLES_H
+#define POKERUBY_EVENT_OBJECT_PIC_TABLES_H
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanNormal[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_0),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_1),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_2),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_3),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_4),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_5),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_6),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_7),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_8),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_9),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_10),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_11),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_12),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_13),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_14),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_15),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_16),
+    obj_frame_tiles(gEventObjectPic_BrendanNormal_17)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanMachBike[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_0),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_1),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_2),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_3),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_4),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_5),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_6),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_7),
+    obj_frame_tiles(gEventObjectPic_BrendanMachBike_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanAcroBike[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_0),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_1),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_2),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_3),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_4),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_5),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_6),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_7),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_8),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_9),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_10),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_11),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_12),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_13),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_14),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_15),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_16),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_17),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_18),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_19),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_20),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_21),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_22),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_23),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_24),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_25),
+    obj_frame_tiles(gEventObjectPic_BrendanAcroBike_26)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanSurfing[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_3),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_4),
+    obj_frame_tiles(gEventObjectPic_BrendanSurfing_5)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanUnderwater[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_BrendanUnderwater_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanFieldMove[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_0),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_1),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_2),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_3),
+    obj_frame_tiles(gEventObjectPic_BrendanFieldMove_4)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_QuintyPlump[] = {
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_0),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_1),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_2),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_3),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_4),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_5),
+    obj_frame_tiles(gEventObjectPic_QuintyPlump_6)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy1[] = {
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_0),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_1),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_2),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_3),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_4),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_5),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_6),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_7),
+    obj_frame_tiles(gEventObjectPic_LittleBoy1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleGirl1[] = {
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_0),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_1),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_2),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_3),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_4),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_5),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_6),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_7),
+    obj_frame_tiles(gEventObjectPic_LittleGirl1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy1[] = {
+    obj_frame_tiles(gEventObjectPic_Boy1_0),
+    obj_frame_tiles(gEventObjectPic_Boy1_1),
+    obj_frame_tiles(gEventObjectPic_Boy1_2),
+    obj_frame_tiles(gEventObjectPic_Boy1_3),
+    obj_frame_tiles(gEventObjectPic_Boy1_4),
+    obj_frame_tiles(gEventObjectPic_Boy1_5),
+    obj_frame_tiles(gEventObjectPic_Boy1_6),
+    obj_frame_tiles(gEventObjectPic_Boy1_7),
+    obj_frame_tiles(gEventObjectPic_Boy1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl1[] = {
+    obj_frame_tiles(gEventObjectPic_Girl1_0),
+    obj_frame_tiles(gEventObjectPic_Girl1_1),
+    obj_frame_tiles(gEventObjectPic_Girl1_2),
+    obj_frame_tiles(gEventObjectPic_Girl1_3),
+    obj_frame_tiles(gEventObjectPic_Girl1_4),
+    obj_frame_tiles(gEventObjectPic_Girl1_5),
+    obj_frame_tiles(gEventObjectPic_Girl1_6),
+    obj_frame_tiles(gEventObjectPic_Girl1_7),
+    obj_frame_tiles(gEventObjectPic_Girl1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy2[] = {
+    obj_frame_tiles(gEventObjectPic_Boy2_0),
+    obj_frame_tiles(gEventObjectPic_Boy2_1),
+    obj_frame_tiles(gEventObjectPic_Boy2_2),
+    obj_frame_tiles(gEventObjectPic_Boy2_3),
+    obj_frame_tiles(gEventObjectPic_Boy2_4),
+    obj_frame_tiles(gEventObjectPic_Boy2_5),
+    obj_frame_tiles(gEventObjectPic_Boy2_6),
+    obj_frame_tiles(gEventObjectPic_Boy2_7),
+    obj_frame_tiles(gEventObjectPic_Boy2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl2[] = {
+    obj_frame_tiles(gEventObjectPic_Girl2_0),
+    obj_frame_tiles(gEventObjectPic_Girl2_1),
+    obj_frame_tiles(gEventObjectPic_Girl2_2),
+    obj_frame_tiles(gEventObjectPic_Girl2_3),
+    obj_frame_tiles(gEventObjectPic_Girl2_4),
+    obj_frame_tiles(gEventObjectPic_Girl2_5),
+    obj_frame_tiles(gEventObjectPic_Girl2_6),
+    obj_frame_tiles(gEventObjectPic_Girl2_7),
+    obj_frame_tiles(gEventObjectPic_Girl2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy2[] = {
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_0),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_1),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_2),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_3),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_4),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_5),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_6),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_7),
+    obj_frame_tiles(gEventObjectPic_LittleBoy2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleGirl2[] = {
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_0),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_1),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_2),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_3),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_4),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_5),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_6),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_7),
+    obj_frame_tiles(gEventObjectPic_LittleGirl2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy3[] = {
+    obj_frame_tiles(gEventObjectPic_Boy3_0),
+    obj_frame_tiles(gEventObjectPic_Boy3_1),
+    obj_frame_tiles(gEventObjectPic_Boy3_2),
+    obj_frame_tiles(gEventObjectPic_Boy3_3),
+    obj_frame_tiles(gEventObjectPic_Boy3_4),
+    obj_frame_tiles(gEventObjectPic_Boy3_5),
+    obj_frame_tiles(gEventObjectPic_Boy3_6),
+    obj_frame_tiles(gEventObjectPic_Boy3_7),
+    obj_frame_tiles(gEventObjectPic_Boy3_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Girl3[] = {
+    obj_frame_tiles(gEventObjectPic_Girl3_0),
+    obj_frame_tiles(gEventObjectPic_Girl3_1),
+    obj_frame_tiles(gEventObjectPic_Girl3_2),
+    obj_frame_tiles(gEventObjectPic_Girl3_3),
+    obj_frame_tiles(gEventObjectPic_Girl3_4),
+    obj_frame_tiles(gEventObjectPic_Girl3_5),
+    obj_frame_tiles(gEventObjectPic_Girl3_6),
+    obj_frame_tiles(gEventObjectPic_Girl3_7),
+    obj_frame_tiles(gEventObjectPic_Girl3_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy4[] = {
+    obj_frame_tiles(gEventObjectPic_Boy4_0),
+    obj_frame_tiles(gEventObjectPic_Boy4_1),
+    obj_frame_tiles(gEventObjectPic_Boy4_2),
+    obj_frame_tiles(gEventObjectPic_Boy4_3),
+    obj_frame_tiles(gEventObjectPic_Boy4_4),
+    obj_frame_tiles(gEventObjectPic_Boy4_5),
+    obj_frame_tiles(gEventObjectPic_Boy4_6),
+    obj_frame_tiles(gEventObjectPic_Boy4_7),
+    obj_frame_tiles(gEventObjectPic_Boy4_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman1[] = {
+    obj_frame_tiles(gEventObjectPic_Woman1_0),
+    obj_frame_tiles(gEventObjectPic_Woman1_1),
+    obj_frame_tiles(gEventObjectPic_Woman1_2),
+    obj_frame_tiles(gEventObjectPic_Woman1_3),
+    obj_frame_tiles(gEventObjectPic_Woman1_4),
+    obj_frame_tiles(gEventObjectPic_Woman1_5),
+    obj_frame_tiles(gEventObjectPic_Woman1_6),
+    obj_frame_tiles(gEventObjectPic_Woman1_7),
+    obj_frame_tiles(gEventObjectPic_Woman1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_FatMan[] = {
+    obj_frame_tiles(gEventObjectPic_FatMan_0),
+    obj_frame_tiles(gEventObjectPic_FatMan_1),
+    obj_frame_tiles(gEventObjectPic_FatMan_2),
+    obj_frame_tiles(gEventObjectPic_FatMan_3),
+    obj_frame_tiles(gEventObjectPic_FatMan_4),
+    obj_frame_tiles(gEventObjectPic_FatMan_5),
+    obj_frame_tiles(gEventObjectPic_FatMan_6),
+    obj_frame_tiles(gEventObjectPic_FatMan_7),
+    obj_frame_tiles(gEventObjectPic_FatMan_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman2[] = {
+    obj_frame_tiles(gEventObjectPic_Woman2_0),
+    obj_frame_tiles(gEventObjectPic_Woman2_1),
+    obj_frame_tiles(gEventObjectPic_Woman2_2),
+    obj_frame_tiles(gEventObjectPic_Woman2_3),
+    obj_frame_tiles(gEventObjectPic_Woman2_4),
+    obj_frame_tiles(gEventObjectPic_Woman2_5),
+    obj_frame_tiles(gEventObjectPic_Woman2_6),
+    obj_frame_tiles(gEventObjectPic_Woman2_7),
+    obj_frame_tiles(gEventObjectPic_Woman2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man1[] = {
+    obj_frame_tiles(gEventObjectPic_Man1_0),
+    obj_frame_tiles(gEventObjectPic_Man1_1),
+    obj_frame_tiles(gEventObjectPic_Man1_2),
+    obj_frame_tiles(gEventObjectPic_Man1_3),
+    obj_frame_tiles(gEventObjectPic_Man1_4),
+    obj_frame_tiles(gEventObjectPic_Man1_5),
+    obj_frame_tiles(gEventObjectPic_Man1_6),
+    obj_frame_tiles(gEventObjectPic_Man1_7),
+    obj_frame_tiles(gEventObjectPic_Man1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman3[] = {
+    obj_frame_tiles(gEventObjectPic_Woman3_0),
+    obj_frame_tiles(gEventObjectPic_Woman3_1),
+    obj_frame_tiles(gEventObjectPic_Woman3_2),
+    obj_frame_tiles(gEventObjectPic_Woman3_3),
+    obj_frame_tiles(gEventObjectPic_Woman3_4),
+    obj_frame_tiles(gEventObjectPic_Woman3_5),
+    obj_frame_tiles(gEventObjectPic_Woman3_6),
+    obj_frame_tiles(gEventObjectPic_Woman3_7),
+    obj_frame_tiles(gEventObjectPic_Woman3_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldMan1[] = {
+    obj_frame_tiles(gEventObjectPic_OldMan1_0),
+    obj_frame_tiles(gEventObjectPic_OldMan1_1),
+    obj_frame_tiles(gEventObjectPic_OldMan1_2),
+    obj_frame_tiles(gEventObjectPic_OldMan1_3),
+    obj_frame_tiles(gEventObjectPic_OldMan1_4),
+    obj_frame_tiles(gEventObjectPic_OldMan1_5),
+    obj_frame_tiles(gEventObjectPic_OldMan1_6),
+    obj_frame_tiles(gEventObjectPic_OldMan1_7),
+    obj_frame_tiles(gEventObjectPic_OldMan1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldWoman1[] = {
+    obj_frame_tiles(gEventObjectPic_OldWoman1_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_2),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_3),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_4),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_5),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_6),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_7),
+    obj_frame_tiles(gEventObjectPic_OldWoman1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man2[] = {
+    obj_frame_tiles(gEventObjectPic_Man2_0),
+    obj_frame_tiles(gEventObjectPic_Man2_1),
+    obj_frame_tiles(gEventObjectPic_Man2_2),
+    obj_frame_tiles(gEventObjectPic_Man2_3),
+    obj_frame_tiles(gEventObjectPic_Man2_4),
+    obj_frame_tiles(gEventObjectPic_Man2_5),
+    obj_frame_tiles(gEventObjectPic_Man2_6),
+    obj_frame_tiles(gEventObjectPic_Man2_7),
+    obj_frame_tiles(gEventObjectPic_Man2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman4[] = {
+    obj_frame_tiles(gEventObjectPic_Woman4_0),
+    obj_frame_tiles(gEventObjectPic_Woman4_1),
+    obj_frame_tiles(gEventObjectPic_Woman4_2),
+    obj_frame_tiles(gEventObjectPic_Woman4_3),
+    obj_frame_tiles(gEventObjectPic_Woman4_4),
+    obj_frame_tiles(gEventObjectPic_Woman4_5),
+    obj_frame_tiles(gEventObjectPic_Woman4_6),
+    obj_frame_tiles(gEventObjectPic_Woman4_7),
+    obj_frame_tiles(gEventObjectPic_Woman4_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man3[] = {
+    obj_frame_tiles(gEventObjectPic_Man3_0),
+    obj_frame_tiles(gEventObjectPic_Man3_1),
+    obj_frame_tiles(gEventObjectPic_Man3_2),
+    obj_frame_tiles(gEventObjectPic_Man3_3),
+    obj_frame_tiles(gEventObjectPic_Man3_4),
+    obj_frame_tiles(gEventObjectPic_Man3_5),
+    obj_frame_tiles(gEventObjectPic_Man3_6),
+    obj_frame_tiles(gEventObjectPic_Man3_7),
+    obj_frame_tiles(gEventObjectPic_Man3_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman5[] = {
+    obj_frame_tiles(gEventObjectPic_Woman5_0),
+    obj_frame_tiles(gEventObjectPic_Woman5_1),
+    obj_frame_tiles(gEventObjectPic_Woman5_2),
+    obj_frame_tiles(gEventObjectPic_Woman5_3),
+    obj_frame_tiles(gEventObjectPic_Woman5_4),
+    obj_frame_tiles(gEventObjectPic_Woman5_5),
+    obj_frame_tiles(gEventObjectPic_Woman5_6),
+    obj_frame_tiles(gEventObjectPic_Woman5_7),
+    obj_frame_tiles(gEventObjectPic_Woman5_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Cook[] = {
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_2),
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_0),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_1),
+    obj_frame_tiles(gEventObjectPic_Cook_2),
+    obj_frame_tiles(gEventObjectPic_Cook_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman6[] = {
+    obj_frame_tiles(gEventObjectPic_Woman6_0),
+    obj_frame_tiles(gEventObjectPic_Woman6_1),
+    obj_frame_tiles(gEventObjectPic_Woman6_2),
+    obj_frame_tiles(gEventObjectPic_Woman6_3),
+    obj_frame_tiles(gEventObjectPic_Woman6_4),
+    obj_frame_tiles(gEventObjectPic_Woman6_5),
+    obj_frame_tiles(gEventObjectPic_Woman6_6),
+    obj_frame_tiles(gEventObjectPic_Woman6_7),
+    obj_frame_tiles(gEventObjectPic_Woman6_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldMan2[] = {
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_0),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_1),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2),
+    obj_frame_tiles(gEventObjectPic_OldMan2_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_OldWoman2[] = {
+    obj_frame_tiles(gEventObjectPic_OldWoman2_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_2),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_0),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_1),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_2),
+    obj_frame_tiles(gEventObjectPic_OldWoman2_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Camper[] = {
+    obj_frame_tiles(gEventObjectPic_Camper_0),
+    obj_frame_tiles(gEventObjectPic_Camper_1),
+    obj_frame_tiles(gEventObjectPic_Camper_2),
+    obj_frame_tiles(gEventObjectPic_Camper_3),
+    obj_frame_tiles(gEventObjectPic_Camper_4),
+    obj_frame_tiles(gEventObjectPic_Camper_5),
+    obj_frame_tiles(gEventObjectPic_Camper_6),
+    obj_frame_tiles(gEventObjectPic_Camper_7),
+    obj_frame_tiles(gEventObjectPic_Camper_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Picnicker[] = {
+    obj_frame_tiles(gEventObjectPic_Picnicker_0),
+    obj_frame_tiles(gEventObjectPic_Picnicker_1),
+    obj_frame_tiles(gEventObjectPic_Picnicker_2),
+    obj_frame_tiles(gEventObjectPic_Picnicker_3),
+    obj_frame_tiles(gEventObjectPic_Picnicker_4),
+    obj_frame_tiles(gEventObjectPic_Picnicker_5),
+    obj_frame_tiles(gEventObjectPic_Picnicker_6),
+    obj_frame_tiles(gEventObjectPic_Picnicker_7),
+    obj_frame_tiles(gEventObjectPic_Picnicker_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man4[] = {
+    obj_frame_tiles(gEventObjectPic_Man4_0),
+    obj_frame_tiles(gEventObjectPic_Man4_1),
+    obj_frame_tiles(gEventObjectPic_Man4_2),
+    obj_frame_tiles(gEventObjectPic_Man4_3),
+    obj_frame_tiles(gEventObjectPic_Man4_4),
+    obj_frame_tiles(gEventObjectPic_Man4_5),
+    obj_frame_tiles(gEventObjectPic_Man4_6),
+    obj_frame_tiles(gEventObjectPic_Man4_7),
+    obj_frame_tiles(gEventObjectPic_Man4_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman7[] = {
+    obj_frame_tiles(gEventObjectPic_Woman7_0),
+    obj_frame_tiles(gEventObjectPic_Woman7_1),
+    obj_frame_tiles(gEventObjectPic_Woman7_2),
+    obj_frame_tiles(gEventObjectPic_Woman7_3),
+    obj_frame_tiles(gEventObjectPic_Woman7_4),
+    obj_frame_tiles(gEventObjectPic_Woman7_5),
+    obj_frame_tiles(gEventObjectPic_Woman7_6),
+    obj_frame_tiles(gEventObjectPic_Woman7_7),
+    obj_frame_tiles(gEventObjectPic_Woman7_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Youngster[] = {
+    obj_frame_tiles(gEventObjectPic_Youngster_0),
+    obj_frame_tiles(gEventObjectPic_Youngster_1),
+    obj_frame_tiles(gEventObjectPic_Youngster_2),
+    obj_frame_tiles(gEventObjectPic_Youngster_3),
+    obj_frame_tiles(gEventObjectPic_Youngster_4),
+    obj_frame_tiles(gEventObjectPic_Youngster_5),
+    obj_frame_tiles(gEventObjectPic_Youngster_6),
+    obj_frame_tiles(gEventObjectPic_Youngster_7),
+    obj_frame_tiles(gEventObjectPic_Youngster_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BugCatcher[] = {
+    obj_frame_tiles(gEventObjectPic_BugCatcher_0),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_1),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_2),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_3),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_4),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_5),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_6),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_7),
+    obj_frame_tiles(gEventObjectPic_BugCatcher_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PsychicM[] = {
+    obj_frame_tiles(gEventObjectPic_PsychicM_0),
+    obj_frame_tiles(gEventObjectPic_PsychicM_1),
+    obj_frame_tiles(gEventObjectPic_PsychicM_2),
+    obj_frame_tiles(gEventObjectPic_PsychicM_3),
+    obj_frame_tiles(gEventObjectPic_PsychicM_4),
+    obj_frame_tiles(gEventObjectPic_PsychicM_5),
+    obj_frame_tiles(gEventObjectPic_PsychicM_6),
+    obj_frame_tiles(gEventObjectPic_PsychicM_7),
+    obj_frame_tiles(gEventObjectPic_PsychicM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SchoolKidM[] = {
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_0),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_1),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_2),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_3),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_4),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_5),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_6),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_7),
+    obj_frame_tiles(gEventObjectPic_SchoolKidM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Maniac[] = {
+    obj_frame_tiles(gEventObjectPic_Maniac_0),
+    obj_frame_tiles(gEventObjectPic_Maniac_1),
+    obj_frame_tiles(gEventObjectPic_Maniac_2),
+    obj_frame_tiles(gEventObjectPic_Maniac_3),
+    obj_frame_tiles(gEventObjectPic_Maniac_4),
+    obj_frame_tiles(gEventObjectPic_Maniac_5),
+    obj_frame_tiles(gEventObjectPic_Maniac_6),
+    obj_frame_tiles(gEventObjectPic_Maniac_7),
+    obj_frame_tiles(gEventObjectPic_Maniac_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_HexManiac[] = {
+    obj_frame_tiles(gEventObjectPic_HexManiac_0),
+    obj_frame_tiles(gEventObjectPic_HexManiac_1),
+    obj_frame_tiles(gEventObjectPic_HexManiac_2),
+    obj_frame_tiles(gEventObjectPic_HexManiac_3),
+    obj_frame_tiles(gEventObjectPic_HexManiac_4),
+    obj_frame_tiles(gEventObjectPic_HexManiac_5),
+    obj_frame_tiles(gEventObjectPic_HexManiac_6),
+    obj_frame_tiles(gEventObjectPic_HexManiac_7),
+    obj_frame_tiles(gEventObjectPic_HexManiac_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Woman8[] = {
+    obj_frame_tiles(gEventObjectPic_Woman8_0),
+    obj_frame_tiles(gEventObjectPic_Woman8_1),
+    obj_frame_tiles(gEventObjectPic_Woman8_2),
+    obj_frame_tiles(gEventObjectPic_Woman8_3),
+    obj_frame_tiles(gEventObjectPic_Woman8_4),
+    obj_frame_tiles(gEventObjectPic_Woman8_5),
+    obj_frame_tiles(gEventObjectPic_Woman8_6),
+    obj_frame_tiles(gEventObjectPic_Woman8_7),
+    obj_frame_tiles(gEventObjectPic_Woman8_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwimmerM[] = {
+    obj_frame_tiles(gEventObjectPic_SwimmerM_0),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_1),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_2),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_3),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_4),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_5),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_6),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_7),
+    obj_frame_tiles(gEventObjectPic_SwimmerM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwimmerF[] = {
+    obj_frame_tiles(gEventObjectPic_SwimmerF_0),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_1),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_2),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_3),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_4),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_5),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_6),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_7),
+    obj_frame_tiles(gEventObjectPic_SwimmerF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BlackBelt[] = {
+    obj_frame_tiles(gEventObjectPic_BlackBelt_0),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_1),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_2),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_3),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_4),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_5),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_6),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_7),
+    obj_frame_tiles(gEventObjectPic_BlackBelt_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Beauty[] = {
+    obj_frame_tiles(gEventObjectPic_Beauty_0),
+    obj_frame_tiles(gEventObjectPic_Beauty_1),
+    obj_frame_tiles(gEventObjectPic_Beauty_2),
+    obj_frame_tiles(gEventObjectPic_Beauty_3),
+    obj_frame_tiles(gEventObjectPic_Beauty_4),
+    obj_frame_tiles(gEventObjectPic_Beauty_5),
+    obj_frame_tiles(gEventObjectPic_Beauty_6),
+    obj_frame_tiles(gEventObjectPic_Beauty_7),
+    obj_frame_tiles(gEventObjectPic_Beauty_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Scientist1[] = {
+    obj_frame_tiles(gEventObjectPic_Scientist1_0),
+    obj_frame_tiles(gEventObjectPic_Scientist1_1),
+    obj_frame_tiles(gEventObjectPic_Scientist1_2),
+    obj_frame_tiles(gEventObjectPic_Scientist1_3),
+    obj_frame_tiles(gEventObjectPic_Scientist1_4),
+    obj_frame_tiles(gEventObjectPic_Scientist1_5),
+    obj_frame_tiles(gEventObjectPic_Scientist1_6),
+    obj_frame_tiles(gEventObjectPic_Scientist1_7),
+    obj_frame_tiles(gEventObjectPic_Scientist1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Lass[] = {
+    obj_frame_tiles(gEventObjectPic_Lass_0),
+    obj_frame_tiles(gEventObjectPic_Lass_1),
+    obj_frame_tiles(gEventObjectPic_Lass_2),
+    obj_frame_tiles(gEventObjectPic_Lass_3),
+    obj_frame_tiles(gEventObjectPic_Lass_4),
+    obj_frame_tiles(gEventObjectPic_Lass_5),
+    obj_frame_tiles(gEventObjectPic_Lass_6),
+    obj_frame_tiles(gEventObjectPic_Lass_7),
+    obj_frame_tiles(gEventObjectPic_Lass_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Gentleman[] = {
+    obj_frame_tiles(gEventObjectPic_Gentleman_0),
+    obj_frame_tiles(gEventObjectPic_Gentleman_1),
+    obj_frame_tiles(gEventObjectPic_Gentleman_2),
+    obj_frame_tiles(gEventObjectPic_Gentleman_3),
+    obj_frame_tiles(gEventObjectPic_Gentleman_4),
+    obj_frame_tiles(gEventObjectPic_Gentleman_5),
+    obj_frame_tiles(gEventObjectPic_Gentleman_6),
+    obj_frame_tiles(gEventObjectPic_Gentleman_7),
+    obj_frame_tiles(gEventObjectPic_Gentleman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Sailor[] = {
+    obj_frame_tiles(gEventObjectPic_Sailor_0),
+    obj_frame_tiles(gEventObjectPic_Sailor_1),
+    obj_frame_tiles(gEventObjectPic_Sailor_2),
+    obj_frame_tiles(gEventObjectPic_Sailor_3),
+    obj_frame_tiles(gEventObjectPic_Sailor_4),
+    obj_frame_tiles(gEventObjectPic_Sailor_5),
+    obj_frame_tiles(gEventObjectPic_Sailor_6),
+    obj_frame_tiles(gEventObjectPic_Sailor_7),
+    obj_frame_tiles(gEventObjectPic_Sailor_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Fisherman[] = {
+    obj_frame_tiles(gEventObjectPic_Fisherman_0),
+    obj_frame_tiles(gEventObjectPic_Fisherman_1),
+    obj_frame_tiles(gEventObjectPic_Fisherman_2),
+    obj_frame_tiles(gEventObjectPic_Fisherman_3),
+    obj_frame_tiles(gEventObjectPic_Fisherman_4),
+    obj_frame_tiles(gEventObjectPic_Fisherman_5),
+    obj_frame_tiles(gEventObjectPic_Fisherman_6),
+    obj_frame_tiles(gEventObjectPic_Fisherman_7),
+    obj_frame_tiles(gEventObjectPic_Fisherman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteM[] = {
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_0),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_1),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_2),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_3),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_4),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_5),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_6),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_7),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RunningTriathleteF[] = {
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_0),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_1),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_2),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_3),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_4),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_5),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_6),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_7),
+    obj_frame_tiles(gEventObjectPic_RunningTriathleteF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberF[] = {
+    obj_frame_tiles(gEventObjectPic_TuberF_0),
+    obj_frame_tiles(gEventObjectPic_TuberF_1),
+    obj_frame_tiles(gEventObjectPic_TuberF_2),
+    obj_frame_tiles(gEventObjectPic_TuberF_3),
+    obj_frame_tiles(gEventObjectPic_TuberF_4),
+    obj_frame_tiles(gEventObjectPic_TuberF_5),
+    obj_frame_tiles(gEventObjectPic_TuberF_6),
+    obj_frame_tiles(gEventObjectPic_TuberF_7),
+    obj_frame_tiles(gEventObjectPic_TuberF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberM[] = {
+    obj_frame_tiles(gEventObjectPic_TuberM_0),
+    obj_frame_tiles(gEventObjectPic_TuberM_1),
+    obj_frame_tiles(gEventObjectPic_TuberM_2),
+    obj_frame_tiles(gEventObjectPic_TuberM_3),
+    obj_frame_tiles(gEventObjectPic_TuberM_4),
+    obj_frame_tiles(gEventObjectPic_TuberM_5),
+    obj_frame_tiles(gEventObjectPic_TuberM_6),
+    obj_frame_tiles(gEventObjectPic_TuberM_7),
+    obj_frame_tiles(gEventObjectPic_TuberM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Hiker[] = {
+    obj_frame_tiles(gEventObjectPic_Hiker_0),
+    obj_frame_tiles(gEventObjectPic_Hiker_1),
+    obj_frame_tiles(gEventObjectPic_Hiker_2),
+    obj_frame_tiles(gEventObjectPic_Hiker_3),
+    obj_frame_tiles(gEventObjectPic_Hiker_4),
+    obj_frame_tiles(gEventObjectPic_Hiker_5),
+    obj_frame_tiles(gEventObjectPic_Hiker_6),
+    obj_frame_tiles(gEventObjectPic_Hiker_7),
+    obj_frame_tiles(gEventObjectPic_Hiker_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteM[] = {
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_0),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_1),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_2),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_3),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_4),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_5),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_6),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_7),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyclingTriathleteF[] = {
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_0),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_1),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_2),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_3),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_4),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_5),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_6),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_7),
+    obj_frame_tiles(gEventObjectPic_CyclingTriathleteF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Nurse[] = {
+    obj_frame_tiles(gEventObjectPic_Nurse_0),
+    obj_frame_tiles(gEventObjectPic_Nurse_1),
+    obj_frame_tiles(gEventObjectPic_Nurse_2),
+    obj_frame_tiles(gEventObjectPic_Nurse_3),
+    obj_frame_tiles(gEventObjectPic_Nurse_4),
+    obj_frame_tiles(gEventObjectPic_Nurse_5),
+    obj_frame_tiles(gEventObjectPic_Nurse_6),
+    obj_frame_tiles(gEventObjectPic_Nurse_7),
+    obj_frame_tiles(gEventObjectPic_Nurse_8),
+    obj_frame_tiles(gEventObjectPic_Nurse_9)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ItemBall[] = {
+    obj_frame_tiles(gEventObjectPic_ItemBall)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ProfBirch[] = {
+    obj_frame_tiles(gEventObjectPic_ProfBirch_0),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_1),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_2),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_3),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_4),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_5),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_6),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_7),
+    obj_frame_tiles(gEventObjectPic_ProfBirch_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man5[] = {
+    obj_frame_tiles(gEventObjectPic_Man5_0),
+    obj_frame_tiles(gEventObjectPic_Man5_1),
+    obj_frame_tiles(gEventObjectPic_Man5_2),
+    obj_frame_tiles(gEventObjectPic_Man5_3),
+    obj_frame_tiles(gEventObjectPic_Man5_4),
+    obj_frame_tiles(gEventObjectPic_Man5_5),
+    obj_frame_tiles(gEventObjectPic_Man5_6),
+    obj_frame_tiles(gEventObjectPic_Man5_7),
+    obj_frame_tiles(gEventObjectPic_Man5_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man6[] = {
+    obj_frame_tiles(gEventObjectPic_Man6_0),
+    obj_frame_tiles(gEventObjectPic_Man6_1),
+    obj_frame_tiles(gEventObjectPic_Man6_2),
+    obj_frame_tiles(gEventObjectPic_Man6_3),
+    obj_frame_tiles(gEventObjectPic_Man6_4),
+    obj_frame_tiles(gEventObjectPic_Man6_5),
+    obj_frame_tiles(gEventObjectPic_Man6_6),
+    obj_frame_tiles(gEventObjectPic_Man6_7),
+    obj_frame_tiles(gEventObjectPic_Man6_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ReporterM[] = {
+    obj_frame_tiles(gEventObjectPic_ReporterM_0),
+    obj_frame_tiles(gEventObjectPic_ReporterM_1),
+    obj_frame_tiles(gEventObjectPic_ReporterM_2),
+    obj_frame_tiles(gEventObjectPic_ReporterM_3),
+    obj_frame_tiles(gEventObjectPic_ReporterM_4),
+    obj_frame_tiles(gEventObjectPic_ReporterM_5),
+    obj_frame_tiles(gEventObjectPic_ReporterM_6),
+    obj_frame_tiles(gEventObjectPic_ReporterM_7),
+    obj_frame_tiles(gEventObjectPic_ReporterM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ReporterF[] = {
+    obj_frame_tiles(gEventObjectPic_ReporterF_0),
+    obj_frame_tiles(gEventObjectPic_ReporterF_1),
+    obj_frame_tiles(gEventObjectPic_ReporterF_2),
+    obj_frame_tiles(gEventObjectPic_ReporterF_3),
+    obj_frame_tiles(gEventObjectPic_ReporterF_4),
+    obj_frame_tiles(gEventObjectPic_ReporterF_5),
+    obj_frame_tiles(gEventObjectPic_ReporterF_6),
+    obj_frame_tiles(gEventObjectPic_ReporterF_7),
+    obj_frame_tiles(gEventObjectPic_ReporterF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan1[] = {
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_0),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_1),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_2),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_3),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_4),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_5),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_6),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_7),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan1_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MauvilleOldMan2[] = {
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_0),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_1),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_2),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_3),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_4),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_5),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_6),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_7),
+    obj_frame_tiles(gEventObjectPic_MauvilleOldMan2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedNatuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedNatuDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedMagnemiteDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedMagnemiteDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedSquirtleDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedSquirtleDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedWooperDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedWooperDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedPikachuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedPikachuDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_UnusedPorygon2Doll[] = {
+    obj_frame_tiles(gEventObjectPic_UnusedPorygon2Doll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CuttableTree[] = {
+    obj_frame_tiles(gEventObjectPic_CuttableTree_0),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_1),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_2),
+    obj_frame_tiles(gEventObjectPic_CuttableTree_3)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MartEmployee[] = {
+    obj_frame_tiles(gEventObjectPic_MartEmployee_0),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_1),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_2),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_3),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_4),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_5),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_6),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_7),
+    obj_frame_tiles(gEventObjectPic_MartEmployee_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RooftopSaleWoman[] = {
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_0),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_1),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_2),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_3),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_4),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_5),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_6),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_7),
+    obj_frame_tiles(gEventObjectPic_RooftopSaleWoman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Teala[] = {
+    obj_frame_tiles(gEventObjectPic_Teala_0),
+    obj_frame_tiles(gEventObjectPic_Teala_1),
+    obj_frame_tiles(gEventObjectPic_Teala_2),
+    obj_frame_tiles(gEventObjectPic_Teala_3),
+    obj_frame_tiles(gEventObjectPic_Teala_4),
+    obj_frame_tiles(gEventObjectPic_Teala_5),
+    obj_frame_tiles(gEventObjectPic_Teala_6),
+    obj_frame_tiles(gEventObjectPic_Teala_7),
+    obj_frame_tiles(gEventObjectPic_Teala_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BreakableRock[] = {
+    obj_frame_tiles(gEventObjectPic_BreakableRock_0),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_1),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_2),
+    obj_frame_tiles(gEventObjectPic_BreakableRock_3)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PushableBoulder[] = {
+    obj_frame_tiles(gEventObjectPic_PushableBoulder)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MrBrineysBoat[] = {
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_0),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_1),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2),
+    obj_frame_tiles(gEventObjectPic_MrBrineysBoat_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Truck[] = {
+    obj_frame_tiles(gEventObjectPic_Truck)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MachokeCarryingBox[] = {
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_0),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_1),
+    obj_frame_tiles(gEventObjectPic_MachokeCarryingBox_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MachokeFacingAway[] = {
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_0),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1),
+    obj_frame_tiles(gEventObjectPic_MachokeFacingAway_1)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BirchsBag[] = {
+    obj_frame_tiles(gEventObjectPic_BirchsBag)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Poochyena[] = {
+    obj_frame_tiles(gEventObjectPic_Poochyena_0),
+    obj_frame_tiles(gEventObjectPic_Poochyena_1),
+    obj_frame_tiles(gEventObjectPic_Poochyena_2),
+    obj_frame_tiles(gEventObjectPic_Poochyena_3),
+    obj_frame_tiles(gEventObjectPic_Poochyena_4),
+    obj_frame_tiles(gEventObjectPic_Poochyena_5),
+    obj_frame_tiles(gEventObjectPic_Poochyena_6),
+    obj_frame_tiles(gEventObjectPic_Poochyena_7),
+    obj_frame_tiles(gEventObjectPic_Poochyena_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Artist[] = {
+    obj_frame_tiles(gEventObjectPic_Artist_0),
+    obj_frame_tiles(gEventObjectPic_Artist_1),
+    obj_frame_tiles(gEventObjectPic_Artist_2),
+    obj_frame_tiles(gEventObjectPic_Artist_3),
+    obj_frame_tiles(gEventObjectPic_Artist_4),
+    obj_frame_tiles(gEventObjectPic_Artist_5),
+    obj_frame_tiles(gEventObjectPic_Artist_6),
+    obj_frame_tiles(gEventObjectPic_Artist_7),
+    obj_frame_tiles(gEventObjectPic_Artist_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayNormal[] = {
+    obj_frame_tiles(gEventObjectPic_MayNormal_0),
+    obj_frame_tiles(gEventObjectPic_MayNormal_1),
+    obj_frame_tiles(gEventObjectPic_MayNormal_2),
+    obj_frame_tiles(gEventObjectPic_MayNormal_3),
+    obj_frame_tiles(gEventObjectPic_MayNormal_4),
+    obj_frame_tiles(gEventObjectPic_MayNormal_5),
+    obj_frame_tiles(gEventObjectPic_MayNormal_6),
+    obj_frame_tiles(gEventObjectPic_MayNormal_7),
+    obj_frame_tiles(gEventObjectPic_MayNormal_8),
+    obj_frame_tiles(gEventObjectPic_MayNormal_9),
+    obj_frame_tiles(gEventObjectPic_MayNormal_10),
+    obj_frame_tiles(gEventObjectPic_MayNormal_11),
+    obj_frame_tiles(gEventObjectPic_MayNormal_12),
+    obj_frame_tiles(gEventObjectPic_MayNormal_13),
+    obj_frame_tiles(gEventObjectPic_MayNormal_14),
+    obj_frame_tiles(gEventObjectPic_MayNormal_15),
+    obj_frame_tiles(gEventObjectPic_MayNormal_16),
+    obj_frame_tiles(gEventObjectPic_MayNormal_17)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayMachBike[] = {
+    obj_frame_tiles(gEventObjectPic_MayMachBike_0),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_1),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_2),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_3),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_4),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_5),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_6),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_7),
+    obj_frame_tiles(gEventObjectPic_MayMachBike_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayAcroBike[] = {
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_0),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_1),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_2),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_3),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_4),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_5),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_6),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_7),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_8),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_9),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_10),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_11),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_12),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_13),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_14),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_15),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_16),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_17),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_18),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_19),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_20),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_21),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_22),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_23),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_24),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_25),
+    obj_frame_tiles(gEventObjectPic_MayAcroBike_26)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MaySurfing[] = {
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_0),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_1),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_2),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_3),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_4),
+    obj_frame_tiles(gEventObjectPic_MaySurfing_5)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayUnderwater[] = {
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_0),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_1),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2),
+    obj_frame_tiles(gEventObjectPic_MayUnderwater_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayFieldMove[] = {
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_0),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_1),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_2),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_3),
+    obj_frame_tiles(gEventObjectPic_MayFieldMove_4)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Cameraman[] = {
+    obj_frame_tiles(gEventObjectPic_Cameraman_0),
+    obj_frame_tiles(gEventObjectPic_Cameraman_1),
+    obj_frame_tiles(gEventObjectPic_Cameraman_2),
+    obj_frame_tiles(gEventObjectPic_Cameraman_3),
+    obj_frame_tiles(gEventObjectPic_Cameraman_4),
+    obj_frame_tiles(gEventObjectPic_Cameraman_5),
+    obj_frame_tiles(gEventObjectPic_Cameraman_6),
+    obj_frame_tiles(gEventObjectPic_Cameraman_7),
+    obj_frame_tiles(gEventObjectPic_Cameraman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MovingBox[] = {
+    obj_frame_tiles(gEventObjectPic_MovingBox)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CableCar[] = {
+    obj_frame_tiles(gEventObjectPic_CableCar)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Scientist2[] = {
+    obj_frame_tiles(gEventObjectPic_Scientist2_0),
+    obj_frame_tiles(gEventObjectPic_Scientist2_1),
+    obj_frame_tiles(gEventObjectPic_Scientist2_2),
+    obj_frame_tiles(gEventObjectPic_Scientist2_3),
+    obj_frame_tiles(gEventObjectPic_Scientist2_4),
+    obj_frame_tiles(gEventObjectPic_Scientist2_5),
+    obj_frame_tiles(gEventObjectPic_Scientist2_6),
+    obj_frame_tiles(gEventObjectPic_Scientist2_7),
+    obj_frame_tiles(gEventObjectPic_Scientist2_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Man7[] = {
+    obj_frame_tiles(gEventObjectPic_Man7_0),
+    obj_frame_tiles(gEventObjectPic_Man7_1),
+    obj_frame_tiles(gEventObjectPic_Man7_2),
+    obj_frame_tiles(gEventObjectPic_Man7_3),
+    obj_frame_tiles(gEventObjectPic_Man7_4),
+    obj_frame_tiles(gEventObjectPic_Man7_5),
+    obj_frame_tiles(gEventObjectPic_Man7_6),
+    obj_frame_tiles(gEventObjectPic_Man7_7),
+    obj_frame_tiles(gEventObjectPic_Man7_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AquaMemberM[] = {
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_0),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_1),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_2),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_3),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_4),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_5),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_6),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_7),
+    obj_frame_tiles(gEventObjectPic_AquaMemberM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AquaMemberF[] = {
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_0),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_1),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_2),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_3),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_4),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_5),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_6),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_7),
+    obj_frame_tiles(gEventObjectPic_AquaMemberF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberM[] = {
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_0),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_1),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_2),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_3),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_4),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_5),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_6),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_7),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberM_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MagmaMemberF[] = {
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_0),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_1),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_2),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_3),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_4),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_5),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_6),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_7),
+    obj_frame_tiles(gEventObjectPic_MagmaMemberF_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Sidney[] = {
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_2),
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_0),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_1),
+    obj_frame_tiles(gEventObjectPic_Sidney_2),
+    obj_frame_tiles(gEventObjectPic_Sidney_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Phoebe[] = {
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_0),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_1),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2),
+    obj_frame_tiles(gEventObjectPic_Phoebe_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Glacia[] = {
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_2),
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_0),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_1),
+    obj_frame_tiles(gEventObjectPic_Glacia_2),
+    obj_frame_tiles(gEventObjectPic_Glacia_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Drake[] = {
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_2),
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_0),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_1),
+    obj_frame_tiles(gEventObjectPic_Drake_2),
+    obj_frame_tiles(gEventObjectPic_Drake_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Roxanne[] = {
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_0),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_1),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2),
+    obj_frame_tiles(gEventObjectPic_Roxanne_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Brawly[] = {
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_2),
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_0),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_1),
+    obj_frame_tiles(gEventObjectPic_Brawly_2),
+    obj_frame_tiles(gEventObjectPic_Brawly_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wattson[] = {
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_2),
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_0),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_1),
+    obj_frame_tiles(gEventObjectPic_Wattson_2),
+    obj_frame_tiles(gEventObjectPic_Wattson_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Flannery[] = {
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_2),
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_0),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_1),
+    obj_frame_tiles(gEventObjectPic_Flannery_2),
+    obj_frame_tiles(gEventObjectPic_Flannery_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Norman[] = {
+    obj_frame_tiles(gEventObjectPic_Norman_0),
+    obj_frame_tiles(gEventObjectPic_Norman_1),
+    obj_frame_tiles(gEventObjectPic_Norman_2),
+    obj_frame_tiles(gEventObjectPic_Norman_3),
+    obj_frame_tiles(gEventObjectPic_Norman_4),
+    obj_frame_tiles(gEventObjectPic_Norman_5),
+    obj_frame_tiles(gEventObjectPic_Norman_6),
+    obj_frame_tiles(gEventObjectPic_Norman_7),
+    obj_frame_tiles(gEventObjectPic_Norman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Winona[] = {
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_2),
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_0),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_1),
+    obj_frame_tiles(gEventObjectPic_Winona_2),
+    obj_frame_tiles(gEventObjectPic_Winona_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Liza[] = {
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_2),
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_0),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_1),
+    obj_frame_tiles(gEventObjectPic_Liza_2),
+    obj_frame_tiles(gEventObjectPic_Liza_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Tate[] = {
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_2),
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_0),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_1),
+    obj_frame_tiles(gEventObjectPic_Tate_2),
+    obj_frame_tiles(gEventObjectPic_Tate_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wallace[] = {
+    obj_frame_tiles(gEventObjectPic_Wallace_0),
+    obj_frame_tiles(gEventObjectPic_Wallace_1),
+    obj_frame_tiles(gEventObjectPic_Wallace_2),
+    obj_frame_tiles(gEventObjectPic_Wallace_3),
+    obj_frame_tiles(gEventObjectPic_Wallace_4),
+    obj_frame_tiles(gEventObjectPic_Wallace_5),
+    obj_frame_tiles(gEventObjectPic_Wallace_6),
+    obj_frame_tiles(gEventObjectPic_Wallace_7),
+    obj_frame_tiles(gEventObjectPic_Wallace_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Steven[] = {
+    obj_frame_tiles(gEventObjectPic_Steven_0),
+    obj_frame_tiles(gEventObjectPic_Steven_1),
+    obj_frame_tiles(gEventObjectPic_Steven_2),
+    obj_frame_tiles(gEventObjectPic_Steven_3),
+    obj_frame_tiles(gEventObjectPic_Steven_4),
+    obj_frame_tiles(gEventObjectPic_Steven_5),
+    obj_frame_tiles(gEventObjectPic_Steven_6),
+    obj_frame_tiles(gEventObjectPic_Steven_7),
+    obj_frame_tiles(gEventObjectPic_Steven_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wally[] = {
+    obj_frame_tiles(gEventObjectPic_Wally_0),
+    obj_frame_tiles(gEventObjectPic_Wally_1),
+    obj_frame_tiles(gEventObjectPic_Wally_2),
+    obj_frame_tiles(gEventObjectPic_Wally_3),
+    obj_frame_tiles(gEventObjectPic_Wally_4),
+    obj_frame_tiles(gEventObjectPic_Wally_5),
+    obj_frame_tiles(gEventObjectPic_Wally_6),
+    obj_frame_tiles(gEventObjectPic_Wally_7),
+    obj_frame_tiles(gEventObjectPic_Wally_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LittleBoy3[] = {
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_0),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_1),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_2),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_3),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_4),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_5),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_6),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_7),
+    obj_frame_tiles(gEventObjectPic_LittleBoy3_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanFishing[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_0),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_1),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_2),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_3),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_4),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_5),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_6),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_7),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_8),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_9),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_10),
+    obj_frame_tiles(gEventObjectPic_BrendanFishing_11)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayFishing[] = {
+    obj_frame_tiles(gEventObjectPic_MayFishing_0),
+    obj_frame_tiles(gEventObjectPic_MayFishing_1),
+    obj_frame_tiles(gEventObjectPic_MayFishing_2),
+    obj_frame_tiles(gEventObjectPic_MayFishing_3),
+    obj_frame_tiles(gEventObjectPic_MayFishing_4),
+    obj_frame_tiles(gEventObjectPic_MayFishing_5),
+    obj_frame_tiles(gEventObjectPic_MayFishing_6),
+    obj_frame_tiles(gEventObjectPic_MayFishing_7),
+    obj_frame_tiles(gEventObjectPic_MayFishing_8),
+    obj_frame_tiles(gEventObjectPic_MayFishing_9),
+    obj_frame_tiles(gEventObjectPic_MayFishing_10),
+    obj_frame_tiles(gEventObjectPic_MayFishing_11)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_HotSpringsOldWoman[] = {
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_0),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_1),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_2),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_3),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_4),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_5),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_6),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_7),
+    obj_frame_tiles(gEventObjectPic_HotSpringsOldWoman_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SSTidal[] = {
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal),
+    obj_frame_tiles(gEventObjectPic_SSTidal)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SubmarineShadow[] = {
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow),
+    obj_frame_tiles(gEventObjectPic_SubmarineShadow)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PichuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PichuDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PikachuDoll[] = {
+    obj_frame_tiles(gEventObjectPic_PikachuDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MarillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MarillDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TogepiDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TogepiDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_CyndaquilDoll[] = {
+    obj_frame_tiles(gEventObjectPic_CyndaquilDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ChikoritaDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ChikoritaDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TotodileDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TotodileDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_JigglypuffDoll[] = {
+    obj_frame_tiles(gEventObjectPic_JigglypuffDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MeowthDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MeowthDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ClefairyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_ClefairyDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DittoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DittoDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SmoochumDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SmoochumDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TreeckoDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TreeckoDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TorchicDoll[] = {
+    obj_frame_tiles(gEventObjectPic_TorchicDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MudkipDoll[] = {
+    obj_frame_tiles(gEventObjectPic_MudkipDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DuskullDoll[] = {
+    obj_frame_tiles(gEventObjectPic_DuskullDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_WynautDoll[] = {
+    obj_frame_tiles(gEventObjectPic_WynautDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BaltoyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BaltoyDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KecleonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_KecleonDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_AzurillDoll[] = {
+    obj_frame_tiles(gEventObjectPic_AzurillDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SkittyDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SkittyDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SwabluDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SwabluDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GulpinDoll[] = {
+    obj_frame_tiles(gEventObjectPic_GulpinDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LotadDoll[] = {
+    obj_frame_tiles(gEventObjectPic_LotadDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SeedotDoll[] = {
+    obj_frame_tiles(gEventObjectPic_SeedotDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_PikaCushion[] = {
+    obj_frame_tiles(gEventObjectPic_PikaCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_RoundCushion[] = {
+    obj_frame_tiles(gEventObjectPic_RoundCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_KissCushion[] = {
+    obj_frame_tiles(gEventObjectPic_KissCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ZigzagCushion[] = {
+    obj_frame_tiles(gEventObjectPic_ZigzagCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_SpinCushion[] = {
+    obj_frame_tiles(gEventObjectPic_SpinCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_DiamondCushion[] = {
+    obj_frame_tiles(gEventObjectPic_DiamondCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BallCushion[] = {
+    obj_frame_tiles(gEventObjectPic_BallCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_GrassCushion[] = {
+    obj_frame_tiles(gEventObjectPic_GrassCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_FireCushion[] = {
+    obj_frame_tiles(gEventObjectPic_FireCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_WaterCushion[] = {
+    obj_frame_tiles(gEventObjectPic_WaterCushion)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigSnorlaxDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigSnorlaxDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRhydonDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRhydonDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigLaprasDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigLaprasDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigVenusaurDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigVenusaurDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigCharizardDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigCharizardDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigBlastoiseDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigBlastoiseDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigWailmerDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigWailmerDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegirockDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegirockDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegiceDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegiceDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BigRegisteelDoll[] = {
+    obj_frame_tiles(gEventObjectPic_BigRegisteelDoll)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_LatiasLatios[] = {
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_0),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_1),
+    obj_frame_tiles(gEventObjectPic_LatiasLatios_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Boy5[] = {
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_2),
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_0),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_1),
+    obj_frame_tiles(gEventObjectPic_Boy5_2),
+    obj_frame_tiles(gEventObjectPic_Boy5_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_ContestJudge[] = {
+    obj_frame_tiles(gEventObjectPic_ContestJudge_0),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_1),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_2),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_3),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_4),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_5),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_6),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_7),
+    obj_frame_tiles(gEventObjectPic_ContestJudge_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanWatering[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_0),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_1),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_2),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_3),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_4),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_5),
+    obj_frame_tiles(gEventObjectPic_BrendanWatering_5)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayWatering[] = {
+    obj_frame_tiles(gEventObjectPic_MayWatering_0),
+    obj_frame_tiles(gEventObjectPic_MayWatering_1),
+    obj_frame_tiles(gEventObjectPic_MayWatering_2),
+    obj_frame_tiles(gEventObjectPic_MayWatering_3),
+    obj_frame_tiles(gEventObjectPic_MayWatering_3),
+    obj_frame_tiles(gEventObjectPic_MayWatering_4),
+    obj_frame_tiles(gEventObjectPic_MayWatering_4),
+    obj_frame_tiles(gEventObjectPic_MayWatering_5),
+    obj_frame_tiles(gEventObjectPic_MayWatering_5)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_BrendanDecorating[] = {
+    obj_frame_tiles(gEventObjectPic_BrendanDecorating)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_MayDecorating[] = {
+    obj_frame_tiles(gEventObjectPic_MayDecorating)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Archie[] = {
+    obj_frame_tiles(gEventObjectPic_Archie_0),
+    obj_frame_tiles(gEventObjectPic_Archie_1),
+    obj_frame_tiles(gEventObjectPic_Archie_2),
+    obj_frame_tiles(gEventObjectPic_Archie_3),
+    obj_frame_tiles(gEventObjectPic_Archie_4),
+    obj_frame_tiles(gEventObjectPic_Archie_5),
+    obj_frame_tiles(gEventObjectPic_Archie_6),
+    obj_frame_tiles(gEventObjectPic_Archie_7),
+    obj_frame_tiles(gEventObjectPic_Archie_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Maxie[] = {
+    obj_frame_tiles(gEventObjectPic_Maxie_0),
+    obj_frame_tiles(gEventObjectPic_Maxie_1),
+    obj_frame_tiles(gEventObjectPic_Maxie_2),
+    obj_frame_tiles(gEventObjectPic_Maxie_3),
+    obj_frame_tiles(gEventObjectPic_Maxie_4),
+    obj_frame_tiles(gEventObjectPic_Maxie_5),
+    obj_frame_tiles(gEventObjectPic_Maxie_6),
+    obj_frame_tiles(gEventObjectPic_Maxie_7),
+    obj_frame_tiles(gEventObjectPic_Maxie_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Kyogre[] = {
+    obj_frame_tiles(gEventObjectPic_Kyogre_0),
+    obj_frame_tiles(gEventObjectPic_Kyogre_0),
+    obj_frame_tiles(gEventObjectPic_Kyogre_0),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1),
+    obj_frame_tiles(gEventObjectPic_Kyogre_1)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Groudon[] = {
+    obj_frame_tiles(gEventObjectPic_Groudon_0),
+    obj_frame_tiles(gEventObjectPic_Groudon_0),
+    obj_frame_tiles(gEventObjectPic_Groudon_0),
+    obj_frame_tiles(gEventObjectPic_Groudon_1),
+    obj_frame_tiles(gEventObjectPic_Groudon_1),
+    obj_frame_tiles(gEventObjectPic_Groudon_1),
+    obj_frame_tiles(gEventObjectPic_Groudon_1),
+    obj_frame_tiles(gEventObjectPic_Groudon_1),
+    obj_frame_tiles(gEventObjectPic_Groudon_1)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Fossil[] = {
+    obj_frame_tiles(gEventObjectPic_Fossil)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Regi[] = {
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi),
+    obj_frame_tiles(gEventObjectPic_Regi)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Skitty[] = {
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_2),
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_0),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_1),
+    obj_frame_tiles(gEventObjectPic_Skitty_2),
+    obj_frame_tiles(gEventObjectPic_Skitty_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Kecleon[] = {
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_0),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_1),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2),
+    obj_frame_tiles(gEventObjectPic_Kecleon_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Rayquaza[] = {
+    obj_frame_tiles(gEventObjectPic_Rayquaza_0),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_0),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_0),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1),
+    obj_frame_tiles(gEventObjectPic_Rayquaza_1)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Zigzagoon[] = {
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_0),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_1),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2),
+    obj_frame_tiles(gEventObjectPic_Zigzagoon_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Pikachu[] = {
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_0),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_1),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2),
+    obj_frame_tiles(gEventObjectPic_Pikachu_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Azumarill[] = {
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_0),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_1),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2),
+    obj_frame_tiles(gEventObjectPic_Azumarill_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Wingull[] = {
+    obj_frame_tiles(gEventObjectPic_Wingull_0),
+    obj_frame_tiles(gEventObjectPic_Wingull_1),
+    obj_frame_tiles(gEventObjectPic_Wingull_2),
+    obj_frame_tiles(gEventObjectPic_Wingull_3),
+    obj_frame_tiles(gEventObjectPic_Wingull_3),
+    obj_frame_tiles(gEventObjectPic_Wingull_4),
+    obj_frame_tiles(gEventObjectPic_Wingull_4),
+    obj_frame_tiles(gEventObjectPic_Wingull_5),
+    obj_frame_tiles(gEventObjectPic_Wingull_5)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_TuberMSwimming[] = {
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_0),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_1),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_2),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_3),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_4),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_5),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_6),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_7),
+    obj_frame_tiles(gEventObjectPic_TuberMSwimming_8)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Azurill[] = {
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_2),
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_0),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_1),
+    obj_frame_tiles(gEventObjectPic_Azurill_2),
+    obj_frame_tiles(gEventObjectPic_Azurill_2)
+};
+
+const struct SpriteFrameImage gEventObjectPicTable_Mom[] = {
+    obj_frame_tiles(gEventObjectPic_Mom_0),
+    obj_frame_tiles(gEventObjectPic_Mom_1),
+    obj_frame_tiles(gEventObjectPic_Mom_2),
+    obj_frame_tiles(gEventObjectPic_Mom_3),
+    obj_frame_tiles(gEventObjectPic_Mom_4),
+    obj_frame_tiles(gEventObjectPic_Mom_5),
+    obj_frame_tiles(gEventObjectPic_Mom_6),
+    obj_frame_tiles(gEventObjectPic_Mom_7),
+    obj_frame_tiles(gEventObjectPic_Mom_8),
+};
+
+#endif //POKERUBY_EVENT_OBJECT_PIC_TABLES_H
diff --git a/src/data/field_map_obj/map_object_subsprites.h b/src/data/field_event_obj/event_object_subsprites.h
index 951d71e99..95ff6dc03 100644
--- a/src/data/field_map_obj/map_object_subsprites.h
+++ b/src/data/field_event_obj/event_object_subsprites.h
@@ -2,108 +2,108 @@
 
 //
 
-#ifndef POKERUBY_MAP_OBJECT_SUBSPRITES_H
-#define POKERUBY_MAP_OBJECT_SUBSPRITES_H
+#ifndef POKERUBY_EVENT_OBJECT_SUBSPRITES_H
+#define POKERUBY_EVENT_OBJECT_SUBSPRITES_H
 
-const struct Subsprite gMapObjectSubspriteTable_16x16_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x16_0[] = {
     { -8,  -8, 0, 1, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x16_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x16_1[] = {
     { -8,  -8, 0, 1, 0, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x16_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x16_2[] = {
     { -8,  -8, 1, 0, 0, 2},
     { -8,   0, 1, 0, 2, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x16_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x16_3[] = {
     { -8,  -8, 0, 1, 0, 2},
     { -8,  -8, 0, 1, 0, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x16_4[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x16_4[] = {
     { -8,  -8, 0, 1, 0, 1},
     { -8,  -8, 0, 1, 0, 3}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_16x16[] = {
+const struct SubspriteTable gEventObjectSubspriteTables_16x16[] = {
     {0, NULL},
-    {1, gMapObjectSubspriteTable_16x16_0},
-    {1, gMapObjectSubspriteTable_16x16_1},
-    {2, gMapObjectSubspriteTable_16x16_2},
-    {2, gMapObjectSubspriteTable_16x16_3},
-    {2, gMapObjectSubspriteTable_16x16_4}
+    {1, gEventObjectSubspriteTable_16x16_0},
+    {1, gEventObjectSubspriteTable_16x16_1},
+    {2, gEventObjectSubspriteTable_16x16_2},
+    {2, gEventObjectSubspriteTable_16x16_3},
+    {2, gEventObjectSubspriteTable_16x16_4}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x32_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x32_0[] = {
     { -8, -16, 2, 2, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x32_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x32_1[] = {
     { -8, -16, 2, 2, 0, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x32_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x32_2[] = {
     { -8, -16, 0, 1, 0, 2},
     { -8,   0, 1, 0, 4, 2},
     { -8,   8, 1, 0, 6, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x32_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x32_3[] = {
     { -8, -16, 0, 1, 0, 2},
     { -8,   0, 0, 1, 4, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_16x32_4[] = {
+const struct Subsprite gEventObjectSubspriteTable_16x32_4[] = {
     { -8, -16, 0, 1, 0, 1},
     { -8,   0, 0, 1, 4, 3}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_16x32[] = {
+const struct SubspriteTable gEventObjectSubspriteTables_16x32[] = {
     {0, NULL},
-    {1, gMapObjectSubspriteTable_16x32_0},
-    {1, gMapObjectSubspriteTable_16x32_1},
-    {3, gMapObjectSubspriteTable_16x32_2},
-    {2, gMapObjectSubspriteTable_16x32_3},
-    {2, gMapObjectSubspriteTable_16x32_4}
+    {1, gEventObjectSubspriteTable_16x32_0},
+    {1, gEventObjectSubspriteTable_16x32_1},
+    {3, gEventObjectSubspriteTable_16x32_2},
+    {2, gEventObjectSubspriteTable_16x32_3},
+    {2, gEventObjectSubspriteTable_16x32_4}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_32x32_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_32x32_0[] = {
     {-16, -16, 0, 2, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_32x32_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_32x32_1[] = {
     {-16, -16, 0, 2, 0, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_32x32_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_32x32_2[] = {
     {-16, -16, 1, 2, 0, 2},
     {-16,   0, 1, 1, 8, 2},
     {-16,   8, 1, 1, 12, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_32x32_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_32x32_3[] = {
     {-16, -16, 1, 2, 0, 2},
     {-16,   0, 1, 2, 8, 3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_32x32_4[] = {
+const struct Subsprite gEventObjectSubspriteTable_32x32_4[] = {
     {-16, -16, 1, 2, 0, 1},
     {-16,   0, 1, 2, 8, 3}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_32x32[] = {
+const struct SubspriteTable gEventObjectSubspriteTables_32x32[] = {
     {0, NULL},
-    {1, gMapObjectSubspriteTable_32x32_0},
-    {1, gMapObjectSubspriteTable_32x32_1},
-    {3, gMapObjectSubspriteTable_32x32_2},
-    {2, gMapObjectSubspriteTable_32x32_3},
-    {2, gMapObjectSubspriteTable_32x32_4}
+    {1, gEventObjectSubspriteTable_32x32_0},
+    {1, gEventObjectSubspriteTable_32x32_1},
+    {3, gEventObjectSubspriteTable_32x32_2},
+    {2, gEventObjectSubspriteTable_32x32_3},
+    {2, gEventObjectSubspriteTable_32x32_4}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_Truck_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_Truck_0[] = {
     {-24, -24, 1, 1, 0, 2},
     {  8, -24, 1, 0, 4, 2},
     {-24, -16, 1, 1, 6, 2},
@@ -118,66 +118,66 @@ const struct Subsprite gMapObjectSubspriteTable_Truck_0[] = {
     {  8,  16, 1, 0, 34, 2}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_Truck[] = {
-    {12, gMapObjectSubspriteTable_Truck_0},
-    {12, gMapObjectSubspriteTable_Truck_0},
-    {12, gMapObjectSubspriteTable_Truck_0},
-    {12, gMapObjectSubspriteTable_Truck_0},
-    {12, gMapObjectSubspriteTable_Truck_0},
-    {12, gMapObjectSubspriteTable_Truck_0}
+const struct SubspriteTable gEventObjectSubspriteTables_Truck[] = {
+    {12, gEventObjectSubspriteTable_Truck_0},
+    {12, gEventObjectSubspriteTable_Truck_0},
+    {12, gEventObjectSubspriteTable_Truck_0},
+    {12, gEventObjectSubspriteTable_Truck_0},
+    {12, gEventObjectSubspriteTable_Truck_0},
+    {12, gEventObjectSubspriteTable_Truck_0}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_Unused_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_Unused_0[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_Unused_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_Unused_1[] = {
     {-32, -16, 1, 3, 0, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_Unused_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_Unused_2[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_Unused_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_Unused_3[] = {
     {-32, -16, 1, 3, 0, 2}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_Unused[] = {
+const struct SubspriteTable gEventObjectSubspriteTables_Unused[] = {
     {0, NULL},
-    {1, gMapObjectSubspriteTable_Unused_0},
-    {1, gMapObjectSubspriteTable_Unused_1},
-    {1, gMapObjectSubspriteTable_Unused_2},
-    {1, gMapObjectSubspriteTable_Unused_3},
-    {1, gMapObjectSubspriteTable_Unused_3}
+    {1, gEventObjectSubspriteTable_Unused_0},
+    {1, gEventObjectSubspriteTable_Unused_1},
+    {1, gEventObjectSubspriteTable_Unused_2},
+    {1, gEventObjectSubspriteTable_Unused_3},
+    {1, gEventObjectSubspriteTable_Unused_3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_CableCar_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_CableCar_0[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_CableCar_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_CableCar_1[] = {
     {-32, -32, 0, 3, 0, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_CableCar_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_CableCar_2[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_CableCar_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_CableCar_3[] = {
     {-32, -32, 0, 3, 0, 2}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_CableCar[] = {
+const struct SubspriteTable gEventObjectSubspriteTables_CableCar[] = {
     {0, NULL},
-    {1, gMapObjectSubspriteTable_CableCar_0},
-    {1, gMapObjectSubspriteTable_CableCar_1},
-    {1, gMapObjectSubspriteTable_CableCar_2},
-    {1, gMapObjectSubspriteTable_CableCar_3},
-    {1, gMapObjectSubspriteTable_CableCar_3}
+    {1, gEventObjectSubspriteTable_CableCar_0},
+    {1, gEventObjectSubspriteTable_CableCar_1},
+    {1, gEventObjectSubspriteTable_CableCar_2},
+    {1, gEventObjectSubspriteTable_CableCar_3},
+    {1, gEventObjectSubspriteTable_CableCar_3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SSTidal_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_SSTidal_0[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 1, 8, 2},
@@ -195,7 +195,7 @@ const struct Subsprite gMapObjectSubspriteTable_SSTidal_0[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SSTidal_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_SSTidal_1[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 1, 8, 1},
@@ -213,7 +213,7 @@ const struct Subsprite gMapObjectSubspriteTable_SSTidal_1[] = {
     { 16,  12, 1, 1, 56, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SSTidal_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_SSTidal_2[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 1, 8, 2},
@@ -231,7 +231,7 @@ const struct Subsprite gMapObjectSubspriteTable_SSTidal_2[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SSTidal_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_SSTidal_3[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 1, 8, 1},
@@ -249,16 +249,16 @@ const struct Subsprite gMapObjectSubspriteTable_SSTidal_3[] = {
     { 16,  12, 1, 1, 56, 2}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_SSTidal[] = {
-    {15, gMapObjectSubspriteTable_SSTidal_0},
-    {15, gMapObjectSubspriteTable_SSTidal_0},
-    {15, gMapObjectSubspriteTable_SSTidal_1},
-    {15, gMapObjectSubspriteTable_SSTidal_2},
-    {15, gMapObjectSubspriteTable_SSTidal_3},
-    {15, gMapObjectSubspriteTable_SSTidal_3}
+const struct SubspriteTable gEventObjectSubspriteTables_SSTidal[] = {
+    {15, gEventObjectSubspriteTable_SSTidal_0},
+    {15, gEventObjectSubspriteTable_SSTidal_0},
+    {15, gEventObjectSubspriteTable_SSTidal_1},
+    {15, gEventObjectSubspriteTable_SSTidal_2},
+    {15, gEventObjectSubspriteTable_SSTidal_3},
+    {15, gEventObjectSubspriteTable_SSTidal_3}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_0[] = {
+const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_0[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 0, 8, 2},
@@ -277,7 +277,7 @@ const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_0[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_1[] = {
+const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_1[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 0, 8, 1},
@@ -296,7 +296,7 @@ const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_1[] = {
     { 32,   4, 0, 0, 43, 1}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_2[] = {
+const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_2[] = {
     {-48, -20, 1, 1, 0, 2},
     {-16, -20, 1, 1, 4, 2},
     { 16, -20, 1, 0, 8, 2},
@@ -315,7 +315,7 @@ const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_2[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_3[] = {
+const struct Subsprite gEventObjectSubspriteTable_SubmarineShadow_3[] = {
     {-48, -20, 1, 1, 0, 1},
     {-16, -20, 1, 1, 4, 1},
     { 16, -20, 1, 0, 8, 1},
@@ -334,12 +334,12 @@ const struct Subsprite gMapObjectSubspriteTable_SubmarineShadow_3[] = {
     { 32,   4, 0, 0, 43, 2}
 };
 
-const struct SubspriteTable gMapObjectSubspriteTables_SubmarineShadow[] = {
-    {16, gMapObjectSubspriteTable_SubmarineShadow_0},
-    {16, gMapObjectSubspriteTable_SubmarineShadow_0},
-    {16, gMapObjectSubspriteTable_SubmarineShadow_1},
-    {16, gMapObjectSubspriteTable_SubmarineShadow_2},
-    {16, gMapObjectSubspriteTable_SubmarineShadow_3},
-    {16, gMapObjectSubspriteTable_SubmarineShadow_3}
+const struct SubspriteTable gEventObjectSubspriteTables_SubmarineShadow[] = {
+    {16, gEventObjectSubspriteTable_SubmarineShadow_0},
+    {16, gEventObjectSubspriteTable_SubmarineShadow_0},
+    {16, gEventObjectSubspriteTable_SubmarineShadow_1},
+    {16, gEventObjectSubspriteTable_SubmarineShadow_2},
+    {16, gEventObjectSubspriteTable_SubmarineShadow_3},
+    {16, gEventObjectSubspriteTable_SubmarineShadow_3}
 };
-#endif //POKERUBY_MAP_OBJECT_SUBSPRITES_H
+#endif //POKERUBY_EVENT_OBJECT_SUBSPRITES_H
diff --git a/src/data/field_event_obj/field_effect_object_graphics.h b/src/data/field_event_obj/field_effect_object_graphics.h
new file mode 100755
index 000000000..36850a4ec
--- /dev/null
+++ b/src/data/field_event_obj/field_effect_object_graphics.h
@@ -0,0 +1,149 @@
+#ifndef POKERUBY_FIELD_EFFECT_OBJECT_GFX_H
+#define POKERUBY_FIELD_EFFECT_OBJECT_GFX_H
+
+const u32 gFieldEffectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_small.4bpp");
+const u32 gFieldEffectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_medium.4bpp");
+const u32 gFieldEffectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_large.4bpp");
+const u32 gFieldEffectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_extra_large.4bpp");
+const u32 filler_8368A08[0x48] = {};
+const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effect_objects/pics/cut_grass.4bpp");
+const u32 FieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effect_objects/pics/cut_grass.4bpp");
+const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effect_objects/palettes/06.gbapal");
+const u32 gFieldEffectPic_Ripple_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/0.4bpp");
+const u32 gFieldEffectPic_Ripple_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/1.4bpp");
+const u32 gFieldEffectPic_Ripple_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/2.4bpp");
+const u32 gFieldEffectPic_Ripple_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/3.4bpp");
+const u32 gFieldEffectPic_Ripple_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/4.4bpp");
+const u32 gFieldEffectPic_Ash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/0.4bpp");
+const u32 gFieldEffectPic_Ash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/1.4bpp");
+const u32 gFieldEffectPic_Ash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/2.4bpp");
+const u32 gFieldEffectPic_Ash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/3.4bpp");
+const u32 gFieldEffectPic_Ash_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/4.4bpp");
+const u32 gFieldEffectPic_Arrow_0[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/0.4bpp");
+const u32 gFieldEffectPic_Arrow_1[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/1.4bpp");
+const u32 gFieldEffectPic_Arrow_2[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/2.4bpp");
+const u32 gFieldEffectPic_Arrow_3[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/3.4bpp");
+const u32 gFieldEffectPic_Arrow_4[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/4.4bpp");
+const u32 gFieldEffectPic_Arrow_5[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/5.4bpp");
+const u32 gFieldEffectPic_Arrow_6[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/6.4bpp");
+const u32 gFieldEffectPic_Arrow_7[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/7.4bpp");
+const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effect_objects/palettes/00.gbapal");
+const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effect_objects/palettes/01.gbapal");
+const u32 gFieldEffectPic_Dust_0[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/0.4bpp");
+const u32 gFieldEffectPic_Dust_1[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/1.4bpp");
+const u32 gFieldEffectPic_Dust_2[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/2.4bpp");
+const u32 unknown_8369588[] = INCBIN_U32("graphics/field_effect_objects/unknown.bin");
+const u32 gFieldEffectPic_JumpTallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/0.4bpp");
+const u32 gFieldEffectPic_JumpTallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/1.4bpp");
+const u32 gFieldEffectPic_JumpTallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/2.4bpp");
+const u32 gFieldEffectPic_JumpTallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp");
+const u32 UnusedGrass0[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/0.4bpp");
+const u32 UnusedGrass1[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/1.4bpp");
+const u32 UnusedGrass2[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/2.4bpp");
+const u32 UnusedGrass3[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/3.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/0.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/1.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/2.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/3.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/4.4bpp");
+const u32 UnusedGrassLong[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp");
+const u32 gFieldEffectPic_JumpLongGrass_5[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/5.4bpp");
+const u32 gFieldEffectPic_Unknown17_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/0.4bpp");
+const u32 gFieldEffectPic_Unknown17_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/1.4bpp");
+const u32 gFieldEffectPic_Unknown17_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/2.4bpp");
+const u32 gFieldEffectPic_Unknown17_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/3.4bpp");
+const u32 gFieldEffectPic_Unknown17_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/4.4bpp");
+const u32 gFieldEffectPic_Unknown17_5[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/5.4bpp");
+const u32 gFieldEffectPic_Unknown17_6[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/6.4bpp");
+const u32 gFieldEffectPic_Unknown17_7[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/7.4bpp");
+const u32 gFieldEffectPic_Unknown18_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/0.4bpp");
+const u32 gFieldEffectPic_Unknown18_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/1.4bpp");
+const u32 gFieldEffectPic_Unknown18_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/2.4bpp");
+const u32 gFieldEffectPic_Unknown18_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/3.4bpp");
+const u32 gFieldEffectPic_LongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/0.4bpp");
+const u32 gFieldEffectPic_LongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/1.4bpp");
+const u32 gFieldEffectPic_LongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/2.4bpp");
+const u32 gFieldEffectPic_LongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/3.4bpp");
+const u32 gFieldEffectPic_TallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/0.4bpp");
+const u32 gFieldEffectPic_TallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/1.4bpp");
+const u32 gFieldEffectPic_TallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/2.4bpp");
+const u32 gFieldEffectPic_TallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/3.4bpp");
+const u32 gFieldEffectPic_TallGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/4.4bpp");
+const u32 gFieldEffectPic_ShortGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/0.4bpp");
+const u32 gFieldEffectPic_ShortGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/1.4bpp");
+const u32 gFieldEffectPic_SandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/0.4bpp");
+const u32 gFieldEffectPic_SandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/1.4bpp");
+const u32 gFieldEffectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/0.4bpp");
+const u32 gFieldEffectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/1.4bpp");
+const u32 gFieldEffectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/0.4bpp");
+const u32 gFieldEffectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/1.4bpp");
+const u32 gFieldEffectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/2.4bpp");
+const u32 gFieldEffectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/3.4bpp");
+const u32 gFieldEffectPic_Unknown19_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/0.4bpp");
+const u32 gFieldEffectPic_Unknown19_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/1.4bpp");
+const u32 gFieldEffectPic_Unknown19_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/2.4bpp");
+const u32 gFieldEffectPic_Unknown19_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/3.4bpp");
+const u32 gFieldEffectPic_SandPile_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/0.4bpp");
+const u32 gFieldEffectPic_SandPile_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/1.4bpp");
+const u32 gFieldEffectPic_SandPile_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/2.4bpp");
+const u32 gFieldEffectPic_JumpBigSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/0.4bpp");
+const u32 gFieldEffectPic_JumpBigSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/1.4bpp");
+const u32 gFieldEffectPic_JumpBigSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/2.4bpp");
+const u32 gFieldEffectPic_JumpBigSplash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/3.4bpp");
+const u32 gFieldEffectPic_Splash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/0.4bpp");
+const u32 gFieldEffectPic_Splash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/1.4bpp");
+const u32 gFieldEffectPic_JumpSmallSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/0.4bpp");
+const u32 gFieldEffectPic_JumpSmallSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/1.4bpp");
+const u32 gFieldEffectPic_JumpSmallSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/2.4bpp");
+const u32 gFieldEffectPic_Unknown20_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/0.4bpp");
+const u32 gFieldEffectPic_Unknown20_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/1.4bpp");
+const u32 gFieldEffectPic_Unknown20_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/2.4bpp");
+const u32 gFieldEffectPic_Unknown20_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/3.4bpp");
+const u32 gFieldEffectPic_Unknown20_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/4.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/0.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/1.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/2.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/3.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/4.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/5.4bpp");
+const u32 gFieldEffectPic_TreeDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/6.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/0.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/1.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/2.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/3.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/4.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/5.4bpp");
+const u32 gFieldEffectPic_MountainDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/6.4bpp");
+const u32 gFieldEffectPic_SandDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/0.4bpp");
+const u32 gFieldEffectPic_SandDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/1.4bpp");
+const u32 gFieldEffectPic_SandDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/2.4bpp");
+const u32 gFieldEffectPic_SandDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/3.4bpp");
+const u32 gFieldEffectPic_SandDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/4.4bpp");
+const u32 gFieldEffectPic_SandDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/5.4bpp");
+const u32 gFieldEffectPic_SandDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/6.4bpp");
+const u32 gFieldEffectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effect_objects/pics/hot_springs_water.4bpp");
+const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effect_objects/palettes/02.gbapal");
+const u32 gFieldEffectPic_PopOutOfAsh_0[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/0.4bpp");
+const u32 gFieldEffectPic_PopOutOfAsh_1[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/1.4bpp");
+const u32 gFieldEffectPic_PopOutOfAsh_2[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/2.4bpp");
+const u32 gFieldEffectPic_PopOutOfAsh_3[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/3.4bpp");
+const u32 gFieldEffectPic_PopOutOfAsh_4[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp");
+const u32 gFieldEffectPic_LavaridgeGymWarp_0[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/0.4bpp");
+const u32 gFieldEffectPic_LavaridgeGymWarp_1[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/1.4bpp");
+const u32 gFieldEffectPic_LavaridgeGymWarp_2[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/2.4bpp");
+const u32 gFieldEffectPic_LavaridgeGymWarp_3[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/3.4bpp");
+const u32 gFieldEffectPic_LavaridgeGymWarp_4[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/4.4bpp");
+const u32 gFieldEffectPic_Bubbles_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/0.4bpp");
+const u32 gFieldEffectPic_Bubbles_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/1.4bpp");
+const u32 gFieldEffectPic_Bubbles_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/2.4bpp");
+const u32 gFieldEffectPic_Bubbles_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/3.4bpp");
+const u32 gFieldEffectPic_Bubbles_4[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/4.4bpp");
+const u32 gFieldEffectPic_Bubbles_5[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/5.4bpp");
+const u32 gFieldEffectPic_Bubbles_6[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/6.4bpp");
+const u32 gFieldEffectPic_Bubbles_7[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/7.4bpp");
+const u32 gFieldEffectPic_Sparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/0.4bpp");
+const u32 gFieldEffectPic_Sparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/1.4bpp");
+const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effect_objects/palettes/03.gbapal");
+const u32 gFieldEffectPic_Bird[] = INCBIN_U32("graphics/field_effect_objects/pics/bird.4bpp");
+
+#endif // POKERUBY_FIELD_EFFECT_OBJECT_GFX_H
diff --git a/src/data/field_map_obj/field_effect_object_template_pointers.h b/src/data/field_event_obj/field_effect_object_template_pointers.h
index 320af1ff8..320af1ff8 100644
--- a/src/data/field_map_obj/field_effect_object_template_pointers.h
+++ b/src/data/field_event_obj/field_effect_object_template_pointers.h
diff --git a/src/data/field_map_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index 9d3ae343d..9d3ae343d 100644
--- a/src/data/field_map_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
diff --git a/src/data/field_event_obj/movement_action_func_tables.h b/src/data/field_event_obj/movement_action_func_tables.h
new file mode 100644
index 000000000..819545343
--- /dev/null
+++ b/src/data/field_event_obj/movement_action_func_tables.h
@@ -0,0 +1,1356 @@
+#ifndef POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
+#define POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
+
+u8 MovementAction_FaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PauseSpriteAnim(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay1_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_Finish(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay2_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay4_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay8_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_Delay16_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_StartAnimInDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WaitSpriteAnim(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_FacePlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_LockFacingDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_DisableAnimation_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RestoreAnimation_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetInvisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetVisible_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_EmoteHeart_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RevealTrainer_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_RockSmashBreak_Step2(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_CutTree_Step2(struct EventObject *, struct Sprite *);
+u8 MovementAction_SetFixedPriority_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ClearFixedPriority_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_InitAffineAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_ClearAffineAnim_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine0_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine1_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_WalkInPlace_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *, struct Sprite *);
+u8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
+
+u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *);
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *);
+
+u8 (*const *const gMovementActionFuncs[])(struct EventObject *, struct Sprite *) = {
+    gMovementActionFuncs_FaceDown,                // MOVEMENT_ACTION_FACE_DOWN
+    gMovementActionFuncs_FaceUp,                  // MOVEMENT_ACTION_FACE_UP
+    gMovementActionFuncs_FaceLeft,                // MOVEMENT_ACTION_FACE_LEFT
+    gMovementActionFuncs_FaceRight,               // MOVEMENT_ACTION_FACE_RIGHT
+    gMovementActionFuncs_WalkSlowDown,            // MOVEMENT_ACTION_WALK_DOWN_SLOW
+    gMovementActionFuncs_WalkSlowUp,              // MOVEMENT_ACTION_WALK_UP_SLOW
+    gMovementActionFuncs_WalkSlowLeft,            // MOVEMENT_ACTION_WALK_LEFT_SLOW
+    gMovementActionFuncs_WalkSlowRight,           // MOVEMENT_ACTION_WALK_RIGHT_SLOW
+    gMovementActionFuncs_WalkNormalDown,          // MOVEMENT_ACTION_WALK_DOWN_NORMAL
+    gMovementActionFuncs_WalkNormalUp,            // MOVEMENT_ACTION_WALK_UP_NORMAL
+    gMovementActionFuncs_WalkNormalLeft,          // MOVEMENT_ACTION_WALK_LEFT_NORMAL
+    gMovementActionFuncs_WalkNormalRight,         // MOVEMENT_ACTION_WALK_RIGHT_NORMAL
+    gMovementActionFuncs_Jump2Down,               // MOVEMENT_ACTION_JUMP_2_DOWN
+    gMovementActionFuncs_Jump2Up,                 // MOVEMENT_ACTION_JUMP_2_UP
+    gMovementActionFuncs_Jump2Left,               // MOVEMENT_ACTION_JUMP_2_LEFT
+    gMovementActionFuncs_Jump2Right,              // MOVEMENT_ACTION_JUMP_2_RIGHT
+    gMovementActionFuncs_Delay1,                  // MOVEMENT_ACTION_DELAY_1
+    gMovementActionFuncs_Delay2,                  // MOVEMENT_ACTION_DELAY_2
+    gMovementActionFuncs_Delay4,                  // MOVEMENT_ACTION_DELAY_4
+    gMovementActionFuncs_Delay8,                  // MOVEMENT_ACTION_DELAY_8
+    gMovementActionFuncs_Delay16,                 // MOVEMENT_ACTION_DELAY_16
+    gMovementActionFuncs_WalkFastDown,            // MOVEMENT_ACTION_WALK_FAST_DOWN
+    gMovementActionFuncs_WalkFastUp,              // MOVEMENT_ACTION_WALK_FAST_UP
+    gMovementActionFuncs_WalkFastLeft,            // MOVEMENT_ACTION_WALK_FAST_LEFT
+    gMovementActionFuncs_WalkFastRight,           // MOVEMENT_ACTION_WALK_FAST_RIGHT
+    gMovementActionFuncs_WalkInPlaceSlowDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
+    gMovementActionFuncs_WalkInPlaceSlowUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
+    gMovementActionFuncs_WalkInPlaceSlowLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
+    gMovementActionFuncs_WalkInPlaceSlowRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
+    gMovementActionFuncs_WalkInPlaceNormalDown,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
+    gMovementActionFuncs_WalkInPlaceNormalUp,     // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
+    gMovementActionFuncs_WalkInPlaceNormalLeft,   // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
+    gMovementActionFuncs_WalkInPlaceNormalRight,  // MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
+    gMovementActionFuncs_WalkInPlaceFastDown,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
+    gMovementActionFuncs_WalkInPlaceFastUp,       // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
+    gMovementActionFuncs_WalkInPlaceFastLeft,     // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
+    gMovementActionFuncs_WalkInPlaceFastRight,    // MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
+    gMovementActionFuncs_WalkInPlaceFastestDown,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN
+    gMovementActionFuncs_WalkInPlaceFastestUp,    // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP
+    gMovementActionFuncs_WalkInPlaceFastestLeft,  // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT
+    gMovementActionFuncs_WalkInPlaceFastestRight, // MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT
+    gMovementActionFuncs_RideWaterCurrentDown,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
+    gMovementActionFuncs_RideWaterCurrentUp,      // MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
+    gMovementActionFuncs_RideWaterCurrentLeft,    // MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
+    gMovementActionFuncs_RideWaterCurrentRight,   // MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
+    gMovementActionFuncs_WalkFastestDown,         // MOVEMENT_ACTION_WALK_FASTEST_DOWN
+    gMovementActionFuncs_WalkFastestUp,           // MOVEMENT_ACTION_WALK_FASTEST_UP
+    gMovementActionFuncs_WalkFastestLeft,         // MOVEMENT_ACTION_WALK_FASTEST_LEFT
+    gMovementActionFuncs_WalkFastestRight,        // MOVEMENT_ACTION_WALK_FASTEST_RIGHT
+    gMovementActionFuncs_SlideDown,               // MOVEMENT_ACITON_SLIDE_DOWN
+    gMovementActionFuncs_SlideUp,                 // MOVEMENT_ACITON_SLIDE_UP
+    gMovementActionFuncs_SlideLeft,               // MOVEMENT_ACITON_SLIDE_LEFT
+    gMovementActionFuncs_SlideRight,              // MOVEMENT_ACITON_SLIDE_RIGHT
+    gMovementActionFuncs_PlayerRunDown,           // MOVEMENT_ACTION_PLAYER_RUN_DOWN
+    gMovementActionFuncs_PlayerRunUp,             // MOVEMENT_ACTION_PLAYER_RUN_UP
+    gMovementActionFuncs_PlayerRunLeft,           // MOVEMENT_ACTION_PLAYER_RUN_LEFT
+    gMovementActionFuncs_PlayerRunRight,          // MOVEMENT_ACTION_PLAYER_RUN_RIGHT
+    gMovementActionFuncs_StartAnimInDirection,    // MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
+    gMovementActionFuncs_JumpSpecialDown,         // MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
+    gMovementActionFuncs_JumpSpecialUp,           // MOVEMENT_ACTION_JUMP_SPECIAL_UP
+    gMovementActionFuncs_JumpSpecialLeft,         // MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
+    gMovementActionFuncs_JumpSpecialRight,        // MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
+    gMovementActionFuncs_FacePlayer,              // MOVEMENT_ACTION_FACE_PLAYER
+    gMovementActionFuncs_FaceAwayPlayer,          // MOVEMENT_ACTION_FACE_AWAY_PLAYER
+    gMovementActionFuncs_LockFacingDirection,     // MOVEMENT_ACTION_LOCK_FACING_DIRECTION
+    gMovementActionFuncs_UnlockFacingDirection,   // MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
+    gMovementActionFuncs_JumpDown,                // MOVEMENT_ACITON_JUMP_DOWN
+    gMovementActionFuncs_JumpUp,                  // MOVEMENT_ACITON_JUMP_UP
+    gMovementActionFuncs_JumpLeft,                // MOVEMENT_ACITON_JUMP_LEFT
+    gMovementActionFuncs_JumpRight,               // MOVEMENT_ACITON_JUMP_RIGHT
+    gMovementActionFuncs_JumpInPlaceDown,         // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
+    gMovementActionFuncs_JumpInPlaceUp,           // MOVEMENT_ACTION_JUMP_IN_PLACE_UP
+    gMovementActionFuncs_JumpInPlaceLeft,         // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
+    gMovementActionFuncs_JumpInPlaceRight,        // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
+    gMovementActionFuncs_JumpInPlaceDownUp,       // MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
+    gMovementActionFuncs_JumpInPlaceUpDown,       // MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
+    gMovementActionFuncs_JumpInPlaceLeftRight,    // MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
+    gMovementActionFuncs_JumpInPlaceRightLeft,    // MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
+    gMovementActionFuncs_FaceOriginalDirection,   // MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
+    gMovementActionFuncs_NurseJoyBowDown,         // MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
+    gMovementActionFuncs_EnableJumpLandingGroundEffect,  // MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
+    gMovementActionFuncs_DisableJumpLandingGroundEffect, // MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
+    gMovementActionFuncs_DisableAnimation,        // MOVEMENT_ACTION_DISABLE_ANIMATION
+    gMovementActionFuncs_RestoreAnimation,        // MOVEMENT_ACTION_RESTORE_ANIMATION
+    gMovementActionFuncs_SetInvisible,            // MOVEMENT_ACTION_SET_INVISIBLE
+    gMovementActionFuncs_SetVisible,              // MOVEMENT_ACTION_SET_VISIBLE
+    gMovementActionFuncs_EmoteExclamationMark,    // MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
+    gMovementActionFuncs_EmoteQuestionMark,       // MOVEMENT_ACTION_EMOTE_QUESTION_MARK
+    gMovementActionFuncs_EmoteHeart,              // MOVEMENT_ACTION_EMOTE_HEART
+    gMovementActionFuncs_RevealTrainer,           // MOVEMENT_ACTION_REVEAL_TRAINER
+    gMovementActionFuncs_RockSmashBreak,          // MOVEMENT_ACTION_ROCK_SMASH_BREAK
+    gMovementActionFuncs_CutTree,                 // MOVEMENT_ACTION_CUT_TREE
+    gMovementActionFuncs_SetFixedPriority,        // MOVEMENT_ACTION_SET_FIXED_PRIORITY
+    gMovementActionFuncs_ClearFixedPriority,      // MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
+    gMovementActionFuncs_InitAffineAnim,          // MOVEMENT_ACTION_INIT_AFFINE_ANIM
+    gMovementActionFuncs_ClearAffineAnim,         // MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
+    gMovementActionFuncs_WalkDownAffine0,         // MOVEMENT_ACTION_WALK_DOWN_AFFINE_0
+    gMovementActionFuncs_WalkDownAffine1,         // MOVEMENT_ACTION_WALK_DOWN_AFFINE_1
+    gMovementActionFuncs_AcroWheelieFaceDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
+    gMovementActionFuncs_AcroWheelieFaceUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
+    gMovementActionFuncs_AcroWheelieFaceLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
+    gMovementActionFuncs_AcroWheelieFaceRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
+    gMovementActionFuncs_AcroPopWheelieDown,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
+    gMovementActionFuncs_AcroPopWheelieUp,        // MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
+    gMovementActionFuncs_AcroPopWheelieLeft,      // MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
+    gMovementActionFuncs_AcroPopWheelieRight,     // MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
+    gMovementActionFuncs_AcroEndWheelieFaceDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN
+    gMovementActionFuncs_AcroEndWheelieFaceUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
+    gMovementActionFuncs_AcroEndWheelieFaceLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
+    gMovementActionFuncs_AcroEndWheelieFaceRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
+    gMovementActionFuncs_AcroWheelieHopFaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
+    gMovementActionFuncs_AcroWheelieHopFaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
+    gMovementActionFuncs_AcroWheelieHopFaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
+    gMovementActionFuncs_AcroWheelieHopFaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
+    gMovementActionFuncs_AcroWheelieHopDown,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
+    gMovementActionFuncs_AcroWheelieHopUp,        // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
+    gMovementActionFuncs_AcroWheelieHopLeft,      // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
+    gMovementActionFuncs_AcroWheelieHopRight,     // MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
+    gMovementActionFuncs_AcroWheelieJumpDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
+    gMovementActionFuncs_AcroWheelieJumpUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
+    gMovementActionFuncs_AcroWheelieJumpLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
+    gMovementActionFuncs_AcroWheelieJumpRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
+    gMovementActionFuncs_AcroWheelieInPlaceDown,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
+    gMovementActionFuncs_AcroWheelieInPlaceUp,    // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
+    gMovementActionFuncs_AcroWheelieInPlaceLeft,  // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
+    gMovementActionFuncs_AcroWheelieInPlaceRight, // MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
+    gMovementActionFuncs_AcroPopWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
+    gMovementActionFuncs_AcroPopWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
+    gMovementActionFuncs_AcroPopWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
+    gMovementActionFuncs_AcroPopWheelieMoveRight, // MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
+    gMovementActionFuncs_AcroWheelieMoveDown,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
+    gMovementActionFuncs_AcroWheelieMoveUp,       // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
+    gMovementActionFuncs_AcroWheelieMoveLeft,     // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
+    gMovementActionFuncs_AcroWheelieMoveRight,    // MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
+    gMovementActionFuncs_AcroEndWheelieMoveDown,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN
+    gMovementActionFuncs_AcroEndWheelieMoveUp,    // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP
+    gMovementActionFuncs_AcroEndWheelieMoveLeft,  // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT
+    gMovementActionFuncs_AcroEndWheelieMoveRight, // MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT
+};
+
+
+u8 (*const gMovementActionFuncs_FaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceDown_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceUp_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceLeft_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceRight_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gUnknown_083759C0[])(u8) = {
+    GetMoveDirectionAnimNum,
+    GetMoveDirectionFastAnimNum,
+    GetMoveDirectionFastAnimNum,
+    GetMoveDirectionFasterAnimNum,
+    GetMoveDirectionFastestAnimNum
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkSlowDown_Step0,
+    MovementAction_WalkSlowDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkSlowUp_Step0,
+    MovementAction_WalkSlowUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkSlowLeft_Step0,
+    MovementAction_WalkSlowLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkSlowRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkSlowRight_Step0,
+    MovementAction_WalkSlowRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkNormalDown_Step0,
+    MovementAction_WalkNormalDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkNormalUp_Step0,
+    MovementAction_WalkNormalUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkNormalLeft_Step0,
+    MovementAction_WalkNormalLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkNormalRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkNormalRight_Step0,
+    MovementAction_WalkNormalRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+const s16 gUnknown_08375A34[] = {0, 1, 1};
+const s16 gUnknown_08375A3A[] = {0, 0, 1};
+
+u8 (*const gMovementActionFuncs_Jump2Down[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Jump2Down_Step0,
+    MovementAction_Jump2Down_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_Jump2Up[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Jump2Up_Step0,
+    MovementAction_Jump2Up_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_Jump2Left[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Jump2Left_Step0,
+    MovementAction_Jump2Left_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_Jump2Right[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Jump2Right_Step0,
+    MovementAction_Jump2Right_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_Delay1[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Delay1_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_Delay2[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Delay2_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_Delay4[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Delay4_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_Delay8[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Delay8_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_Delay16[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_Delay16_Step0,
+    MovementAction_Delay_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_WalkFastDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastDown_Step0,
+    MovementAction_WalkFastDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastUp_Step0,
+    MovementAction_WalkFastUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastLeft_Step0,
+    MovementAction_WalkFastLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastRight_Step0,
+    MovementAction_WalkFastRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowDown_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowUp_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowLeft_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceSlowRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceSlowRight_Step0,
+    MovementAction_WalkInPlaceSlow_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceNormalRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceNormalRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkInPlaceFastestRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkInPlaceFastestRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentDown_Step0,
+    MovementAction_RideWaterCurrentDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentUp_Step0,
+    MovementAction_RideWaterCurrentUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentLeft_Step0,
+    MovementAction_RideWaterCurrentLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_RideWaterCurrentRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RideWaterCurrentRight_Step0,
+    MovementAction_RideWaterCurrentRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastestDown_Step0,
+    MovementAction_WalkFastestDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastestUp_Step0,
+    MovementAction_WalkFastestUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastestLeft_Step0,
+    MovementAction_WalkFastestLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkFastestRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkFastestRight_Step0,
+    MovementAction_WalkFastestRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_SlideDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SlideDown_Step0,
+    MovementAction_SlideDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_SlideUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SlideUp_Step0,
+    MovementAction_SlideUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_SlideLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SlideLeft_Step0,
+    MovementAction_SlideLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_SlideRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SlideRight_Step0,
+    MovementAction_SlideRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_PlayerRunDown_Step0,
+    MovementAction_PlayerRunDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_PlayerRunUp_Step0,
+    MovementAction_PlayerRunUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_PlayerRunLeft_Step0,
+    MovementAction_PlayerRunLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_PlayerRunRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_PlayerRunRight_Step0,
+    MovementAction_PlayerRunRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_StartAnimInDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_StartAnimInDirection_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialDown_Step0,
+    MovementAction_JumpSpecialDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialUp_Step0,
+    MovementAction_JumpSpecialUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialLeft_Step0,
+    MovementAction_JumpSpecialLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpSpecialRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpSpecialRight_Step0,
+    MovementAction_JumpSpecialRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FacePlayer[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FacePlayer_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FaceAwayPlayer[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceAwayPlayer_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_LockFacingDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_LockFacingDirection_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_UnlockFacingDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_UnlockFacingDirection_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpDown_Step0,
+    MovementAction_JumpDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpUp_Step0,
+    MovementAction_JumpUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpLeft_Step0,
+    MovementAction_JumpLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpRight_Step0,
+    MovementAction_JumpRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceDown_Step0,
+    MovementAction_JumpInPlaceDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceUp_Step0,
+    MovementAction_JumpInPlaceUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceLeft_Step0,
+    MovementAction_JumpInPlaceLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceRight_Step0,
+    MovementAction_JumpInPlaceRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceDownUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceDownUp_Step0,
+    MovementAction_JumpInPlaceDownUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceUpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceUpDown_Step0,
+    MovementAction_JumpInPlaceUpDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceLeftRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceLeftRight_Step0,
+    MovementAction_JumpInPlaceLeftRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_JumpInPlaceRightLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_JumpInPlaceRightLeft_Step0,
+    MovementAction_JumpInPlaceRightLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_FaceOriginalDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_FaceOriginalDirection_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_NurseJoyBowDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_NurseJoyBowDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_EnableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_EnableJumpLandingGroundEffect_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_DisableJumpLandingGroundEffect[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_DisableJumpLandingGroundEffect_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_DisableAnimation[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_DisableAnimation_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_RestoreAnimation[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RestoreAnimation_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_SetInvisible[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SetInvisible_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_SetVisible[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SetVisible_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_EmoteExclamationMark[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_EmoteExclamationMark_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_EmoteQuestionMark[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_EmoteQuestionMark_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_EmoteHeart[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_EmoteHeart_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_RevealTrainer[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RevealTrainer_Step0,
+    MovementAction_RevealTrainer_Step1,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_RockSmashBreak[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_RockSmashBreak_Step0,
+    MovementAction_RockSmashBreak_Step1,
+    MovementAction_RockSmashBreak_Step2,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_CutTree[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_CutTree_Step0,
+    MovementAction_CutTree_Step1,
+    MovementAction_CutTree_Step2,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_SetFixedPriority[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_SetFixedPriority_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_ClearFixedPriority[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_ClearFixedPriority_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_InitAffineAnim[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_InitAffineAnim_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_ClearAffineAnim[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_ClearAffineAnim_Step0,
+    MovementAction_Finish
+};
+
+u8 (*const gMovementActionFuncs_WalkDownAffine0[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkDownAffine0_Step0,
+    MovementAction_WalkDownAffine0_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_WalkDownAffine1[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_WalkDownAffine1_Step0,
+    MovementAction_WalkDownAffine1_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceDown_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceUp_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceLeft_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieFaceRight_Step0,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieFaceDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieFaceUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieFaceLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieFaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieFaceRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_UnusedAcroActionDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_UnusedAcroActionDown_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_UnusedAcroActionUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_UnusedAcroActionUp_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_UnusedAcroActionLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_UnusedAcroActionLeft_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_UnusedAcroActionRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_UnusedAcroActionRight_Step0,
+    MovementAction_WaitSpriteAnim,
+    MovementAction_PauseSpriteAnim,
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceDown_Step0,
+    MovementAction_AcroWheelieHopFaceDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceUp_Step0,
+    MovementAction_AcroWheelieHopFaceUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceLeft_Step0,
+    MovementAction_AcroWheelieHopFaceLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopFaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopFaceRight_Step0,
+    MovementAction_AcroWheelieHopFaceRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopDown_Step0,
+    MovementAction_AcroWheelieHopDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopUp_Step0,
+    MovementAction_AcroWheelieHopUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopLeft_Step0,
+    MovementAction_AcroWheelieHopLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieHopRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieHopRight_Step0,
+    MovementAction_AcroWheelieHopRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpDown_Step0,
+    MovementAction_AcroWheelieJumpDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpUp_Step0,
+    MovementAction_AcroWheelieJumpUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpLeft_Step0,
+    MovementAction_AcroWheelieJumpLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieJumpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieJumpRight_Step0,
+    MovementAction_AcroWheelieJumpRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceDown_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceUp_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceLeft_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieInPlaceRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieInPlaceRight_Step0,
+    MovementAction_WalkInPlace_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveDown_Step0,
+    MovementAction_AcroPopWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveUp_Step0,
+    MovementAction_AcroPopWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveLeft_Step0,
+    MovementAction_AcroPopWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroPopWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroPopWheelieMoveRight_Step0,
+    MovementAction_AcroPopWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveDown_Step0,
+    MovementAction_AcroWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveUp_Step0,
+    MovementAction_AcroWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveLeft_Step0,
+    MovementAction_AcroWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroWheelieMoveRight_Step0,
+    MovementAction_AcroWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveDown[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieMoveDown_Step0,
+    MovementAction_AcroEndWheelieMoveDown_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveUp[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieMoveUp_Step0,
+    MovementAction_AcroEndWheelieMoveUp_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieMoveLeft_Step0,
+    MovementAction_AcroEndWheelieMoveLeft_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+u8 (*const gMovementActionFuncs_AcroEndWheelieMoveRight[])(struct EventObject *, struct Sprite *) = {
+    MovementAction_AcroEndWheelieMoveRight_Step0,
+    MovementAction_AcroEndWheelieMoveRight_Step1,
+    MovementAction_PauseSpriteAnim
+};
+
+#endif //POKERUBY_MOVEMENT_ACTION_FUNC_TABLES_H
diff --git a/src/data/field_event_obj/movement_type_func_tables.h b/src/data/field_event_obj/movement_type_func_tables.h
new file mode 100644
index 000000000..ccbdac99c
--- /dev/null
+++ b/src/data/field_event_obj/movement_type_func_tables.h
@@ -0,0 +1,438 @@
+#ifndef POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
+#define POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
+
+u8 (*const gMovementTypeFuncs_WanderAround[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderAround_Step0,
+    MovementType_WanderAround_Step1,
+    MovementType_WanderAround_Step2,
+    MovementType_WanderAround_Step3,
+    MovementType_WanderAround_Step4,
+    MovementType_WanderAround_Step5,
+    MovementType_WanderAround_Step6
+};
+
+const u8 gStandardDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST};
+
+u8 (*const gGetVectorDirectionFuncs[])(s16, s16, s16, s16) = {
+    GetVectorDirection,
+    GetLimitedVectorDirection_SouthNorth,
+    GetLimitedVectorDirection_WestEast,
+    GetLimitedVectorDirection_WestNorth,
+    GetLimitedVectorDirection_EastNorth,
+    GetLimitedVectorDirection_WestSouth,
+    GetLimitedVectorDirection_EastSouth,
+    GetLimitedVectorDirection_SouthNorthWest,
+    GetLimitedVectorDirection_SouthNorthEast,
+    GetLimitedVectorDirection_NorthWestEast,
+    GetLimitedVectorDirection_SouthWestEast
+};
+
+u8 (*const gMovementTypeFuncs_LookAround[])(struct EventObject *, struct Sprite *) = {
+    MovementType_LookAround_Step0,
+    MovementType_LookAround_Step1,
+    MovementType_LookAround_Step2,
+    MovementType_LookAround_Step3,
+    MovementType_LookAround_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_WanderUpAndDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderUpAndDown_Step0,
+    MovementType_WanderUpAndDown_Step1,
+    MovementType_WanderUpAndDown_Step2,
+    MovementType_WanderUpAndDown_Step3,
+    MovementType_WanderUpAndDown_Step4,
+    MovementType_WanderUpAndDown_Step5,
+    MovementType_WanderUpAndDown_Step6,
+};
+
+const u8 gUpAndDownDirections[] = {DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WanderLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WanderLeftAndRight_Step0,
+    MovementType_WanderLeftAndRight_Step1,
+    MovementType_WanderLeftAndRight_Step2,
+    MovementType_WanderLeftAndRight_Step3,
+    MovementType_WanderLeftAndRight_Step4,
+    MovementType_WanderLeftAndRight_Step5,
+    MovementType_WanderLeftAndRight_Step6,
+};
+
+const u8 gLeftAndRightDirections[] = {DIR_WEST, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDirection[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDirection_Step0,
+    MovementType_FaceDirection_Step1,
+    MovementType_FaceDirection_Step2,
+};
+
+u8 (*const gMovementTypeFuncs_BerryTreeGrowth[])(struct EventObject *, struct Sprite *) = {
+    MovementType_BerryTreeGrowth_Step0,
+    MovementType_BerryTreeGrowth_Step1,
+    MovementType_BerryTreeGrowth_Step2,
+    MovementType_BerryTreeGrowth_Step3,
+    MovementType_BerryTreeGrowth_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndUp_Step0,
+    MovementType_FaceDownAndUp_Step1,
+    MovementType_FaceDownAndUp_Step2,
+    MovementType_FaceDownAndUp_Step3,
+    MovementType_FaceDownAndUp_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceLeftAndRight_Step0,
+    MovementType_FaceLeftAndRight_Step1,
+    MovementType_FaceLeftAndRight_Step2,
+    MovementType_FaceLeftAndRight_Step3,
+    MovementType_FaceLeftAndRight_Step4,
+};
+
+u8 (*const gMovementTypeFuncs_FaceUpAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpAndLeft_Step0,
+    MovementType_FaceUpAndLeft_Step1,
+    MovementType_FaceUpAndLeft_Step2,
+    MovementType_FaceUpAndLeft_Step3,
+    MovementType_FaceUpAndLeft_Step4,
+};
+
+const u8 gUpAndLeftDirections[] = {DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_FaceUpAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpAndRight_Step0,
+    MovementType_FaceUpAndRight_Step1,
+    MovementType_FaceUpAndRight_Step2,
+    MovementType_FaceUpAndRight_Step3,
+    MovementType_FaceUpAndRight_Step4,
+};
+
+const u8 gUpAndRightDirections[] = {DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndLeft_Step0,
+    MovementType_FaceDownAndLeft_Step1,
+    MovementType_FaceDownAndLeft_Step2,
+    MovementType_FaceDownAndLeft_Step3,
+    MovementType_FaceDownAndLeft_Step4,
+};
+
+const u8 gDownAndLeftDirections[] = {DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_FaceDownAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownAndRight_Step0,
+    MovementType_FaceDownAndRight_Step1,
+    MovementType_FaceDownAndRight_Step2,
+    MovementType_FaceDownAndRight_Step3,
+    MovementType_FaceDownAndRight_Step4,
+};
+
+const u8 gDownAndRightDirections[] = {DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_FaceDownUpAndLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownUpAndLeft_Step0,
+    MovementType_FaceDownUpAndLeft_Step1,
+    MovementType_FaceDownUpAndLeft_Step2,
+    MovementType_FaceDownUpAndLeft_Step3,
+    MovementType_FaceDownUpAndLeft_Step4,
+};
+
+const u8 gDownUpAndLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_FaceDownUpAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownUpAndRight_Step0,
+    MovementType_FaceDownUpAndRight_Step1,
+    MovementType_FaceDownUpAndRight_Step2,
+    MovementType_FaceDownUpAndRight_Step3,
+    MovementType_FaceDownUpAndRight_Step4,
+};
+
+const u8 gDownUpAndRightDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_FaceUpLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceUpLeftAndRight_Step0,
+    MovementType_FaceUpLeftAndRight_Step1,
+    MovementType_FaceUpLeftAndRight_Step2,
+    MovementType_FaceUpLeftAndRight_Step3,
+    MovementType_FaceUpLeftAndRight_Step4,
+};
+
+const u8 gUpLeftAndRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_FaceDownLeftAndRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_FaceDownLeftAndRight_Step0,
+    MovementType_FaceDownLeftAndRight_Step1,
+    MovementType_FaceDownLeftAndRight_Step2,
+    MovementType_FaceDownLeftAndRight_Step3,
+    MovementType_FaceDownLeftAndRight_Step4,
+};
+
+const u8 gDownLeftAndRightDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_RotateCounterclockwise[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RotateCounterclockwise_Step0,
+    MovementType_RotateCounterclockwise_Step1,
+    MovementType_RotateCounterclockwise_Step2,
+    MovementType_RotateCounterclockwise_Step3,
+};
+
+const u8 gCounterclockwiseDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_RotateClockwise[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RotateClockwise_Step0,
+    MovementType_RotateClockwise_Step1,
+    MovementType_RotateClockwise_Step2,
+    MovementType_RotateClockwise_Step3,
+};
+
+const u8 gClockwiseDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkBackAndForth[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkBackAndForth_Step0,
+    MovementType_WalkBackAndForth_Step1,
+    MovementType_WalkBackAndForth_Step2,
+    MovementType_WalkBackAndForth_Step3,
+};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpRightLeftDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpRightLeftDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpRightLeftDownDirections[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftDownUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightLeftDownUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightLeftDownUpDirections[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownUpRightLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownUpRightLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gDownUpRightLeftDirections[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownUpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftDownUpRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftDownUpRightDirections[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftRightDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpLeftRightDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpLeftRightDownDirections[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightDownUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftRightDownUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftRightDownUpDirections[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownUpLeftRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownUpLeftRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightDownUpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightDownUpLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightDownUpLeftDirections[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpDownRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftUpDownRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftUpDownRightDirections[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpDownRightLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpDownRightLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpDownRightLeftDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightLeftUpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightLeftUpDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightLeftUpDownDirections[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownRightLeftUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownRightLeftUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gDownRightLeftUpDirections[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightUpDownLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightUpDownLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightUpDownLeftDirections[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpDownLeftRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpDownLeftRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpDownLeftRightDirections[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftRightUpDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftRightUpDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftRightUpDownDirections[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftRightUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownLeftRightUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gDownLeftRightUpDirections[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpLeftDownRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpLeftDownRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpLeftDownRightDirections[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownRightUpLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownRightUpLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gDownRightUpLeftDirections[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftDownRightUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftDownRightUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftDownRightUpDirections[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightUpLeftDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightUpLeftDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightUpLeftDownDirections[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceUpRightDownLeft[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceUpRightDownLeft_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gUpRightDownLeftDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceDownLeftUpRight[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceDownLeftUpRight_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gDownLeftUpRightDirections[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceLeftUpRightDown[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceLeftUpRightDown_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gLeftUpRightDownDirections[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH};
+
+u8 (*const gMovementTypeFuncs_WalkSequenceRightDownLeftUp[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkSequence_Step0,
+    MovementType_WalkSequenceRightDownLeftUp_Step1,
+    MovementType_WalkSequence_Step2
+};
+
+const u8 gRightDownLeftUpDirections[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH};
+
+u8 (*const gMovementTypeFuncs_CopyPlayer[])(struct EventObject *, struct Sprite *) = {
+    MovementType_CopyPlayer_Step0,
+    MovementType_CopyPlayer_Step1,
+    MovementType_CopyPlayer_Step2
+};
+
+u8 (*const gCopyPlayerMovementFuncs[])(struct EventObject *, struct Sprite *, u8, bool8(u8)) = {
+    CopyablePlayerMovement_None,
+    CopyablePlayerMovement_FaceDirection,
+    CopyablePlayerMovement_GoSpeed0,
+    CopyablePlayerMovement_GoSpeed1,
+    CopyablePlayerMovement_GoSpeed2,
+    CopyablePlayerMovement_Slide,
+    cph_IM_DIFFERENT,
+    CopyablePlayerMovement_GoSpeed4,
+    CopyablePlayerMovement_Jump,
+    CopyablePlayerMovement_None,
+    CopyablePlayerMovement_None
+};
+
+u8 (*const gMovementTypeFuncs_CopyPlayerInGrass[])(struct EventObject *, struct Sprite *) = {
+    MovementType_CopyPlayer_Step0,
+    MovementType_CopyPlayerInGrass_Step1,
+    MovementType_CopyPlayer_Step2
+};
+
+u8 (*const gMovementTypeFuncs_Hidden[])(struct EventObject *, struct Sprite *) = {
+    MovementType_Hidden_Step0
+};
+
+u8 (*const gMovementTypeFuncs_WalkInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_WalkInPlace_Step0,
+    MovementType_WalkInPlace_Step1
+};
+
+u8 (*const gMovementTypeFuncs_JogInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_JogInPlace_Step0,
+    MovementType_WalkInPlace_Step1
+};
+
+u8 (*const gMovementTypeFuncs_RunInPlace[])(struct EventObject *, struct Sprite *) = {
+    MovementType_RunInPlace_Step0,
+    MovementType_WalkInPlace_Step1
+};
+
+u8 (*const gMovementTypeFuncs_Invisible[])(struct EventObject *, struct Sprite *) = {
+    MovementType_Invisible_Step0,
+    MovementType_Invisible_Step1,
+    MovementType_Invisible_Step2
+};
+
+#endif //POKERUBY_MOVEMENT_TYPE_FUNC_TABLES_H
diff --git a/src/data/field_map_obj/anim_func_ptrs.h b/src/data/field_map_obj/anim_func_ptrs.h
deleted file mode 100644
index 1d1fac71e..000000000
--- a/src/data/field_map_obj/anim_func_ptrs.h
+++ /dev/null
@@ -1,1519 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_ANIM_FUNC_PTRS_H
-#define POKERUBY_ANIM_FUNC_PTRS_H
-
-u8 sub_8060CE0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060CF0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060D00(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060D10(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060F3C(struct MapObject *, struct Sprite *);
-u8 sub_8060F5C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060F7C(struct MapObject *, struct Sprite *);
-u8 sub_8060F9C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060FBC(struct MapObject *, struct Sprite *);
-u8 sub_8060FDC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8060FFC(struct MapObject *, struct Sprite *);
-u8 sub_806101C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806103C(struct MapObject *, struct Sprite *);
-u8 sub_806105C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806107C(struct MapObject *, struct Sprite *);
-u8 sub_806109C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80610BC(struct MapObject *, struct Sprite *);
-u8 sub_80610DC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80610FC(struct MapObject *, struct Sprite *);
-u8 sub_806111C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80613A8(struct MapObject *, struct Sprite *);
-u8 sub_80613D4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061400(struct MapObject *, struct Sprite *);
-u8 sub_806142C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061458(struct MapObject *, struct Sprite *);
-u8 sub_8061484(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80614B0(struct MapObject *, struct Sprite *);
-u8 sub_80614DC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806152C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806154C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806156C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806158C(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80615AC(struct MapObject *, struct Sprite *);
-u8 sub_8061510(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80615CC(struct MapObject *, struct Sprite *);
-u8 sub_80615EC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806160C(struct MapObject *, struct Sprite *);
-u8 sub_806162C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806164C(struct MapObject *, struct Sprite *);
-u8 sub_806166C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806168C(struct MapObject *, struct Sprite *);
-u8 sub_80616AC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061778(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80617B0(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80617E8(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061820(struct MapObject *, struct Sprite *);
-u8 sub_806173C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061858(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061890(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80618C8(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061900(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061938(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061970(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80619A8(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80619E0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A18(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A50(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061A88(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061AC0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061AF8(struct MapObject *, struct Sprite *);
-u8 sub_8061B18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061B38(struct MapObject *, struct Sprite *);
-u8 sub_8061B58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061B78(struct MapObject *, struct Sprite *);
-u8 sub_8061B98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061BB8(struct MapObject *, struct Sprite *);
-u8 sub_8061BD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061BF8(struct MapObject *, struct Sprite *);
-u8 sub_8061C18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061C38(struct MapObject *, struct Sprite *);
-u8 sub_8061C58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061C78(struct MapObject *, struct Sprite *);
-u8 sub_8061C98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061CB8(struct MapObject *, struct Sprite *);
-u8 sub_8061CD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061CF8(struct MapObject *, struct Sprite *);
-u8 sub_8061D18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061D38(struct MapObject *, struct Sprite *);
-u8 sub_8061D58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061D78(struct MapObject *, struct Sprite *);
-u8 sub_8061D98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061DB8(struct MapObject *, struct Sprite *);
-u8 sub_8061DD8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 do_run_south_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E18(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 do_run_north_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E58(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 do_run_west_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061E98(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 do_run_east_anim(struct MapObject *, struct Sprite *);
-u8 sub_8061ED8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061F24(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061F90(struct MapObject *, struct Sprite *);
-u8 sub_8061FB0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8061FD8(struct MapObject *, struct Sprite *);
-u8 sub_8061FF8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062020(struct MapObject *, struct Sprite *);
-u8 sub_8062040(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062068(struct MapObject *, struct Sprite *);
-u8 sub_8062088(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80620B0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806210C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062170(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062180(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062190(struct MapObject *, struct Sprite *);
-u8 sub_80621BC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80621E8(struct MapObject *, struct Sprite *);
-u8 sub_8062214(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062240(struct MapObject *, struct Sprite *);
-u8 sub_806226C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062298(struct MapObject *, struct Sprite *);
-u8 sub_80622C4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80622F0(struct MapObject *, struct Sprite *);
-u8 sub_806231C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062348(struct MapObject *, struct Sprite *);
-u8 sub_8062374(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80623A0(struct MapObject *, struct Sprite *);
-u8 sub_80623CC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80623F8(struct MapObject *, struct Sprite *);
-u8 sub_8062424(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062450(struct MapObject *, struct Sprite *);
-u8 sub_806247C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80624A8(struct MapObject *, struct Sprite *);
-u8 sub_80624D4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062500(struct MapObject *, struct Sprite *);
-u8 sub_806252C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062558(struct MapObject *, struct Sprite *);
-u8 sub_8062584(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80625B0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80625C8(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80625D8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80625E8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80625F8(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_8062608(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_8062634(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_8062644(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_1(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 do_exclamation_mark_bubble_2(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 do_heart_bubble(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80626C0(struct MapObject *, struct Sprite *);
-u8 sub_8062704(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_8062724(struct MapObject *, struct Sprite *);
-u8 sub_8062740(struct MapObject *, struct Sprite *);
-u8 sub_8062764(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_80627A0(struct MapObject *, struct Sprite *);
-u8 sub_80627BC(struct MapObject *, struct Sprite *);
-u8 sub_80627E0(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806281C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806282C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806283C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806286C(struct MapObject *, struct Sprite *);
-u8 sub_8063470(struct MapObject *, struct Sprite *);
-u8 sub_806289C(struct MapObject *, struct Sprite *);
-u8 sub_80628D0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80628FC(struct MapObject *, struct Sprite *);
-u8 sub_8062930(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_806299C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80629AC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80629BC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80629CC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80629DC(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062A00(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062A24(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062A48(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062A6C(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062A90(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062AB4(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062AD8(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062AFC(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062B20(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062B44(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062B68(struct MapObject *, struct Sprite *);
-u8 sub_8061F3C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062BD0(struct MapObject *, struct Sprite *);
-u8 sub_8062BFC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062C28(struct MapObject *, struct Sprite *);
-u8 sub_8062C54(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062C80(struct MapObject *, struct Sprite *);
-u8 sub_8062CAC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062CD8(struct MapObject *, struct Sprite *);
-u8 sub_8062D04(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062D30(struct MapObject *, struct Sprite *);
-u8 sub_8062D5C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062D88(struct MapObject *, struct Sprite *);
-u8 sub_8062DB4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062DE0(struct MapObject *, struct Sprite *);
-u8 sub_8062E0C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062E38(struct MapObject *, struct Sprite *);
-u8 sub_8062E64(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062E90(struct MapObject *, struct Sprite *);
-u8 sub_8062EBC(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062EE8(struct MapObject *, struct Sprite *);
-u8 sub_8062F14(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062F40(struct MapObject *, struct Sprite *);
-u8 sub_8062F6C(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062F98(struct MapObject *, struct Sprite *);
-u8 sub_8062FC4(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8062FF0(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063028(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063060(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063098(struct MapObject *, struct Sprite *);
-u8 sub_8061714(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063108(struct MapObject *, struct Sprite *);
-u8 sub_8063128(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063148(struct MapObject *, struct Sprite *);
-u8 sub_8063168(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063188(struct MapObject *, struct Sprite *);
-u8 sub_80631A8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80631C8(struct MapObject *, struct Sprite *);
-u8 sub_80631E8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063238(struct MapObject *, struct Sprite *);
-u8 sub_8063258(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063278(struct MapObject *, struct Sprite *);
-u8 sub_8063298(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80632B8(struct MapObject *, struct Sprite *);
-u8 sub_80632D8(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80632F8(struct MapObject *, struct Sprite *);
-u8 sub_8063318(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063370(struct MapObject *, struct Sprite *);
-u8 sub_8063390(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80633B0(struct MapObject *, struct Sprite *);
-u8 sub_80633D0(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_80633F0(struct MapObject *, struct Sprite *);
-u8 sub_8063410(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-u8 sub_8063430(struct MapObject *, struct Sprite *);
-u8 sub_8063450(struct MapObject *, struct Sprite *);
-u8 sub_8063474(struct MapObject *, struct Sprite *);
-
-u8 (*const Unknown_83759A0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759A8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759B0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759B8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759D4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759E0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759EC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_83759F8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A04[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A10[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A1C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A28[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A40[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A4C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A58[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A70[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A88[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375A94[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AA0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AAC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375ADC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375AF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B54[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B60[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B78[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B90[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375B9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BB4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BCC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BD8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BE4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BF0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375BFC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C08[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C14[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C20[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C2C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C38[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C44[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C50[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C5C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C68[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C74[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C80[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C8C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375C98[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CA0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CB0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CDC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375CF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D50[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D5C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D74[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D8C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D94[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375D9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DA4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DB0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DD0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DD8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DE0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DF0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375DFC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E08[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E10[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E20[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E28[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E34[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E40[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E4C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E58[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E64[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E70[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375E7C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EB8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EC4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375ED0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EDC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EE8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375EF4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F00[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F0C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F18[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F24[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F30[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F3C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F48[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F54[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F60[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F6C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F78[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F84[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F90[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375F9C[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FA8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FB4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FC0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FCC[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FD8[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FE4[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *);
-u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *);
-
-u8 (*const *const gUnknown_08375778[])(struct MapObject *, struct Sprite *) = {
-    Unknown_83759A0,
-    Unknown_83759A8,
-    Unknown_83759B0,
-    Unknown_83759B8,
-    Unknown_83759D4,
-    Unknown_83759E0,
-    Unknown_83759EC,
-    Unknown_83759F8,
-    Unknown_8375A04,
-    Unknown_8375A10,
-    Unknown_8375A1C,
-    Unknown_8375A28,
-    Unknown_8375A40,
-    Unknown_8375A4C,
-    Unknown_8375A58,
-    Unknown_8375A64,
-    Unknown_8375A70,
-    Unknown_8375A7C,
-    Unknown_8375A88,
-    Unknown_8375A94,
-    Unknown_8375AA0,
-    Unknown_8375AAC,
-    Unknown_8375AB8,
-    Unknown_8375AC4,
-    Unknown_8375AD0,
-    Unknown_8375ADC,
-    Unknown_8375AE8,
-    Unknown_8375AF4,
-    Unknown_8375B00,
-    Unknown_8375B0C,
-    Unknown_8375B18,
-    Unknown_8375B24,
-    Unknown_8375B30,
-    Unknown_8375B3C,
-    Unknown_8375B48,
-    Unknown_8375B54,
-    Unknown_8375B60,
-    Unknown_8375B6C,
-    Unknown_8375B78,
-    Unknown_8375B84,
-    Unknown_8375B90,
-    Unknown_8375B9C,
-    Unknown_8375BA8,
-    Unknown_8375BB4,
-    Unknown_8375BC0,
-    Unknown_8375BCC,
-    Unknown_8375BD8,
-    Unknown_8375BE4,
-    Unknown_8375BF0,
-    Unknown_8375BFC,
-    Unknown_8375C08,
-    Unknown_8375C14,
-    Unknown_8375C20,
-    Unknown_8375C2C,
-    Unknown_8375C38,
-    Unknown_8375C44,
-    Unknown_8375C50,
-    Unknown_8375C5C,
-    Unknown_8375C68,
-    Unknown_8375C74,
-    Unknown_8375C80,
-    Unknown_8375C8C,
-    Unknown_8375C98,
-    Unknown_8375CA0,
-    Unknown_8375CA8,
-    Unknown_8375CB0,
-    Unknown_8375CB8,
-    Unknown_8375CC4,
-    Unknown_8375CD0,
-    Unknown_8375CDC,
-    Unknown_8375CE8,
-    Unknown_8375CF4,
-    Unknown_8375D00,
-    Unknown_8375D0C,
-    Unknown_8375D18,
-    Unknown_8375D24,
-    Unknown_8375D30,
-    Unknown_8375D3C,
-    Unknown_8375D48,
-    Unknown_8375D50,
-    Unknown_8375D5C,
-    Unknown_8375D64,
-    Unknown_8375D6C,
-    Unknown_8375D74,
-    Unknown_8375D7C,
-    Unknown_8375D84,
-    Unknown_8375D8C,
-    Unknown_8375D94,
-    Unknown_8375D9C,
-    Unknown_8375DA4,
-    Unknown_8375DB0,
-    Unknown_8375DC0,
-    Unknown_8375DD0,
-    Unknown_8375DD8,
-    Unknown_8375DE0,
-    Unknown_8375DE8,
-    Unknown_8375DF0,
-    Unknown_8375DFC,
-    Unknown_8375E08,
-    Unknown_8375E10,
-    Unknown_8375E18,
-    Unknown_8375E20,
-    Unknown_8375E28,
-    Unknown_8375E34,
-    Unknown_8375E40,
-    Unknown_8375E4C,
-    Unknown_8375E58,
-    Unknown_8375E64,
-    Unknown_8375E70,
-    Unknown_8375E7C,
-    Unknown_8375EB8,
-    Unknown_8375EC4,
-    Unknown_8375ED0,
-    Unknown_8375EDC,
-    Unknown_8375EE8,
-    Unknown_8375EF4,
-    Unknown_8375F00,
-    Unknown_8375F0C,
-    Unknown_8375F18,
-    Unknown_8375F24,
-    Unknown_8375F30,
-    Unknown_8375F3C,
-    Unknown_8375F48,
-    Unknown_8375F54,
-    Unknown_8375F60,
-    Unknown_8375F6C,
-    Unknown_8375F78,
-    Unknown_8375F84,
-    Unknown_8375F90,
-    Unknown_8375F9C,
-    Unknown_8375FA8,
-    Unknown_8375FB4,
-    Unknown_8375FC0,
-    Unknown_8375FCC,
-    Unknown_8375FD8,
-    Unknown_8375FE4,
-    Unknown_8375FF0,
-    Unknown_8375FFC
-};
-
-
-u8 (*const Unknown_83759A0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060CE0,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759A8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060CF0,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759B0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060D00,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759B8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060D10,
-    sub_8063474
-};
-
-u8 (*const gUnknown_083759C0[])(u8) = {
-    get_go_image_anim_num,
-    get_go_fast_image_anim_num,
-    get_go_fast_image_anim_num,
-    get_go_faster_image_anim_num,
-    sub_805FD78
-};
-
-u8 (*const Unknown_83759D4[])(struct MapObject *, struct Sprite *) = {
-    sub_8060F3C,
-    sub_8060F5C,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759E0[])(struct MapObject *, struct Sprite *) = {
-    sub_8060F7C,
-    sub_8060F9C,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759EC[])(struct MapObject *, struct Sprite *) = {
-    sub_8060FBC,
-    sub_8060FDC,
-    sub_8063474
-};
-
-u8 (*const Unknown_83759F8[])(struct MapObject *, struct Sprite *) = {
-    sub_8060FFC,
-    sub_806101C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A04[])(struct MapObject *, struct Sprite *) = {
-    sub_806103C,
-    sub_806105C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A10[])(struct MapObject *, struct Sprite *) = {
-    sub_806107C,
-    sub_806109C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A1C[])(struct MapObject *, struct Sprite *) = {
-    sub_80610BC,
-    sub_80610DC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A28[])(struct MapObject *, struct Sprite *) = {
-    sub_80610FC,
-    sub_806111C,
-    sub_8063474
-};
-
-const s16 gUnknown_08375A34[] = {0, 1, 1};
-const s16 gUnknown_08375A3A[] = {0, 0, 1};
-
-u8 (*const Unknown_8375A40[])(struct MapObject *, struct Sprite *) = {
-    sub_80613A8,
-    sub_80613D4,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A4C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061400,
-    sub_806142C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A58[])(struct MapObject *, struct Sprite *) = {
-    sub_8061458,
-    sub_8061484,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A64[])(struct MapObject *, struct Sprite *) = {
-    sub_80614B0,
-    sub_80614DC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375A70[])(struct MapObject *, struct Sprite *) = {
-    sub_806152C,
-    sub_8061510,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375A7C[])(struct MapObject *, struct Sprite *) = {
-    sub_806154C,
-    sub_8061510,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375A88[])(struct MapObject *, struct Sprite *) = {
-    sub_806156C,
-    sub_8061510,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375A94[])(struct MapObject *, struct Sprite *) = {
-    sub_806158C,
-    sub_8061510,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375AA0[])(struct MapObject *, struct Sprite *) = {
-    sub_80615AC,
-    sub_8061510,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375AAC[])(struct MapObject *, struct Sprite *) = {
-    sub_80615CC,
-    sub_80615EC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375AB8[])(struct MapObject *, struct Sprite *) = {
-    sub_806160C,
-    sub_806162C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375AC4[])(struct MapObject *, struct Sprite *) = {
-    sub_806164C,
-    sub_806166C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375AD0[])(struct MapObject *, struct Sprite *) = {
-    sub_806168C,
-    sub_80616AC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375ADC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061778,
-    sub_806173C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375AE8[])(struct MapObject *, struct Sprite *) = {
-    sub_80617B0,
-    sub_806173C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375AF4[])(struct MapObject *, struct Sprite *) = {
-    sub_80617E8,
-    sub_806173C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B00[])(struct MapObject *, struct Sprite *) = {
-    sub_8061820,
-    sub_806173C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B0C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061858,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B18[])(struct MapObject *, struct Sprite *) = {
-    sub_8061890,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B24[])(struct MapObject *, struct Sprite *) = {
-    sub_80618C8,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B30[])(struct MapObject *, struct Sprite *) = {
-    sub_8061900,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061938,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B48[])(struct MapObject *, struct Sprite *) = {
-    sub_8061970,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B54[])(struct MapObject *, struct Sprite *) = {
-    sub_80619A8,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B60[])(struct MapObject *, struct Sprite *) = {
-    sub_80619E0,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B6C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A18,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B78[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A50,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B84[])(struct MapObject *, struct Sprite *) = {
-    sub_8061A88,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B90[])(struct MapObject *, struct Sprite *) = {
-    sub_8061AC0,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375B9C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061AF8,
-    sub_8061B18,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8061B38,
-    sub_8061B58,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BB4[])(struct MapObject *, struct Sprite *) = {
-    sub_8061B78,
-    sub_8061B98,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BC0[])(struct MapObject *, struct Sprite *) = {
-    sub_8061BB8,
-    sub_8061BD8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BCC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061BF8,
-    sub_8061C18,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BD8[])(struct MapObject *, struct Sprite *) = {
-    sub_8061C38,
-    sub_8061C58,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BE4[])(struct MapObject *, struct Sprite *) = {
-    sub_8061C78,
-    sub_8061C98,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BF0[])(struct MapObject *, struct Sprite *) = {
-    sub_8061CB8,
-    sub_8061CD8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375BFC[])(struct MapObject *, struct Sprite *) = {
-    sub_8061CF8,
-    sub_8061D18,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C08[])(struct MapObject *, struct Sprite *) = {
-    sub_8061D38,
-    sub_8061D58,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C14[])(struct MapObject *, struct Sprite *) = {
-    sub_8061D78,
-    sub_8061D98,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C20[])(struct MapObject *, struct Sprite *) = {
-    sub_8061DB8,
-    sub_8061DD8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C2C[])(struct MapObject *, struct Sprite *) = {
-    do_run_south_anim,
-    sub_8061E18,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C38[])(struct MapObject *, struct Sprite *) = {
-    do_run_north_anim,
-    sub_8061E58,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C44[])(struct MapObject *, struct Sprite *) = {
-    do_run_west_anim,
-    sub_8061E98,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C50[])(struct MapObject *, struct Sprite *) = {
-    do_run_east_anim,
-    sub_8061ED8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C5C[])(struct MapObject *, struct Sprite *) = {
-    sub_8061F24,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C68[])(struct MapObject *, struct Sprite *) = {
-    sub_8061F90,
-    sub_8061FB0,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C74[])(struct MapObject *, struct Sprite *) = {
-    sub_8061FD8,
-    sub_8061FF8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C80[])(struct MapObject *, struct Sprite *) = {
-    sub_8062020,
-    sub_8062040,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C8C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062068,
-    sub_8062088,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375C98[])(struct MapObject *, struct Sprite *) = {
-    sub_80620B0,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CA0[])(struct MapObject *, struct Sprite *) = {
-    sub_806210C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062170,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CB0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062180,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CB8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062190,
-    sub_80621BC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CC4[])(struct MapObject *, struct Sprite *) = {
-    sub_80621E8,
-    sub_8062214,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CD0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062240,
-    sub_806226C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CDC[])(struct MapObject *, struct Sprite *) = {
-    sub_8062298,
-    sub_80622C4,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CE8[])(struct MapObject *, struct Sprite *) = {
-    sub_80622F0,
-    sub_806231C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375CF4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062348,
-    sub_8062374,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D00[])(struct MapObject *, struct Sprite *) = {
-    sub_80623A0,
-    sub_80623CC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D0C[])(struct MapObject *, struct Sprite *) = {
-    sub_80623F8,
-    sub_8062424,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D18[])(struct MapObject *, struct Sprite *) = {
-    sub_8062450,
-    sub_806247C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D24[])(struct MapObject *, struct Sprite *) = {
-    sub_80624A8,
-    sub_80624D4,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D30[])(struct MapObject *, struct Sprite *) = {
-    sub_8062500,
-    sub_806252C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062558,
-    sub_8062584,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D48[])(struct MapObject *, struct Sprite *) = {
-    sub_80625B0,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D50[])(struct MapObject *, struct Sprite *) = {
-    sub_80625C8,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375D5C[])(struct MapObject *, struct Sprite *) = {
-    sub_80625D8,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D64[])(struct MapObject *, struct Sprite *) = {
-    sub_80625E8,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D6C[])(struct MapObject *, struct Sprite *) = {
-    sub_80625F8,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D74[])(struct MapObject *, struct Sprite *) = {
-    sub_8062608,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D7C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062634,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D84[])(struct MapObject *, struct Sprite *) = {
-    sub_8062644,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D8C[])(struct MapObject *, struct Sprite *) = {
-    do_exclamation_mark_bubble_1,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D94[])(struct MapObject *, struct Sprite *) = {
-    do_exclamation_mark_bubble_2,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375D9C[])(struct MapObject *, struct Sprite *) = {
-    do_heart_bubble,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DA4[])(struct MapObject *, struct Sprite *) = {
-    sub_80626C0,
-    sub_8062704,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DB0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062724,
-    sub_8062740,
-    sub_8062764,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DC0[])(struct MapObject *, struct Sprite *) = {
-    sub_80627A0,
-    sub_80627BC,
-    sub_80627E0,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DD0[])(struct MapObject *, struct Sprite *) = {
-    sub_806281C,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DD8[])(struct MapObject *, struct Sprite *) = {
-    sub_806282C,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DE0[])(struct MapObject *, struct Sprite *) = {
-    sub_806283C,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DE8[])(struct MapObject *, struct Sprite *) = {
-    sub_806286C,
-    sub_8063470
-};
-
-u8 (*const Unknown_8375DF0[])(struct MapObject *, struct Sprite *) = {
-    sub_806289C,
-    sub_80628D0,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375DFC[])(struct MapObject *, struct Sprite *) = {
-    sub_80628FC,
-    sub_8062930,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E08[])(struct MapObject *, struct Sprite *) = {
-    sub_806299C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E10[])(struct MapObject *, struct Sprite *) = {
-    sub_80629AC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E18[])(struct MapObject *, struct Sprite *) = {
-    sub_80629BC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E20[])(struct MapObject *, struct Sprite *) = {
-    sub_80629CC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E28[])(struct MapObject *, struct Sprite *) = {
-    sub_80629DC,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E34[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A00,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E40[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A24,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E4C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A48,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E58[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A6C,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E64[])(struct MapObject *, struct Sprite *) = {
-    sub_8062A90,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E70[])(struct MapObject *, struct Sprite *) = {
-    sub_8062AB4,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375E7C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062AD8,
-    sub_8061F3C,
-    sub_8063474,
-    sub_8062AFC,
-    sub_8061F3C,
-    sub_8063474,
-    sub_8062B20,
-    sub_8061F3C,
-    sub_8063474,
-    sub_8062B44,
-    sub_8061F3C,
-    sub_8063474,
-    sub_8062B68,
-    sub_8061F3C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375EB8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062BD0,
-    sub_8062BFC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375EC4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062C28,
-    sub_8062C54,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375ED0[])(struct MapObject *, struct Sprite *) = {
-    sub_8062C80,
-    sub_8062CAC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375EDC[])(struct MapObject *, struct Sprite *) = {
-    sub_8062CD8,
-    sub_8062D04,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375EE8[])(struct MapObject *, struct Sprite *) = {
-    sub_8062D30,
-    sub_8062D5C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375EF4[])(struct MapObject *, struct Sprite *) = {
-    sub_8062D88,
-    sub_8062DB4,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F00[])(struct MapObject *, struct Sprite *) = {
-    sub_8062DE0,
-    sub_8062E0C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F0C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062E38,
-    sub_8062E64,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F18[])(struct MapObject *, struct Sprite *) = {
-    sub_8062E90,
-    sub_8062EBC,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F24[])(struct MapObject *, struct Sprite *) = {
-    sub_8062EE8,
-    sub_8062F14,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F30[])(struct MapObject *, struct Sprite *) = {
-    sub_8062F40,
-    sub_8062F6C,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F3C[])(struct MapObject *, struct Sprite *) = {
-    sub_8062F98,
-    sub_8062FC4,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F48[])(struct MapObject *, struct Sprite *) = {
-    sub_8062FF0,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F54[])(struct MapObject *, struct Sprite *) = {
-    sub_8063028,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F60[])(struct MapObject *, struct Sprite *) = {
-    sub_8063060,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F6C[])(struct MapObject *, struct Sprite *) = {
-    sub_8063098,
-    sub_8061714,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F78[])(struct MapObject *, struct Sprite *) = {
-    sub_8063108,
-    sub_8063128,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F84[])(struct MapObject *, struct Sprite *) = {
-    sub_8063148,
-    sub_8063168,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F90[])(struct MapObject *, struct Sprite *) = {
-    sub_8063188,
-    sub_80631A8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375F9C[])(struct MapObject *, struct Sprite *) = {
-    sub_80631C8,
-    sub_80631E8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FA8[])(struct MapObject *, struct Sprite *) = {
-    sub_8063238,
-    sub_8063258,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FB4[])(struct MapObject *, struct Sprite *) = {
-    sub_8063278,
-    sub_8063298,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FC0[])(struct MapObject *, struct Sprite *) = {
-    sub_80632B8,
-    sub_80632D8,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FCC[])(struct MapObject *, struct Sprite *) = {
-    sub_80632F8,
-    sub_8063318,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FD8[])(struct MapObject *, struct Sprite *) = {
-    sub_8063370,
-    sub_8063390,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FE4[])(struct MapObject *, struct Sprite *) = {
-    sub_80633B0,
-    sub_80633D0,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FF0[])(struct MapObject *, struct Sprite *) = {
-    sub_80633F0,
-    sub_8063410,
-    sub_8063474
-};
-
-u8 (*const Unknown_8375FFC[])(struct MapObject *, struct Sprite *) = {
-    sub_8063430,
-    sub_8063450,
-    sub_8063474
-};
-
-#endif //POKERUBY_ANIM_FUNC_PTRS_H
diff --git a/src/data/field_map_obj/berry_tree_graphics_tables.h b/src/data/field_map_obj/berry_tree_graphics_tables.h
deleted file mode 100644
index 5b60fee6f..000000000
--- a/src/data/field_map_obj/berry_tree_graphics_tables.h
+++ /dev/null
@@ -1,573 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
-#define POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
-
-const struct SpriteFrameImage gMapObjectPicTable_PechaBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_PechaBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Pecha[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_KelpsyBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_KelpsyBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Kelpsy[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_WepearBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_WepearBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Wepear[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_IapapaBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_IapapaBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Iapapa[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_CheriBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_CheriBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Cheri[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_FigyBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_FigyBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Figy[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_MagoBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_MagoBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Mago[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_LumBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_LumBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Lum[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_RazzBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_RazzBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Razz[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_GrepaBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_GrepaBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Grepa[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_RabutaBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_RabutaBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Rabuta[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_NomelBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_NomelBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Nomel[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_LeppaBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_LeppaBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Leppa[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_LiechiBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_LiechiBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Liechi[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_HondewBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_HondewBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Hondew[] = {3, 4, 5, 5, 5};
-
-const struct SpriteFrameImage gMapObjectPicTable_AguavBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_AguavBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Aguav[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_WikiBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_WikiBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Wiki[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_PomegBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_PomegBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Pomeg[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_RawstBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_RawstBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Rawst[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_SpelonBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_SpelonBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Spelon[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_ChestoBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_ChestoBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Chesto[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_OranBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_OranBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Oran[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_PersimBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_PersimBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Persim[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_SitrusBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_SitrusBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Sitrus[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_AspearBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_AspearBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Aspear[] = {3, 4, 3, 3, 3};
-
-const struct SpriteFrameImage gMapObjectPicTable_PamtreBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_PamtreBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Pamtre[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_CornnBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_CornnBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Cornn[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_LansatBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_LansatBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Lansat[] = {3, 4, 2, 2, 2};
-
-const struct SpriteFrameImage gMapObjectPicTable_DurinBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_DurinBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Durin[] = {3, 4, 4, 4, 4};
-
-const struct SpriteFrameImage gMapObjectPicTable_TamatoBerryTree[] = {
-    obj_frame_tiles(gMapObjectPic_BerryTreeDirtPile),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_0),
-    obj_frame_tiles(gMapObjectPic_BerryTreeSprout_1),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_0),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_1),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_2),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_3),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_4),
-    obj_frame_tiles(gMapObjectPic_TamatoBerryTree_5)
-};
-
-const u8 gBerryTreePaletteSlotTable_Tamato[] = {3, 4, 2, 2, 2};
-
-const u8 gDeadBerryTreeGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES};
-
-const u8 gBerryTreeGraphicsIdTable[] = {MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES, MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES};
-
-const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = {
-    gMapObjectPicTable_CheriBerryTree,
-    gMapObjectPicTable_ChestoBerryTree,
-    gMapObjectPicTable_PechaBerryTree,
-    gMapObjectPicTable_RawstBerryTree,
-    gMapObjectPicTable_AspearBerryTree,
-    gMapObjectPicTable_LeppaBerryTree,
-    gMapObjectPicTable_OranBerryTree,
-    gMapObjectPicTable_PersimBerryTree,
-    gMapObjectPicTable_LumBerryTree,
-    gMapObjectPicTable_SitrusBerryTree,
-    gMapObjectPicTable_FigyBerryTree,
-    gMapObjectPicTable_WikiBerryTree,
-    gMapObjectPicTable_MagoBerryTree,
-    gMapObjectPicTable_AguavBerryTree,
-    gMapObjectPicTable_IapapaBerryTree,
-    gMapObjectPicTable_RazzBerryTree,
-    gMapObjectPicTable_RazzBerryTree,
-    gMapObjectPicTable_MagoBerryTree,
-    gMapObjectPicTable_WepearBerryTree,
-    gMapObjectPicTable_IapapaBerryTree,
-    gMapObjectPicTable_PomegBerryTree,
-    gMapObjectPicTable_KelpsyBerryTree,
-    gMapObjectPicTable_WepearBerryTree,
-    gMapObjectPicTable_HondewBerryTree,
-    gMapObjectPicTable_GrepaBerryTree,
-    gMapObjectPicTable_TamatoBerryTree,
-    gMapObjectPicTable_CornnBerryTree,
-    gMapObjectPicTable_PomegBerryTree,
-    gMapObjectPicTable_RabutaBerryTree,
-    gMapObjectPicTable_NomelBerryTree,
-    gMapObjectPicTable_SpelonBerryTree,
-    gMapObjectPicTable_PamtreBerryTree,
-    gMapObjectPicTable_RabutaBerryTree,
-    gMapObjectPicTable_DurinBerryTree,
-    gMapObjectPicTable_HondewBerryTree,
-    gMapObjectPicTable_LiechiBerryTree,
-    gMapObjectPicTable_HondewBerryTree,
-    gMapObjectPicTable_AguavBerryTree,
-    gMapObjectPicTable_PomegBerryTree,
-    gMapObjectPicTable_GrepaBerryTree,
-    gMapObjectPicTable_LansatBerryTree,
-    gMapObjectPicTable_CornnBerryTree,
-    gMapObjectPicTable_DurinBerryTree
-};
-
-const u8 *const gBerryTreePaletteSlotTablePointers[] = {
-    gBerryTreePaletteSlotTable_Cheri,
-    gBerryTreePaletteSlotTable_Chesto,
-    gBerryTreePaletteSlotTable_Pecha,
-    gBerryTreePaletteSlotTable_Rawst,
-    gBerryTreePaletteSlotTable_Aspear,
-    gBerryTreePaletteSlotTable_Leppa,
-    gBerryTreePaletteSlotTable_Oran,
-    gBerryTreePaletteSlotTable_Persim,
-    gBerryTreePaletteSlotTable_Lum,
-    gBerryTreePaletteSlotTable_Sitrus,
-    gBerryTreePaletteSlotTable_Figy,
-    gBerryTreePaletteSlotTable_Wiki,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Razz,
-    gBerryTreePaletteSlotTable_Mago,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Iapapa,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Kelpsy,
-    gBerryTreePaletteSlotTable_Wepear,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Tamato,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Nomel,
-    gBerryTreePaletteSlotTable_Spelon,
-    gBerryTreePaletteSlotTable_Pamtre,
-    gBerryTreePaletteSlotTable_Rabuta,
-    gBerryTreePaletteSlotTable_Durin,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Liechi,
-    gBerryTreePaletteSlotTable_Hondew,
-    gBerryTreePaletteSlotTable_Aguav,
-    gBerryTreePaletteSlotTable_Pomeg,
-    gBerryTreePaletteSlotTable_Grepa,
-    gBerryTreePaletteSlotTable_Lansat,
-    gBerryTreePaletteSlotTable_Cornn,
-    gBerryTreePaletteSlotTable_Durin
-};
-
-const u8 *const gBerryTreeGraphicsIdTablePointers[] = {
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable,
-    gBerryTreeGraphicsIdTable
-};
-
-#endif //POKERUBY_BERRY_TREE_GRAPHICS_TABLES_H
diff --git a/src/data/field_map_obj/callback_subroutine_pointers.h b/src/data/field_map_obj/callback_subroutine_pointers.h
deleted file mode 100644
index a324066b7..000000000
--- a/src/data/field_map_obj/callback_subroutine_pointers.h
+++ /dev/null
@@ -1,442 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
-#define POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
-
-
-u8 (*const gUnknown_08375224[])(struct MapObject *, struct Sprite *) = {
-    sub_805C8F0,
-    sub_805C904,
-    sub_805C930,
-    sub_805C96C,
-    sub_805C98C,
-    sub_805C9D8,
-    sub_805CA08
-};
-
-const u8 gUnknown_08375240[] = {DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST};
-
-u8 (*const gUnknown_08375244[])(s16, s16, s16, s16) = {
-    sub_805CAAC,
-    sub_805CADC,
-    sub_805CAEC,
-    sub_805CB00,
-    sub_805CB5C,
-    sub_805CBB8,
-    sub_805CC14,
-    sub_805CC70,
-    sub_805CCAC,
-    sub_805CCE8,
-    sub_805CD24
-};
-
-u8 (*const gUnknown_08375270[])(struct MapObject *, struct Sprite *) = {
-    sub_805CE2C,
-    sub_805CE40,
-    sub_805CE6C,
-    sub_805CEB0,
-    sub_805CEE0
-};
-
-u8 (*const gUnknown_08375284[])(struct MapObject *, struct Sprite *) = {
-    sub_805CF6C,
-    sub_805CF80,
-    sub_805CFAC,
-    sub_805CFE8,
-    sub_805D008,
-    sub_805D054,
-    sub_805D084
-};
-
-const u8 gUnknown_083752A0[] = {DIR_SOUTH, DIR_NORTH};
-
-u8 (*const gUnknown_083752A4[])(struct MapObject *, struct Sprite *) = {
-    sub_805D0F0,
-    sub_805D104,
-    sub_805D130,
-    sub_805D16C,
-    sub_805D18C,
-    sub_805D1D8,
-    sub_805D208
-};
-
-const u8 gUnknown_083752C0[] = {DIR_WEST, DIR_EAST};
-
-u8 (*const gUnknown_083752C4[])(struct MapObject *, struct Sprite *) = {
-    sub_805D274,
-    sub_805D2A0,
-    sub_805D2C0
-};
-
-u8 (*const gUnknown_083752D0[])(struct MapObject *, struct Sprite *) = {
-    do_berry_tree_growth_sparkle_1,
-    sub_805D3EC,
-    do_berry_tree_growth_sparkle_2,
-    sub_805D458,
-    sub_805D4A8
-};
-
-u8 (*const gUnknown_083752E4[])(struct MapObject *, struct Sprite *) = {
-    sub_805D538,
-    sub_805D54C,
-    sub_805D578,
-    sub_805D5BC,
-    sub_805D5EC
-};
-
-u8 (*const gUnknown_083752F8[])(struct MapObject *, struct Sprite *) = {
-    sub_805D678,
-    sub_805D68C,
-    sub_805D6B8,
-    sub_805D6FC,
-    sub_805D72C
-};
-
-u8 (*const gUnknown_0837530C[])(struct MapObject *, struct Sprite *) = {
-    sub_805D7B8,
-    sub_805D7CC,
-    sub_805D7F8,
-    sub_805D83C,
-    sub_805D86C
-};
-
-const u8 gUnknown_08375320[] = {DIR_NORTH, DIR_WEST};
-
-u8 (*const gUnknown_08375324[])(struct MapObject *, struct Sprite *) = {
-    sub_805D8F8,
-    sub_805D90C,
-    sub_805D938,
-    sub_805D97C,
-    sub_805D9AC
-};
-
-const u8 gUnknown_08375338[] = {DIR_NORTH, DIR_EAST};
-
-u8 (*const gUnknown_0837533C[])(struct MapObject *, struct Sprite *) = {
-    sub_805DA38,
-    sub_805DA4C,
-    sub_805DA78,
-    sub_805DABC,
-    sub_805DAEC
-};
-
-const u8 gUnknown_08375350[] = {DIR_SOUTH, DIR_WEST};
-
-u8 (*const gUnknown_08375354[])(struct MapObject *, struct Sprite *) = {
-    sub_805DB78,
-    sub_805DB8C,
-    sub_805DBB8,
-    sub_805DBFC,
-    sub_805DC2C
-};
-
-const u8 gUnknown_08375368[] = {DIR_SOUTH, DIR_EAST};
-
-u8 (*const gUnknown_0837536C[])(struct MapObject *, struct Sprite *) = {
-    sub_805DCB8,
-    sub_805DCCC,
-    sub_805DCF8,
-    sub_805DD3C,
-    sub_805DD6C
-};
-
-const u8 gUnknown_08375380[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_SOUTH};
-
-u8 (*const gUnknown_08375384[])(struct MapObject *, struct Sprite *) = {
-    sub_805DDF8,
-    sub_805DE0C,
-    sub_805DE38,
-    sub_805DE7C,
-    sub_805DEAC
-};
-
-const u8 gUnknown_08375398[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_SOUTH};
-
-u8 (*const gUnknown_0837539C[])(struct MapObject *, struct Sprite *) = {
-    sub_805DF38,
-    sub_805DF4C,
-    sub_805DF78,
-    sub_805DFBC,
-    sub_805DFEC
-};
-
-const u8 gUnknown_083753B0[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_NORTH};
-
-u8 (*const gUnknown_083753B4[])(struct MapObject *, struct Sprite *) = {
-    sub_805E078,
-    sub_805E08C,
-    sub_805E0B8,
-    sub_805E0FC,
-    sub_805E12C
-};
-
-const u8 gUnknown_083753C8[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH};
-
-u8 (*const gUnknown_083753CC[])(struct MapObject *, struct Sprite *) = {
-    sub_805E1B8,
-    sub_805E1E4,
-    sub_805E208,
-    sub_805E234
-};
-
-const u8 gUnknown_083753DC[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
-
-u8 (*const gUnknown_083753E4[])(struct MapObject *, struct Sprite *) = {
-    sub_805E2BC,
-    sub_805E2E8,
-    sub_805E30C,
-    sub_805E338
-};
-
-const u8 gUnknown_083753F4[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-
-u8 (*const gUnknown_083753FC[])(struct MapObject *, struct Sprite *) = {
-    sub_805E3C0,
-    sub_805E3D4,
-    sub_805E40C,
-    sub_805E4C4
-};
-
-u8 (*const gUnknown_0837540C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E620,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375418[] = {DIR_NORTH, DIR_EAST, DIR_WEST, DIR_SOUTH};
-
-u8 (*const gUnknown_0837541C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E6AC,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375428[] = {DIR_EAST, DIR_WEST, DIR_SOUTH, DIR_NORTH};
-u8 (*const gUnknown_0837542C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E738,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375438[] = {DIR_SOUTH, DIR_NORTH, DIR_EAST, DIR_WEST};
-
-u8 (*const gUnknown_0837543C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E7C4,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375448[] = {DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_EAST};
-
-u8 (*const gUnknown_0837544C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E850,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375458[] = {DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
-
-u8 (*const gUnknown_0837545C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E8DC,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375468[] = {DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH};
-
-u8 (*const gUnknown_0837546C[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E968,
-    sub_805E5B4
-};
-
-u8 (*const gUnknown_08375478[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805E9F4,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375484[] = {DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST};
-
-u8 (*const gUnknown_08375488[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EA80,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375494[] = {DIR_WEST, DIR_NORTH, DIR_SOUTH, DIR_EAST};
-
-u8 (*const gUnknown_08375498[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EB0C,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754A4[] = {DIR_NORTH, DIR_SOUTH, DIR_EAST, DIR_WEST};
-
-u8 (*const gUnknown_083754A8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EB98,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754B4[] = {DIR_EAST, DIR_WEST, DIR_NORTH, DIR_SOUTH};
-
-u8 (*const gUnknown_083754B8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EC24,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754C4[] = {DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH};
-
-u8 (*const gUnknown_083754C8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805ECB0,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754D4[] = {DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST};
-
-u8 (*const gUnknown_083754D8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805ED3C,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754E4[] = {DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST};
-
-u8 (*const gUnknown_083754E8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EDC8,
-    sub_805E5B4
-};
-
-const u8 gUnknown_083754F4[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-
-u8 (*const gUnknown_083754F8[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EE54,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375504[] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH};
-
-u8 (*const gUnknown_08375508[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EEE0,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375514[] = {DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST};
-
-u8 (*const gUnknown_08375518[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EF6C,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375524[] = {DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST};
-
-u8 (*const gUnknown_08375528[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805EFF8,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375534[] = {DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_NORTH};
-
-u8 (*const gUnknown_08375538[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805F084,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375544[] = {DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH};
-
-u8 (*const gUnknown_08375548[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805F110,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375554[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST};
-
-u8 (*const gUnknown_08375558[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805F19C,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375564[] = {DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_EAST};
-
-u8 (*const gUnknown_08375568[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805F228,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375574[] = {DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH};
-
-u8 (*const gUnknown_08375578[])(struct MapObject *, struct Sprite *) = {
-    sub_805E4EC,
-    sub_805F2B4,
-    sub_805E5B4
-};
-
-const u8 gUnknown_08375584[] = {DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH};
-
-u8 (*const gUnknown_08375588[])(struct MapObject *, struct Sprite *) = {
-    mss_npc_reset_oampriv3_1_unk2_unk3,
-    sub_805F364,
-    sub_805F3C4
-};
-
-u8 (*const gUnknown_08375594[])(struct MapObject *, struct Sprite *, u8, bool8(u8)) = {
-    sub_805F3EC,
-    sub_805F3F0,
-    sub_805F438,
-    sub_805F4F0,
-    sub_805F5A8,
-    sub_805F660,
-    cph_IM_DIFFERENT,
-    sub_805F760,
-    oac_hopping,
-    sub_805F3EC,
-    sub_805F3EC
-};
-
-u8 (*const gUnknown_083755C0[])(struct MapObject *, struct Sprite *) = {
-    mss_npc_reset_oampriv3_1_unk2_unk3,
-    mss_08062EA4,
-    sub_805F3C4
-};
-
-u8 (*const gUnknown_083755CC[])(struct MapObject *, struct Sprite *) = {
-    sub_805FAF8
-};
-
-u8 (*const gUnknown_083755D0[])(struct MapObject *, struct Sprite *) = {
-    sub_805FB64,
-    sub_805FB04
-};
-
-u8 (*const gUnknown_083755D8[])(struct MapObject *, struct Sprite *) = {
-    sub_805FBD4,
-    sub_805FB04
-};
-
-u8 (*const gUnknown_083755E0[])(struct MapObject *, struct Sprite *) = {
-    sub_805FC44,
-    sub_805FB04
-};
-
-u8 (*const gUnknown_083755E8[])(struct MapObject *, struct Sprite *) = {
-    sub_805FCB4,
-    sub_805FCE8,
-    sub_805FD08
-};
-
-#endif //POKERUBY_CALLBACK_SUBROUTINE_POINTERS_H
diff --git a/src/data/field_map_obj/map_object_anims.h b/src/data/field_map_obj/map_object_anims.h
deleted file mode 100644
index 0993f3efd..000000000
--- a/src/data/field_map_obj/map_object_anims.h
+++ /dev/null
@@ -1,886 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_MAP_OBJECT_ANIMS_H
-#define POKERUBY_MAP_OBJECT_ANIMS_H
-
-
-const union AnimCmd gMapObjectImageAnim_83708C8[] = {
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83708DC[] = {
-    ANIMCMD_FRAME(0, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83708E4[] = {
-    ANIMCMD_FRAME(1, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83708EC[] = {
-    ANIMCMD_FRAME(2, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83708F4[] = {
-    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83708FC[] = {
-    ANIMCMD_FRAME(3, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(3, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370910[] = {
-    ANIMCMD_FRAME(4, 8),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_FRAME(4, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370924[] = {
-    ANIMCMD_FRAME(5, 8),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(6, 8),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370938[] = {
-    ANIMCMD_FRAME(5, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(6, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_837094C[] = {
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370960[] = {
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_FRAME(4, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370974[] = {
-    ANIMCMD_FRAME(5, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_FRAME(6, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370988[] = {
-    ANIMCMD_FRAME(5, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(6, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_837099C[] = {
-    ANIMCMD_FRAME(3, 2),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_FRAME(3, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83709B0[] = {
-    ANIMCMD_FRAME(4, 2),
-    ANIMCMD_FRAME(1, 2),
-    ANIMCMD_FRAME(4, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83709C4[] = {
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(2, 2),
-    ANIMCMD_FRAME(6, 2),
-    ANIMCMD_FRAME(2, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83709D8[] = {
-    ANIMCMD_FRAME(5, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(6, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_83709EC[] = {
-    ANIMCMD_FRAME(3, 1),
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(3, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A00[] = {
-    ANIMCMD_FRAME(4, 1),
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_FRAME(4, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A14[] = {
-    ANIMCMD_FRAME(5, 1),
-    ANIMCMD_FRAME(2, 1),
-    ANIMCMD_FRAME(6, 1),
-    ANIMCMD_FRAME(2, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A28[] = {
-    ANIMCMD_FRAME(5, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(6, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A3C[] = {
-    ANIMCMD_FRAME(0, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A44[] = {
-    ANIMCMD_FRAME(1, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A4C[] = {
-    ANIMCMD_FRAME(2, 16),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A54[] = {
-    ANIMCMD_FRAME(2, 16, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A5C[] = {
-    ANIMCMD_FRAME(3, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(4, 8),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A70[] = {
-    ANIMCMD_FRAME(5, 8),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_FRAME(6, 8),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A84[] = {
-    ANIMCMD_FRAME(7, 8),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(8, 8),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370A98[] = {
-    ANIMCMD_FRAME(7, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(8, 8, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 8, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370AAC[] = {
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370AC0[] = {
-    ANIMCMD_FRAME(5, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_FRAME(6, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370AD4[] = {
-    ANIMCMD_FRAME(7, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_FRAME(8, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370AE8[] = {
-    ANIMCMD_FRAME(7, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(8, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370AFC[] = {
-    ANIMCMD_FRAME(3, 2),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_FRAME(4, 2),
-    ANIMCMD_FRAME(0, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B10[] = {
-    ANIMCMD_FRAME(5, 2),
-    ANIMCMD_FRAME(1, 2),
-    ANIMCMD_FRAME(6, 2),
-    ANIMCMD_FRAME(1, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B24[] = {
-    ANIMCMD_FRAME(7, 2),
-    ANIMCMD_FRAME(2, 2),
-    ANIMCMD_FRAME(8, 2),
-    ANIMCMD_FRAME(2, 2),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B38[] = {
-    ANIMCMD_FRAME(7, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(8, 2, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 2, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B4C[] = {
-    ANIMCMD_FRAME(3, 1),
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_FRAME(4, 1),
-    ANIMCMD_FRAME(0, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B60[] = {
-    ANIMCMD_FRAME(5, 1),
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_FRAME(6, 1),
-    ANIMCMD_FRAME(1, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B74[] = {
-    ANIMCMD_FRAME(7, 1),
-    ANIMCMD_FRAME(2, 1),
-    ANIMCMD_FRAME(8, 1),
-    ANIMCMD_FRAME(2, 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B88[] = {
-    ANIMCMD_FRAME(7, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(8, 1, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370B9C[] = {
-    ANIMCMD_FRAME(12, 5),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_FRAME(13, 5),
-    ANIMCMD_FRAME(9, 3),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370BB0[] = {
-    ANIMCMD_FRAME(14, 5),
-    ANIMCMD_FRAME(10, 3),
-    ANIMCMD_FRAME(15, 5),
-    ANIMCMD_FRAME(10, 3),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370BC4[] = {
-    ANIMCMD_FRAME(16, 5),
-    ANIMCMD_FRAME(11, 3),
-    ANIMCMD_FRAME(17, 5),
-    ANIMCMD_FRAME(11, 3),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370BD8[] = {
-    ANIMCMD_FRAME(16, 5, .hFlip = TRUE),
-    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
-    ANIMCMD_FRAME(17, 5, .hFlip = TRUE),
-    ANIMCMD_FRAME(11, 3, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370BEC[] = {
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(4, 8),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C04[] = {
-    ANIMCMD_FRAME(9, 32),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C0C[] = {
-    ANIMCMD_FRAME(10, 32),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C14[] = {
-    ANIMCMD_FRAME(11, 32),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C1C[] = {
-    ANIMCMD_FRAME(11, 32, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C24[] = {
-    ANIMCMD_FRAME(9, 4),
-    ANIMCMD_FRAME(10, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C30[] = {
-    ANIMCMD_FRAME(13, 4),
-    ANIMCMD_FRAME(14, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C3C[] = {
-    ANIMCMD_FRAME(17, 4),
-    ANIMCMD_FRAME(18, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C48[] = {
-    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C54[] = {
-    ANIMCMD_FRAME(11, 4),
-    ANIMCMD_FRAME(12, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C60[] = {
-    ANIMCMD_FRAME(15, 4),
-    ANIMCMD_FRAME(16, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C6C[] = {
-    ANIMCMD_FRAME(19, 4),
-    ANIMCMD_FRAME(20, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C78[] = {
-    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(20, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C84[] = {
-    ANIMCMD_FRAME(9, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C90[] = {
-    ANIMCMD_FRAME(13, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370C9C[] = {
-    ANIMCMD_FRAME(17, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CA8[] = {
-    ANIMCMD_FRAME(17, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CB4[] = {
-    ANIMCMD_FRAME(11, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CC0[] = {
-    ANIMCMD_FRAME(15, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CCC[] = {
-    ANIMCMD_FRAME(19, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CD8[] = {
-    ANIMCMD_FRAME(19, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CE4[] = {
-    ANIMCMD_FRAME(21, 4),
-    ANIMCMD_FRAME(10, 4),
-    ANIMCMD_FRAME(22, 4),
-    ANIMCMD_FRAME(10, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370CF8[] = {
-    ANIMCMD_FRAME(23, 4),
-    ANIMCMD_FRAME(14, 4),
-    ANIMCMD_FRAME(24, 4),
-    ANIMCMD_FRAME(14, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D0C[] = {
-    ANIMCMD_FRAME(25, 4),
-    ANIMCMD_FRAME(18, 4),
-    ANIMCMD_FRAME(26, 4),
-    ANIMCMD_FRAME(18, 4),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D20[] = {
-    ANIMCMD_FRAME(25, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(26, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(18, 4, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D34[] = {
-    ANIMCMD_FRAME(0, 32),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D3C[] = {
-    ANIMCMD_FRAME(1, 32),
-    ANIMCMD_FRAME(2, 32),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D48[] = {
-    ANIMCMD_FRAME(3, 48),
-    ANIMCMD_FRAME(4, 48),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D54[] = {
-    ANIMCMD_FRAME(5, 32),
-    ANIMCMD_FRAME(5, 32),
-    ANIMCMD_FRAME(6, 32),
-    ANIMCMD_FRAME(6, 32),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D68[] = {
-    ANIMCMD_FRAME(7, 48),
-    ANIMCMD_FRAME(7, 48),
-    ANIMCMD_FRAME(8, 48),
-    ANIMCMD_FRAME(8, 48),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D7C[] = {
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(9, 32),
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370D8C[] = {
-    ANIMCMD_FRAME(0, 8),
-    ANIMCMD_FRAME(1, 8),
-    ANIMCMD_FRAME(2, 8),
-    ANIMCMD_FRAME(3, 8),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370DA0[] = {
-    ANIMCMD_FRAME(0, 6),
-    ANIMCMD_FRAME(1, 6),
-    ANIMCMD_FRAME(2, 6),
-    ANIMCMD_FRAME(3, 6),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370DB4[] = {
-    ANIMCMD_FRAME(8, 4),
-    ANIMCMD_FRAME(9, 4),
-    ANIMCMD_FRAME(10, 4),
-    ANIMCMD_FRAME(11, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370DC8[] = {
-    ANIMCMD_FRAME(4, 4),
-    ANIMCMD_FRAME(5, 4),
-    ANIMCMD_FRAME(6, 4),
-    ANIMCMD_FRAME(7, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370DDC[] = {
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370DF0[] = {
-    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E04[] = {
-    ANIMCMD_FRAME(11, 4),
-    ANIMCMD_FRAME(10, 6),
-    ANIMCMD_FRAME(9, 6),
-    ANIMCMD_FRAME(8, 6),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E18[] = {
-    ANIMCMD_FRAME(7, 4),
-    ANIMCMD_FRAME(6, 6),
-    ANIMCMD_FRAME(5, 6),
-    ANIMCMD_FRAME(4, 6),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E2C[] = {
-    ANIMCMD_FRAME(3, 4),
-    ANIMCMD_FRAME(2, 4),
-    ANIMCMD_FRAME(1, 4),
-    ANIMCMD_FRAME(0, 4),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E40[] = {
-    ANIMCMD_FRAME(3, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(2, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(1, 4, .hFlip = TRUE),
-    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
-    ANIMCMD_END
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E54[] = {
-    ANIMCMD_FRAME(10, 6),
-    ANIMCMD_FRAME(11, 6),
-    ANIMCMD_LOOP(1),
-    ANIMCMD_FRAME(11, 30),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E68[] = {
-    ANIMCMD_FRAME(6, 6),
-    ANIMCMD_FRAME(7, 6),
-    ANIMCMD_LOOP(1),
-    ANIMCMD_FRAME(7, 30),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E7C[] = {
-    ANIMCMD_FRAME(2, 6),
-    ANIMCMD_FRAME(3, 6),
-    ANIMCMD_LOOP(1),
-    ANIMCMD_FRAME(3, 30),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gMapObjectImageAnim_8370E90[] = {
-    ANIMCMD_FRAME(2, 6, .hFlip = TRUE),
-    ANIMCMD_FRAME(3, 6, .hFlip = TRUE),
-    ANIMCMD_LOOP(1),
-    ANIMCMD_FRAME(3, 30, .hFlip = TRUE),
-    ANIMCMD_JUMP(0)
-};
-
-const union AffineAnimCmd gMapObjectRotScalAnim_8370EA4[] = {
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
-    AFFINEANIMCMD_LOOP(7),
-    AFFINEANIMCMD_JUMP(0)
-};
-
-const union AffineAnimCmd gMapObjectRotScalAnim_8370ED4[] = {
-    AFFINEANIMCMD_FRAME(0x0, 0x0, -1, 1),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
-    AFFINEANIMCMD_LOOP(15),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 1, 1),
-    AFFINEANIMCMD_FRAME(0x0, 0x0, 0, 1),
-    AFFINEANIMCMD_LOOP(15),
-    AFFINEANIMCMD_JUMP(0)
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_Inanimate[] = {
-    gMapObjectImageAnim_83708C8
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_QuintyPlump[] = {
-    gMapObjectImageAnim_83708DC,
-    gMapObjectImageAnim_83708E4,
-    gMapObjectImageAnim_83708EC,
-    gMapObjectImageAnim_83708F4,
-    gMapObjectImageAnim_83708FC,
-    gMapObjectImageAnim_8370910,
-    gMapObjectImageAnim_8370924,
-    gMapObjectImageAnim_8370938,
-    gMapObjectImageAnim_837094C,
-    gMapObjectImageAnim_8370960,
-    gMapObjectImageAnim_8370974,
-    gMapObjectImageAnim_8370988,
-    gMapObjectImageAnim_837099C,
-    gMapObjectImageAnim_83709B0,
-    gMapObjectImageAnim_83709C4,
-    gMapObjectImageAnim_83709D8,
-    gMapObjectImageAnim_83709EC,
-    gMapObjectImageAnim_8370A00,
-    gMapObjectImageAnim_8370A14,
-    gMapObjectImageAnim_8370A28
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_Standard[] = {
-    gMapObjectImageAnim_8370A3C,
-    gMapObjectImageAnim_8370A44,
-    gMapObjectImageAnim_8370A4C,
-    gMapObjectImageAnim_8370A54,
-    gMapObjectImageAnim_8370A5C,
-    gMapObjectImageAnim_8370A70,
-    gMapObjectImageAnim_8370A84,
-    gMapObjectImageAnim_8370A98,
-    gMapObjectImageAnim_8370AAC,
-    gMapObjectImageAnim_8370AC0,
-    gMapObjectImageAnim_8370AD4,
-    gMapObjectImageAnim_8370AE8,
-    gMapObjectImageAnim_8370AFC,
-    gMapObjectImageAnim_8370B10,
-    gMapObjectImageAnim_8370B24,
-    gMapObjectImageAnim_8370B38,
-    gMapObjectImageAnim_8370B4C,
-    gMapObjectImageAnim_8370B60,
-    gMapObjectImageAnim_8370B74,
-    gMapObjectImageAnim_8370B88
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_BrendanMayNormal[] = {
-    gMapObjectImageAnim_8370A3C,
-    gMapObjectImageAnim_8370A44,
-    gMapObjectImageAnim_8370A4C,
-    gMapObjectImageAnim_8370A54,
-    gMapObjectImageAnim_8370A5C,
-    gMapObjectImageAnim_8370A70,
-    gMapObjectImageAnim_8370A84,
-    gMapObjectImageAnim_8370A98,
-    gMapObjectImageAnim_8370AAC,
-    gMapObjectImageAnim_8370AC0,
-    gMapObjectImageAnim_8370AD4,
-    gMapObjectImageAnim_8370AE8,
-    gMapObjectImageAnim_8370AFC,
-    gMapObjectImageAnim_8370B10,
-    gMapObjectImageAnim_8370B24,
-    gMapObjectImageAnim_8370B38,
-    gMapObjectImageAnim_8370B4C,
-    gMapObjectImageAnim_8370B60,
-    gMapObjectImageAnim_8370B74,
-    gMapObjectImageAnim_8370B88,
-    gMapObjectImageAnim_8370B9C,
-    gMapObjectImageAnim_8370BB0,
-    gMapObjectImageAnim_8370BC4,
-    gMapObjectImageAnim_8370BD8
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_AcroBike[] = {
-    gMapObjectImageAnim_8370A3C,
-    gMapObjectImageAnim_8370A44,
-    gMapObjectImageAnim_8370A4C,
-    gMapObjectImageAnim_8370A54,
-    gMapObjectImageAnim_8370A5C,
-    gMapObjectImageAnim_8370A70,
-    gMapObjectImageAnim_8370A84,
-    gMapObjectImageAnim_8370A98,
-    gMapObjectImageAnim_8370AAC,
-    gMapObjectImageAnim_8370AC0,
-    gMapObjectImageAnim_8370AD4,
-    gMapObjectImageAnim_8370AE8,
-    gMapObjectImageAnim_8370AFC,
-    gMapObjectImageAnim_8370B10,
-    gMapObjectImageAnim_8370B24,
-    gMapObjectImageAnim_8370B38,
-    gMapObjectImageAnim_8370B4C,
-    gMapObjectImageAnim_8370B60,
-    gMapObjectImageAnim_8370B74,
-    gMapObjectImageAnim_8370B88,
-    gMapObjectImageAnim_8370C24,
-    gMapObjectImageAnim_8370C30,
-    gMapObjectImageAnim_8370C3C,
-    gMapObjectImageAnim_8370C48,
-    gMapObjectImageAnim_8370C54,
-    gMapObjectImageAnim_8370C60,
-    gMapObjectImageAnim_8370C6C,
-    gMapObjectImageAnim_8370C78,
-    gMapObjectImageAnim_8370C84,
-    gMapObjectImageAnim_8370C90,
-    gMapObjectImageAnim_8370C9C,
-    gMapObjectImageAnim_8370CA8,
-    gMapObjectImageAnim_8370CB4,
-    gMapObjectImageAnim_8370CC0,
-    gMapObjectImageAnim_8370CCC,
-    gMapObjectImageAnim_8370CD8,
-    gMapObjectImageAnim_8370CE4,
-    gMapObjectImageAnim_8370CF8,
-    gMapObjectImageAnim_8370D0C,
-    gMapObjectImageAnim_8370D20
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_Surfing[] = {
-    gMapObjectImageAnim_8370A3C,
-    gMapObjectImageAnim_8370A44,
-    gMapObjectImageAnim_8370A4C,
-    gMapObjectImageAnim_8370A54,
-    gMapObjectImageAnim_8370A5C,
-    gMapObjectImageAnim_8370A70,
-    gMapObjectImageAnim_8370A84,
-    gMapObjectImageAnim_8370A98,
-    gMapObjectImageAnim_8370AAC,
-    gMapObjectImageAnim_8370AC0,
-    gMapObjectImageAnim_8370AD4,
-    gMapObjectImageAnim_8370AE8,
-    gMapObjectImageAnim_8370AFC,
-    gMapObjectImageAnim_8370B10,
-    gMapObjectImageAnim_8370B24,
-    gMapObjectImageAnim_8370B38,
-    gMapObjectImageAnim_8370B4C,
-    gMapObjectImageAnim_8370B60,
-    gMapObjectImageAnim_8370B74,
-    gMapObjectImageAnim_8370B88,
-    gMapObjectImageAnim_8370C04,
-    gMapObjectImageAnim_8370C0C,
-    gMapObjectImageAnim_8370C14,
-    gMapObjectImageAnim_8370C1C
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_Nurse[] = {
-    gMapObjectImageAnim_8370A3C,
-    gMapObjectImageAnim_8370A44,
-    gMapObjectImageAnim_8370A4C,
-    gMapObjectImageAnim_8370A54,
-    gMapObjectImageAnim_8370A5C,
-    gMapObjectImageAnim_8370A70,
-    gMapObjectImageAnim_8370A84,
-    gMapObjectImageAnim_8370A98,
-    gMapObjectImageAnim_8370AAC,
-    gMapObjectImageAnim_8370AC0,
-    gMapObjectImageAnim_8370AD4,
-    gMapObjectImageAnim_8370AE8,
-    gMapObjectImageAnim_8370AFC,
-    gMapObjectImageAnim_8370B10,
-    gMapObjectImageAnim_8370B24,
-    gMapObjectImageAnim_8370B38,
-    gMapObjectImageAnim_8370B4C,
-    gMapObjectImageAnim_8370B60,
-    gMapObjectImageAnim_8370B74,
-    gMapObjectImageAnim_8370B88,
-    gMapObjectImageAnim_8370D7C
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_FieldMove[] = {
-    gMapObjectImageAnim_8370BEC
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_BerryTree[] = {
-    gMapObjectImageAnim_8370D34,
-    gMapObjectImageAnim_8370D3C,
-    gMapObjectImageAnim_8370D48,
-    gMapObjectImageAnim_8370D54,
-    gMapObjectImageAnim_8370D68
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_BreakableRock[] = {
-    gMapObjectImageAnim_83708C8,
-    gMapObjectImageAnim_8370D8C
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_CuttableTree[] = {
-    gMapObjectImageAnim_83708C8,
-    gMapObjectImageAnim_8370DA0
-};
-
-const union AnimCmd *const gMapObjectImageAnimTable_Fishing[] = {
-    gMapObjectImageAnim_8370DB4,
-    gMapObjectImageAnim_8370DC8,
-    gMapObjectImageAnim_8370DDC,
-    gMapObjectImageAnim_8370DF0,
-    gMapObjectImageAnim_8370E04,
-    gMapObjectImageAnim_8370E18,
-    gMapObjectImageAnim_8370E2C,
-    gMapObjectImageAnim_8370E40,
-    gMapObjectImageAnim_8370E54,
-    gMapObjectImageAnim_8370E68,
-    gMapObjectImageAnim_8370E7C,
-    gMapObjectImageAnim_8370E90
-};
-
-const union AffineAnimCmd *const gMapObjectRotScalAnimTable_KyogreGroudon[] = {
-    gMapObjectRotScalAnim_8370EA4,
-    gMapObjectRotScalAnim_8370ED4
-};
-
-#endif //POKERUBY_MAP_OBJECT_ANIMS_H
diff --git a/src/data/field_map_obj/map_object_graphics_info.h b/src/data/field_map_obj/map_object_graphics_info.h
deleted file mode 100644
index 7b021b66d..000000000
--- a/src/data/field_map_obj/map_object_graphics_info.h
+++ /dev/null
@@ -1,227 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_MAP_OBJECT_GRAPHICS_INFO_H
-#define POKERUBY_MAP_OBJECT_GRAPHICS_INFO_H
-
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanNormal = {0xffff, 0x1100, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Surfing, gMapObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_FieldMove, gMapObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_QuintyPlump = {0xffff, 0x110b, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_QuintyPlump, gMapObjectPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy1 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LittleBoy1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleGirl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LittleGirl1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Boy1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl1 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Girl1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Boy2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Girl2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy2 = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LittleBoy2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleGirl2 = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LittleGirl2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy3 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Boy3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Girl3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy4 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Boy4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman1 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_FatMan = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_FatMan, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman2 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman3 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldMan1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_OldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldWoman1 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_OldWoman1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man3 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman5 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Cook = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Cook, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman6 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman6, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_OldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldWoman2 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_OldWoman2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Camper = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Camper, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Picnicker = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Picnicker, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man4 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man4, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman7, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Youngster = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Youngster, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BugCatcher = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BugCatcher, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PsychicM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_PsychicM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SchoolKidM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Maniac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Maniac, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_HexManiac = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_HexManiac, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman8 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Woman8, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwimmerM = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_SwimmerM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwimmerF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_SwimmerF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BlackBelt = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BlackBelt, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Beauty = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Beauty, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Scientist1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Scientist1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Lass = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Lass, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Gentleman = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Gentleman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Sailor = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Sailor, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Fisherman = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Fisherman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RunningTriathleteM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RunningTriathleteF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberF = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_TuberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberM = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_TuberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Hiker = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Hiker, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyclingTriathleteM = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyclingTriathleteF = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Nurse = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Nurse, gMapObjectPicTable_Nurse, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ItemBall = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_ItemBall, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTree = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, NULL, gMapObjectImageAnimTable_BerryTree, gMapObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTreeEarlyStages = {0xffff, 0x1103, 0x11ff, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_BerryTree, gMapObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTreeLateStages = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BerryTree, gMapObjectPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ProfBirch = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_ProfBirch, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man5 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man6 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man6, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ReporterM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_ReporterM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ReporterF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_ReporterF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Bard = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Hipster = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Trader = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Storyteller = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Giddy = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMauvilleOldMan1 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMauvilleOldMan2 = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedNatuDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMagnemiteDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedSquirtleDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedWooperDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedPikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedPorygon2Doll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CuttableTree = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_CuttableTree, gMapObjectPicTable_CuttableTree, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MartEmployee = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MartEmployee, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RooftopSaleWoman = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Teala = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Teala, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BreakableRock = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_BreakableRock, gMapObjectPicTable_BreakableRock, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PushableBoulder = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MrBrineysBoat = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayNormal = {0xffff, 0x1110, 0x1102, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Surfing, gMapObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_FieldMove, gMapObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Truck = {0xffff, 0x110d, 0x11ff, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_Truck, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_Truck, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MachokeCarryingBox = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MachokeCarryingBox, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MachokeFacingAway = {0xffff, 0x110e, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MachokeFacingAway, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BirchsBag = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BirchsBag, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Poochyena = {0xffff, 0x110f, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Poochyena, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Artist = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Artist, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanNormal = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanMachBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanAcroBike = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanSurfing = {0xffff, 0x1100, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Surfing, gMapObjectPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanFieldMove = {0xffff, 0x1100, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_FieldMove, gMapObjectPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayNormal = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayMachBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayAcroBike = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_AcroBike, gMapObjectPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMaySurfing = {0xffff, 0x1110, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Surfing, gMapObjectPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayFieldMove = {0xffff, 0x1110, 0x1102, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_FieldMove, gMapObjectPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Cameraman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Cameraman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayUnderwater = {0xffff, 0x1115, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MovingBox = {0xffff, 0x1112, 0x11ff, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_MovingBox, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CableCar = {0xffff, 0x1113, 0x11ff, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_64x64, gMapObjectSubspriteTables_CableCar, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_CableCar, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Scientist2 = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Scientist2, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man7 = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Man7, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AquaMemberM = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AquaMemberF = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MagmaMemberM = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MagmaMemberF = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Sidney = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Sidney, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Phoebe = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Phoebe, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Glacia = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Glacia, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Drake = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Drake, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Roxanne = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Roxanne, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Brawly = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Brawly, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wattson = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Wattson, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Flannery = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Flannery, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Norman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Norman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Winona = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Winona, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Liza = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Liza, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Tate = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Tate, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wallace = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Wallace, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Steven = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Steven, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wally = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Wally, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy3 = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LittleBoy3, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanFishing = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Fishing, gMapObjectPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayFishing = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Fishing, gMapObjectPicTable_MayFishing, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_HotSpringsOldWoman = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SSTidal = {0xffff, 0x1114, 0x11ff, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gMapObjectSubspriteTables_SSTidal, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_SSTidal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SubmarineShadow = {0xffff, 0x111a, 0x11ff, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_8x8, gMapObjectSubspriteTables_SubmarineShadow, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PichuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_PichuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PikachuDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MarillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_MarillDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TogepiDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyndaquilDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ChikoritaDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TotodileDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_JigglypuffDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MeowthDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ClefairyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DittoDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_DittoDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SmoochumDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TreeckoDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TorchicDoll = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MudkipDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DuskullDoll = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_WynautDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_WynautDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BaltoyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_KecleonDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AzurillDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SkittyDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwabluDoll = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_GulpinDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LotadDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_LotadDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SeedotDoll = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PikaCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_PikaCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RoundCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_RoundCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_KissCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_KissCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ZigzagCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SpinCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_SpinCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DiamondCushion = {0xffff, 0x1106, 0x11ff, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BallCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BallCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_GrassCushion = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_GrassCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_FireCushion = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_FireCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_WaterCushion = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_WaterCushion, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigSnorlaxDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRhydonDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigLaprasDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigVenusaurDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigCharizardDoll = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigBlastoiseDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigWailmerDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegirockDoll = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegiceDoll = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegisteelDoll = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Latias = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Latios = {0xffff, 0x1103, 0x11ff, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy5 = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Boy5, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ContestJudge = {0xffff, 0x1105, 0x11ff, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_ContestJudge, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanWatering = {0xffff, 0x1100, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayWatering = {0xffff, 0x1110, 0x1102, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_MayWatering, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanDecorating = {0xffff, 0x1100, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayDecorating = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_MayDecorating, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Archie = {0xffff, 0x1103, 0x11ff, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Archie, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Maxie = {0xffff, 0x1104, 0x11ff, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Maxie, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kyogre1 = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Kyogre, gMapObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Groudon1 = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Groudon, gMapObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Fossil = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Inanimate, gMapObjectPicTable_Fossil, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Regirock = {0xffff, 0x1104, 0x11ff, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Regice = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Registeel = {0xffff, 0x1106, 0x11ff, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Skitty = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Skitty, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kecleon1 = {0xffff, 0x1105, 0x11ff, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kyogre2 = {0xffff, 0x1116, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Kyogre, gMapObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Groudon2 = {0xffff, 0x1118, 0x11ff, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Groudon, gMapObjectRotScalAnimTable_KyogreGroudon};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Rayquaza = {0xffff, 0x1105, 0x11ff, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_32x32, gMapObjectSubspriteTables_32x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Rayquaza, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Zigzagoon = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Pikachu = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Pikachu, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Azumarill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Azumarill, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wingull = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Wingull, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kecleon2 = {0xffff, 0x1105, 0x1102, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberMSwimming = {0xffff, 0x1104, 0x11ff, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Azurill = {0xffff, 0x1103, 0x11ff, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x16, gMapObjectSubspriteTables_16x16, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Azurill, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Mom = {0xffff, 0x1106, 0x11ff, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_Standard, gMapObjectPicTable_Mom, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LinkBrendan = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LinkMay = {0xffff, 0x1110, 0x1102, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gFieldOamData_16x32, gMapObjectSubspriteTables_16x32, gMapObjectImageAnimTable_BrendanMayNormal, gMapObjectPicTable_MayNormal, gDummySpriteAffineAnimTable};
-
-#endif //POKERUBY_MAP_OBJECT_GRAPHICS_INFO_H
diff --git a/src/data/field_map_obj/map_object_graphics_info_pointers.h b/src/data/field_map_obj/map_object_graphics_info_pointers.h
deleted file mode 100644
index 22a052b0d..000000000
--- a/src/data/field_map_obj/map_object_graphics_info_pointers.h
+++ /dev/null
@@ -1,448 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_MAP_OBJECT_GRAPHICS_INFO_POINTERS_H
-#define POKERUBY_MAP_OBJECT_GRAPHICS_INFO_POINTERS_H
-
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanNormal;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanMachBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanSurfing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanFieldMove;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_QuintyPlump;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleGirl1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleGirl2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy3;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Girl3;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy4;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_FatMan;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman3;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldMan1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldWoman1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman4;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man3;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman5;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Cook;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman6;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldMan2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_OldWoman2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Camper;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Picnicker;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man4;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman7;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Youngster;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BugCatcher;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PsychicM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SchoolKidM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Maniac;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_HexManiac;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Woman8;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwimmerM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwimmerF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BlackBelt;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Beauty;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Scientist1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Lass;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Gentleman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Sailor;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Fisherman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RunningTriathleteM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RunningTriathleteF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Hiker;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyclingTriathleteM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyclingTriathleteF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Nurse;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ItemBall;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTree;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTreeEarlyStages;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BerryTreeLateStages;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanAcroBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ProfBirch;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man5;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man6;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ReporterM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ReporterF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Bard;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Hipster;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Trader;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Storyteller;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Giddy;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMauvilleOldMan1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMauvilleOldMan2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedNatuDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedMagnemiteDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedSquirtleDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedWooperDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedPikachuDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_UnusedPorygon2Doll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CuttableTree;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MartEmployee;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RooftopSaleWoman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Teala;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BreakableRock;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PushableBoulder;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MrBrineysBoat;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayNormal;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayMachBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayAcroBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MaySurfing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayFieldMove;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Truck;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MachokeCarryingBox;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MachokeFacingAway;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BirchsBag;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Poochyena;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Artist;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanNormal;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanMachBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanAcroBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanSurfing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalBrendanFieldMove;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayNormal;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayMachBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayAcroBike;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMaySurfing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RivalMayFieldMove;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Cameraman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanUnderwater;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayUnderwater;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MovingBox;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CableCar;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Scientist2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Man7;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AquaMemberM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AquaMemberF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MagmaMemberM;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MagmaMemberF;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Sidney;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Phoebe;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Glacia;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Drake;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Roxanne;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Brawly;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wattson;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Flannery;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Norman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Winona;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Liza;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Tate;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wallace;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Steven;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wally;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LittleBoy3;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanFishing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayFishing;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_HotSpringsOldWoman;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SSTidal;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SubmarineShadow;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PichuDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PikachuDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MarillDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TogepiDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_CyndaquilDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ChikoritaDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TotodileDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_JigglypuffDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MeowthDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ClefairyDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DittoDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SmoochumDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TreeckoDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TorchicDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MudkipDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DuskullDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_WynautDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BaltoyDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_KecleonDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_AzurillDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SkittyDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SwabluDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_GulpinDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LotadDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SeedotDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_PikaCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_RoundCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_KissCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ZigzagCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_SpinCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_DiamondCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BallCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_GrassCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_FireCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_WaterCushion;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigSnorlaxDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRhydonDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigLaprasDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigVenusaurDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigCharizardDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigBlastoiseDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigWailmerDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegirockDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegiceDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BigRegisteelDoll;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Latias;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Latios;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Boy5;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_ContestJudge;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanWatering;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayWatering;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_BrendanDecorating;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_MayDecorating;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Archie;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Maxie;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kyogre1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Groudon1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Fossil;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Regirock;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Regice;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Registeel;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Skitty;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kecleon1;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kyogre2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Groudon2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Rayquaza;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Zigzagoon;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Pikachu;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Azumarill;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Wingull;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Kecleon2;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_TuberMSwimming;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Azurill;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_Mom;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LinkBrendan;
-const struct MapObjectGraphicsInfo gMapObjectGraphicsInfo_LinkMay;
-
-const struct MapObjectGraphicsInfo *const gMapObjectGraphicsInfoPointers[] = {
-    &gMapObjectGraphicsInfo_BrendanNormal,
-    &gMapObjectGraphicsInfo_BrendanMachBike,
-    &gMapObjectGraphicsInfo_BrendanSurfing,
-    &gMapObjectGraphicsInfo_BrendanFieldMove,
-    &gMapObjectGraphicsInfo_QuintyPlump,
-    &gMapObjectGraphicsInfo_LittleBoy1,
-    &gMapObjectGraphicsInfo_LittleGirl1,
-    &gMapObjectGraphicsInfo_Boy1,
-    &gMapObjectGraphicsInfo_Girl1,
-    &gMapObjectGraphicsInfo_Boy2,
-    &gMapObjectGraphicsInfo_Girl2,
-    &gMapObjectGraphicsInfo_LittleBoy2,
-    &gMapObjectGraphicsInfo_LittleGirl2,
-    &gMapObjectGraphicsInfo_Boy3,
-    &gMapObjectGraphicsInfo_Girl3,
-    &gMapObjectGraphicsInfo_Boy4,
-    &gMapObjectGraphicsInfo_Woman1,
-    &gMapObjectGraphicsInfo_FatMan,
-    &gMapObjectGraphicsInfo_Woman2,
-    &gMapObjectGraphicsInfo_Man1,
-    &gMapObjectGraphicsInfo_Woman3,
-    &gMapObjectGraphicsInfo_OldMan1,
-    &gMapObjectGraphicsInfo_OldWoman1,
-    &gMapObjectGraphicsInfo_Man2,
-    &gMapObjectGraphicsInfo_Woman4,
-    &gMapObjectGraphicsInfo_Man3,
-    &gMapObjectGraphicsInfo_Woman5,
-    &gMapObjectGraphicsInfo_Cook,
-    &gMapObjectGraphicsInfo_Woman6,
-    &gMapObjectGraphicsInfo_OldMan2,
-    &gMapObjectGraphicsInfo_OldWoman2,
-    &gMapObjectGraphicsInfo_Camper,
-    &gMapObjectGraphicsInfo_Picnicker,
-    &gMapObjectGraphicsInfo_Man4,
-    &gMapObjectGraphicsInfo_Woman7,
-    &gMapObjectGraphicsInfo_Youngster,
-    &gMapObjectGraphicsInfo_BugCatcher,
-    &gMapObjectGraphicsInfo_PsychicM,
-    &gMapObjectGraphicsInfo_SchoolKidM,
-    &gMapObjectGraphicsInfo_Maniac,
-    &gMapObjectGraphicsInfo_HexManiac,
-    &gMapObjectGraphicsInfo_Woman8,
-    &gMapObjectGraphicsInfo_SwimmerM,
-    &gMapObjectGraphicsInfo_SwimmerF,
-    &gMapObjectGraphicsInfo_BlackBelt,
-    &gMapObjectGraphicsInfo_Beauty,
-    &gMapObjectGraphicsInfo_Scientist1,
-    &gMapObjectGraphicsInfo_Lass,
-    &gMapObjectGraphicsInfo_Gentleman,
-    &gMapObjectGraphicsInfo_Sailor,
-    &gMapObjectGraphicsInfo_Fisherman,
-    &gMapObjectGraphicsInfo_RunningTriathleteM,
-    &gMapObjectGraphicsInfo_RunningTriathleteF,
-    &gMapObjectGraphicsInfo_TuberF,
-    &gMapObjectGraphicsInfo_TuberM,
-    &gMapObjectGraphicsInfo_Hiker,
-    &gMapObjectGraphicsInfo_CyclingTriathleteM,
-    &gMapObjectGraphicsInfo_CyclingTriathleteF,
-    &gMapObjectGraphicsInfo_Nurse,
-    &gMapObjectGraphicsInfo_ItemBall,
-    &gMapObjectGraphicsInfo_BerryTree,
-    &gMapObjectGraphicsInfo_BerryTreeEarlyStages,
-    &gMapObjectGraphicsInfo_BerryTreeLateStages,
-    &gMapObjectGraphicsInfo_BrendanAcroBike,
-    &gMapObjectGraphicsInfo_ProfBirch,
-    &gMapObjectGraphicsInfo_Man5,
-    &gMapObjectGraphicsInfo_Man6,
-    &gMapObjectGraphicsInfo_ReporterM,
-    &gMapObjectGraphicsInfo_ReporterF,
-    &gMapObjectGraphicsInfo_Bard,
-    &gMapObjectGraphicsInfo_Hipster,
-    &gMapObjectGraphicsInfo_Trader,
-    &gMapObjectGraphicsInfo_Storyteller,
-    &gMapObjectGraphicsInfo_Giddy,
-    &gMapObjectGraphicsInfo_UnusedMauvilleOldMan1,
-    &gMapObjectGraphicsInfo_UnusedMauvilleOldMan2,
-    &gMapObjectGraphicsInfo_UnusedNatuDoll,
-    &gMapObjectGraphicsInfo_UnusedMagnemiteDoll,
-    &gMapObjectGraphicsInfo_UnusedSquirtleDoll,
-    &gMapObjectGraphicsInfo_UnusedWooperDoll,
-    &gMapObjectGraphicsInfo_UnusedPikachuDoll,
-    &gMapObjectGraphicsInfo_UnusedPorygon2Doll,
-    &gMapObjectGraphicsInfo_CuttableTree,
-    &gMapObjectGraphicsInfo_MartEmployee,
-    &gMapObjectGraphicsInfo_RooftopSaleWoman,
-    &gMapObjectGraphicsInfo_Teala,
-    &gMapObjectGraphicsInfo_BreakableRock,
-    &gMapObjectGraphicsInfo_PushableBoulder,
-    &gMapObjectGraphicsInfo_MrBrineysBoat,
-    &gMapObjectGraphicsInfo_MayNormal,
-    &gMapObjectGraphicsInfo_MayMachBike,
-    &gMapObjectGraphicsInfo_MayAcroBike,
-    &gMapObjectGraphicsInfo_MaySurfing,
-    &gMapObjectGraphicsInfo_MayFieldMove,
-    &gMapObjectGraphicsInfo_Truck,
-    &gMapObjectGraphicsInfo_MachokeCarryingBox,
-    &gMapObjectGraphicsInfo_MachokeFacingAway,
-    &gMapObjectGraphicsInfo_BirchsBag,
-    &gMapObjectGraphicsInfo_Poochyena,
-    &gMapObjectGraphicsInfo_Artist,
-    &gMapObjectGraphicsInfo_RivalBrendanNormal,
-    &gMapObjectGraphicsInfo_RivalBrendanMachBike,
-    &gMapObjectGraphicsInfo_RivalBrendanAcroBike,
-    &gMapObjectGraphicsInfo_RivalBrendanSurfing,
-    &gMapObjectGraphicsInfo_RivalBrendanFieldMove,
-    &gMapObjectGraphicsInfo_RivalMayNormal,
-    &gMapObjectGraphicsInfo_RivalMayMachBike,
-    &gMapObjectGraphicsInfo_RivalMayAcroBike,
-    &gMapObjectGraphicsInfo_RivalMaySurfing,
-    &gMapObjectGraphicsInfo_RivalMayFieldMove,
-    &gMapObjectGraphicsInfo_Cameraman,
-    &gMapObjectGraphicsInfo_BrendanUnderwater,
-    &gMapObjectGraphicsInfo_MayUnderwater,
-    &gMapObjectGraphicsInfo_MovingBox,
-    &gMapObjectGraphicsInfo_CableCar,
-    &gMapObjectGraphicsInfo_Scientist2,
-    &gMapObjectGraphicsInfo_Man7,
-    &gMapObjectGraphicsInfo_AquaMemberM,
-    &gMapObjectGraphicsInfo_AquaMemberF,
-    &gMapObjectGraphicsInfo_MagmaMemberM,
-    &gMapObjectGraphicsInfo_MagmaMemberF,
-    &gMapObjectGraphicsInfo_Sidney,
-    &gMapObjectGraphicsInfo_Phoebe,
-    &gMapObjectGraphicsInfo_Glacia,
-    &gMapObjectGraphicsInfo_Drake,
-    &gMapObjectGraphicsInfo_Roxanne,
-    &gMapObjectGraphicsInfo_Brawly,
-    &gMapObjectGraphicsInfo_Wattson,
-    &gMapObjectGraphicsInfo_Flannery,
-    &gMapObjectGraphicsInfo_Norman,
-    &gMapObjectGraphicsInfo_Winona,
-    &gMapObjectGraphicsInfo_Liza,
-    &gMapObjectGraphicsInfo_Tate,
-    &gMapObjectGraphicsInfo_Wallace,
-    &gMapObjectGraphicsInfo_Steven,
-    &gMapObjectGraphicsInfo_Wally,
-    &gMapObjectGraphicsInfo_LittleBoy3,
-    &gMapObjectGraphicsInfo_BrendanFishing,
-    &gMapObjectGraphicsInfo_MayFishing,
-    &gMapObjectGraphicsInfo_HotSpringsOldWoman,
-    &gMapObjectGraphicsInfo_SSTidal,
-    &gMapObjectGraphicsInfo_SubmarineShadow,
-    &gMapObjectGraphicsInfo_PichuDoll,
-    &gMapObjectGraphicsInfo_PikachuDoll,
-    &gMapObjectGraphicsInfo_MarillDoll,
-    &gMapObjectGraphicsInfo_TogepiDoll,
-    &gMapObjectGraphicsInfo_CyndaquilDoll,
-    &gMapObjectGraphicsInfo_ChikoritaDoll,
-    &gMapObjectGraphicsInfo_TotodileDoll,
-    &gMapObjectGraphicsInfo_JigglypuffDoll,
-    &gMapObjectGraphicsInfo_MeowthDoll,
-    &gMapObjectGraphicsInfo_ClefairyDoll,
-    &gMapObjectGraphicsInfo_DittoDoll,
-    &gMapObjectGraphicsInfo_SmoochumDoll,
-    &gMapObjectGraphicsInfo_TreeckoDoll,
-    &gMapObjectGraphicsInfo_TorchicDoll,
-    &gMapObjectGraphicsInfo_MudkipDoll,
-    &gMapObjectGraphicsInfo_DuskullDoll,
-    &gMapObjectGraphicsInfo_WynautDoll,
-    &gMapObjectGraphicsInfo_BaltoyDoll,
-    &gMapObjectGraphicsInfo_KecleonDoll,
-    &gMapObjectGraphicsInfo_AzurillDoll,
-    &gMapObjectGraphicsInfo_SkittyDoll,
-    &gMapObjectGraphicsInfo_SwabluDoll,
-    &gMapObjectGraphicsInfo_GulpinDoll,
-    &gMapObjectGraphicsInfo_LotadDoll,
-    &gMapObjectGraphicsInfo_SeedotDoll,
-    &gMapObjectGraphicsInfo_PikaCushion,
-    &gMapObjectGraphicsInfo_RoundCushion,
-    &gMapObjectGraphicsInfo_KissCushion,
-    &gMapObjectGraphicsInfo_ZigzagCushion,
-    &gMapObjectGraphicsInfo_SpinCushion,
-    &gMapObjectGraphicsInfo_DiamondCushion,
-    &gMapObjectGraphicsInfo_BallCushion,
-    &gMapObjectGraphicsInfo_GrassCushion,
-    &gMapObjectGraphicsInfo_FireCushion,
-    &gMapObjectGraphicsInfo_WaterCushion,
-    &gMapObjectGraphicsInfo_BigSnorlaxDoll,
-    &gMapObjectGraphicsInfo_BigRhydonDoll,
-    &gMapObjectGraphicsInfo_BigLaprasDoll,
-    &gMapObjectGraphicsInfo_BigVenusaurDoll,
-    &gMapObjectGraphicsInfo_BigCharizardDoll,
-    &gMapObjectGraphicsInfo_BigBlastoiseDoll,
-    &gMapObjectGraphicsInfo_BigWailmerDoll,
-    &gMapObjectGraphicsInfo_BigRegirockDoll,
-    &gMapObjectGraphicsInfo_BigRegiceDoll,
-    &gMapObjectGraphicsInfo_BigRegisteelDoll,
-    &gMapObjectGraphicsInfo_Latias,
-    &gMapObjectGraphicsInfo_Latios,
-    &gMapObjectGraphicsInfo_Boy5,
-    &gMapObjectGraphicsInfo_ContestJudge,
-    &gMapObjectGraphicsInfo_BrendanWatering,
-    &gMapObjectGraphicsInfo_MayWatering,
-    &gMapObjectGraphicsInfo_BrendanDecorating,
-    &gMapObjectGraphicsInfo_MayDecorating,
-    &gMapObjectGraphicsInfo_Archie,
-    &gMapObjectGraphicsInfo_Maxie,
-    &gMapObjectGraphicsInfo_Kyogre1,
-    &gMapObjectGraphicsInfo_Groudon1,
-    &gMapObjectGraphicsInfo_Fossil,
-    &gMapObjectGraphicsInfo_Regirock,
-    &gMapObjectGraphicsInfo_Regice,
-    &gMapObjectGraphicsInfo_Registeel,
-    &gMapObjectGraphicsInfo_Skitty,
-    &gMapObjectGraphicsInfo_Kecleon1,
-    &gMapObjectGraphicsInfo_Kyogre2,
-    &gMapObjectGraphicsInfo_Groudon2,
-    &gMapObjectGraphicsInfo_Rayquaza,
-    &gMapObjectGraphicsInfo_Zigzagoon,
-    &gMapObjectGraphicsInfo_Pikachu,
-    &gMapObjectGraphicsInfo_Azumarill,
-    &gMapObjectGraphicsInfo_Wingull,
-    &gMapObjectGraphicsInfo_Kecleon2,
-    &gMapObjectGraphicsInfo_TuberMSwimming,
-    &gMapObjectGraphicsInfo_Azurill,
-    &gMapObjectGraphicsInfo_Mom,
-    &gMapObjectGraphicsInfo_LinkBrendan,
-    &gMapObjectGraphicsInfo_LinkMay
-};
-
-#endif //POKERUBY_MAP_OBJECT_GRAPHICS_INFO_POINTERS_H
diff --git a/src/data/field_map_obj/map_object_pic_tables.h b/src/data/field_map_obj/map_object_pic_tables.h
deleted file mode 100644
index ecb5c8836..000000000
--- a/src/data/field_map_obj/map_object_pic_tables.h
+++ /dev/null
@@ -1,1879 +0,0 @@
-//
-
-//
-
-#ifndef POKERUBY_MAP_OBJECT_PIC_TABLES_H
-#define POKERUBY_MAP_OBJECT_PIC_TABLES_H
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanNormal[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_0),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_1),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_2),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_3),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_4),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_5),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_6),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_7),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_8),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_9),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_10),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_11),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_12),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_13),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_14),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_15),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_16),
-    obj_frame_tiles(gMapObjectPic_BrendanNormal_17)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanMachBike[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_0),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_1),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_2),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_3),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_4),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_5),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_6),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_7),
-    obj_frame_tiles(gMapObjectPic_BrendanMachBike_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanAcroBike[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_0),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_1),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_2),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_3),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_4),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_5),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_6),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_7),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_8),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_9),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_10),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_11),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_12),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_13),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_14),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_15),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_16),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_17),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_18),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_19),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_20),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_21),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_22),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_23),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_24),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_25),
-    obj_frame_tiles(gMapObjectPic_BrendanAcroBike_26)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanSurfing[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_0),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_1),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_2),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_3),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_4),
-    obj_frame_tiles(gMapObjectPic_BrendanSurfing_5)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanUnderwater[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_2),
-    obj_frame_tiles(gMapObjectPic_BrendanUnderwater_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanFieldMove[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanFieldMove_0),
-    obj_frame_tiles(gMapObjectPic_BrendanFieldMove_1),
-    obj_frame_tiles(gMapObjectPic_BrendanFieldMove_2),
-    obj_frame_tiles(gMapObjectPic_BrendanFieldMove_3),
-    obj_frame_tiles(gMapObjectPic_BrendanFieldMove_4)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_QuintyPlump[] = {
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_0),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_1),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_2),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_3),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_4),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_5),
-    obj_frame_tiles(gMapObjectPic_QuintyPlump_6)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LittleBoy1[] = {
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_0),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_1),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_2),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_3),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_4),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_5),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_6),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_7),
-    obj_frame_tiles(gMapObjectPic_LittleBoy1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LittleGirl1[] = {
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_0),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_1),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_2),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_3),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_4),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_5),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_6),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_7),
-    obj_frame_tiles(gMapObjectPic_LittleGirl1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Boy1[] = {
-    obj_frame_tiles(gMapObjectPic_Boy1_0),
-    obj_frame_tiles(gMapObjectPic_Boy1_1),
-    obj_frame_tiles(gMapObjectPic_Boy1_2),
-    obj_frame_tiles(gMapObjectPic_Boy1_3),
-    obj_frame_tiles(gMapObjectPic_Boy1_4),
-    obj_frame_tiles(gMapObjectPic_Boy1_5),
-    obj_frame_tiles(gMapObjectPic_Boy1_6),
-    obj_frame_tiles(gMapObjectPic_Boy1_7),
-    obj_frame_tiles(gMapObjectPic_Boy1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Girl1[] = {
-    obj_frame_tiles(gMapObjectPic_Girl1_0),
-    obj_frame_tiles(gMapObjectPic_Girl1_1),
-    obj_frame_tiles(gMapObjectPic_Girl1_2),
-    obj_frame_tiles(gMapObjectPic_Girl1_3),
-    obj_frame_tiles(gMapObjectPic_Girl1_4),
-    obj_frame_tiles(gMapObjectPic_Girl1_5),
-    obj_frame_tiles(gMapObjectPic_Girl1_6),
-    obj_frame_tiles(gMapObjectPic_Girl1_7),
-    obj_frame_tiles(gMapObjectPic_Girl1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Boy2[] = {
-    obj_frame_tiles(gMapObjectPic_Boy2_0),
-    obj_frame_tiles(gMapObjectPic_Boy2_1),
-    obj_frame_tiles(gMapObjectPic_Boy2_2),
-    obj_frame_tiles(gMapObjectPic_Boy2_3),
-    obj_frame_tiles(gMapObjectPic_Boy2_4),
-    obj_frame_tiles(gMapObjectPic_Boy2_5),
-    obj_frame_tiles(gMapObjectPic_Boy2_6),
-    obj_frame_tiles(gMapObjectPic_Boy2_7),
-    obj_frame_tiles(gMapObjectPic_Boy2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Girl2[] = {
-    obj_frame_tiles(gMapObjectPic_Girl2_0),
-    obj_frame_tiles(gMapObjectPic_Girl2_1),
-    obj_frame_tiles(gMapObjectPic_Girl2_2),
-    obj_frame_tiles(gMapObjectPic_Girl2_3),
-    obj_frame_tiles(gMapObjectPic_Girl2_4),
-    obj_frame_tiles(gMapObjectPic_Girl2_5),
-    obj_frame_tiles(gMapObjectPic_Girl2_6),
-    obj_frame_tiles(gMapObjectPic_Girl2_7),
-    obj_frame_tiles(gMapObjectPic_Girl2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LittleBoy2[] = {
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_0),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_1),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_2),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_3),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_4),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_5),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_6),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_7),
-    obj_frame_tiles(gMapObjectPic_LittleBoy2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LittleGirl2[] = {
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_0),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_1),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_2),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_3),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_4),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_5),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_6),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_7),
-    obj_frame_tiles(gMapObjectPic_LittleGirl2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Boy3[] = {
-    obj_frame_tiles(gMapObjectPic_Boy3_0),
-    obj_frame_tiles(gMapObjectPic_Boy3_1),
-    obj_frame_tiles(gMapObjectPic_Boy3_2),
-    obj_frame_tiles(gMapObjectPic_Boy3_3),
-    obj_frame_tiles(gMapObjectPic_Boy3_4),
-    obj_frame_tiles(gMapObjectPic_Boy3_5),
-    obj_frame_tiles(gMapObjectPic_Boy3_6),
-    obj_frame_tiles(gMapObjectPic_Boy3_7),
-    obj_frame_tiles(gMapObjectPic_Boy3_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Girl3[] = {
-    obj_frame_tiles(gMapObjectPic_Girl3_0),
-    obj_frame_tiles(gMapObjectPic_Girl3_1),
-    obj_frame_tiles(gMapObjectPic_Girl3_2),
-    obj_frame_tiles(gMapObjectPic_Girl3_3),
-    obj_frame_tiles(gMapObjectPic_Girl3_4),
-    obj_frame_tiles(gMapObjectPic_Girl3_5),
-    obj_frame_tiles(gMapObjectPic_Girl3_6),
-    obj_frame_tiles(gMapObjectPic_Girl3_7),
-    obj_frame_tiles(gMapObjectPic_Girl3_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Boy4[] = {
-    obj_frame_tiles(gMapObjectPic_Boy4_0),
-    obj_frame_tiles(gMapObjectPic_Boy4_1),
-    obj_frame_tiles(gMapObjectPic_Boy4_2),
-    obj_frame_tiles(gMapObjectPic_Boy4_3),
-    obj_frame_tiles(gMapObjectPic_Boy4_4),
-    obj_frame_tiles(gMapObjectPic_Boy4_5),
-    obj_frame_tiles(gMapObjectPic_Boy4_6),
-    obj_frame_tiles(gMapObjectPic_Boy4_7),
-    obj_frame_tiles(gMapObjectPic_Boy4_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman1[] = {
-    obj_frame_tiles(gMapObjectPic_Woman1_0),
-    obj_frame_tiles(gMapObjectPic_Woman1_1),
-    obj_frame_tiles(gMapObjectPic_Woman1_2),
-    obj_frame_tiles(gMapObjectPic_Woman1_3),
-    obj_frame_tiles(gMapObjectPic_Woman1_4),
-    obj_frame_tiles(gMapObjectPic_Woman1_5),
-    obj_frame_tiles(gMapObjectPic_Woman1_6),
-    obj_frame_tiles(gMapObjectPic_Woman1_7),
-    obj_frame_tiles(gMapObjectPic_Woman1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_FatMan[] = {
-    obj_frame_tiles(gMapObjectPic_FatMan_0),
-    obj_frame_tiles(gMapObjectPic_FatMan_1),
-    obj_frame_tiles(gMapObjectPic_FatMan_2),
-    obj_frame_tiles(gMapObjectPic_FatMan_3),
-    obj_frame_tiles(gMapObjectPic_FatMan_4),
-    obj_frame_tiles(gMapObjectPic_FatMan_5),
-    obj_frame_tiles(gMapObjectPic_FatMan_6),
-    obj_frame_tiles(gMapObjectPic_FatMan_7),
-    obj_frame_tiles(gMapObjectPic_FatMan_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman2[] = {
-    obj_frame_tiles(gMapObjectPic_Woman2_0),
-    obj_frame_tiles(gMapObjectPic_Woman2_1),
-    obj_frame_tiles(gMapObjectPic_Woman2_2),
-    obj_frame_tiles(gMapObjectPic_Woman2_3),
-    obj_frame_tiles(gMapObjectPic_Woman2_4),
-    obj_frame_tiles(gMapObjectPic_Woman2_5),
-    obj_frame_tiles(gMapObjectPic_Woman2_6),
-    obj_frame_tiles(gMapObjectPic_Woman2_7),
-    obj_frame_tiles(gMapObjectPic_Woman2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man1[] = {
-    obj_frame_tiles(gMapObjectPic_Man1_0),
-    obj_frame_tiles(gMapObjectPic_Man1_1),
-    obj_frame_tiles(gMapObjectPic_Man1_2),
-    obj_frame_tiles(gMapObjectPic_Man1_3),
-    obj_frame_tiles(gMapObjectPic_Man1_4),
-    obj_frame_tiles(gMapObjectPic_Man1_5),
-    obj_frame_tiles(gMapObjectPic_Man1_6),
-    obj_frame_tiles(gMapObjectPic_Man1_7),
-    obj_frame_tiles(gMapObjectPic_Man1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman3[] = {
-    obj_frame_tiles(gMapObjectPic_Woman3_0),
-    obj_frame_tiles(gMapObjectPic_Woman3_1),
-    obj_frame_tiles(gMapObjectPic_Woman3_2),
-    obj_frame_tiles(gMapObjectPic_Woman3_3),
-    obj_frame_tiles(gMapObjectPic_Woman3_4),
-    obj_frame_tiles(gMapObjectPic_Woman3_5),
-    obj_frame_tiles(gMapObjectPic_Woman3_6),
-    obj_frame_tiles(gMapObjectPic_Woman3_7),
-    obj_frame_tiles(gMapObjectPic_Woman3_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_OldMan1[] = {
-    obj_frame_tiles(gMapObjectPic_OldMan1_0),
-    obj_frame_tiles(gMapObjectPic_OldMan1_1),
-    obj_frame_tiles(gMapObjectPic_OldMan1_2),
-    obj_frame_tiles(gMapObjectPic_OldMan1_3),
-    obj_frame_tiles(gMapObjectPic_OldMan1_4),
-    obj_frame_tiles(gMapObjectPic_OldMan1_5),
-    obj_frame_tiles(gMapObjectPic_OldMan1_6),
-    obj_frame_tiles(gMapObjectPic_OldMan1_7),
-    obj_frame_tiles(gMapObjectPic_OldMan1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_OldWoman1[] = {
-    obj_frame_tiles(gMapObjectPic_OldWoman1_0),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_1),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_2),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_3),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_4),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_5),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_6),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_7),
-    obj_frame_tiles(gMapObjectPic_OldWoman1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man2[] = {
-    obj_frame_tiles(gMapObjectPic_Man2_0),
-    obj_frame_tiles(gMapObjectPic_Man2_1),
-    obj_frame_tiles(gMapObjectPic_Man2_2),
-    obj_frame_tiles(gMapObjectPic_Man2_3),
-    obj_frame_tiles(gMapObjectPic_Man2_4),
-    obj_frame_tiles(gMapObjectPic_Man2_5),
-    obj_frame_tiles(gMapObjectPic_Man2_6),
-    obj_frame_tiles(gMapObjectPic_Man2_7),
-    obj_frame_tiles(gMapObjectPic_Man2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman4[] = {
-    obj_frame_tiles(gMapObjectPic_Woman4_0),
-    obj_frame_tiles(gMapObjectPic_Woman4_1),
-    obj_frame_tiles(gMapObjectPic_Woman4_2),
-    obj_frame_tiles(gMapObjectPic_Woman4_3),
-    obj_frame_tiles(gMapObjectPic_Woman4_4),
-    obj_frame_tiles(gMapObjectPic_Woman4_5),
-    obj_frame_tiles(gMapObjectPic_Woman4_6),
-    obj_frame_tiles(gMapObjectPic_Woman4_7),
-    obj_frame_tiles(gMapObjectPic_Woman4_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man3[] = {
-    obj_frame_tiles(gMapObjectPic_Man3_0),
-    obj_frame_tiles(gMapObjectPic_Man3_1),
-    obj_frame_tiles(gMapObjectPic_Man3_2),
-    obj_frame_tiles(gMapObjectPic_Man3_3),
-    obj_frame_tiles(gMapObjectPic_Man3_4),
-    obj_frame_tiles(gMapObjectPic_Man3_5),
-    obj_frame_tiles(gMapObjectPic_Man3_6),
-    obj_frame_tiles(gMapObjectPic_Man3_7),
-    obj_frame_tiles(gMapObjectPic_Man3_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman5[] = {
-    obj_frame_tiles(gMapObjectPic_Woman5_0),
-    obj_frame_tiles(gMapObjectPic_Woman5_1),
-    obj_frame_tiles(gMapObjectPic_Woman5_2),
-    obj_frame_tiles(gMapObjectPic_Woman5_3),
-    obj_frame_tiles(gMapObjectPic_Woman5_4),
-    obj_frame_tiles(gMapObjectPic_Woman5_5),
-    obj_frame_tiles(gMapObjectPic_Woman5_6),
-    obj_frame_tiles(gMapObjectPic_Woman5_7),
-    obj_frame_tiles(gMapObjectPic_Woman5_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Cook[] = {
-    obj_frame_tiles(gMapObjectPic_Cook_0),
-    obj_frame_tiles(gMapObjectPic_Cook_1),
-    obj_frame_tiles(gMapObjectPic_Cook_2),
-    obj_frame_tiles(gMapObjectPic_Cook_0),
-    obj_frame_tiles(gMapObjectPic_Cook_0),
-    obj_frame_tiles(gMapObjectPic_Cook_1),
-    obj_frame_tiles(gMapObjectPic_Cook_1),
-    obj_frame_tiles(gMapObjectPic_Cook_2),
-    obj_frame_tiles(gMapObjectPic_Cook_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman6[] = {
-    obj_frame_tiles(gMapObjectPic_Woman6_0),
-    obj_frame_tiles(gMapObjectPic_Woman6_1),
-    obj_frame_tiles(gMapObjectPic_Woman6_2),
-    obj_frame_tiles(gMapObjectPic_Woman6_3),
-    obj_frame_tiles(gMapObjectPic_Woman6_4),
-    obj_frame_tiles(gMapObjectPic_Woman6_5),
-    obj_frame_tiles(gMapObjectPic_Woman6_6),
-    obj_frame_tiles(gMapObjectPic_Woman6_7),
-    obj_frame_tiles(gMapObjectPic_Woman6_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_OldMan2[] = {
-    obj_frame_tiles(gMapObjectPic_OldMan2_0),
-    obj_frame_tiles(gMapObjectPic_OldMan2_1),
-    obj_frame_tiles(gMapObjectPic_OldMan2_2),
-    obj_frame_tiles(gMapObjectPic_OldMan2_0),
-    obj_frame_tiles(gMapObjectPic_OldMan2_0),
-    obj_frame_tiles(gMapObjectPic_OldMan2_1),
-    obj_frame_tiles(gMapObjectPic_OldMan2_1),
-    obj_frame_tiles(gMapObjectPic_OldMan2_2),
-    obj_frame_tiles(gMapObjectPic_OldMan2_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_OldWoman2[] = {
-    obj_frame_tiles(gMapObjectPic_OldWoman2_0),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_1),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_2),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_0),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_0),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_1),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_1),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_2),
-    obj_frame_tiles(gMapObjectPic_OldWoman2_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Camper[] = {
-    obj_frame_tiles(gMapObjectPic_Camper_0),
-    obj_frame_tiles(gMapObjectPic_Camper_1),
-    obj_frame_tiles(gMapObjectPic_Camper_2),
-    obj_frame_tiles(gMapObjectPic_Camper_3),
-    obj_frame_tiles(gMapObjectPic_Camper_4),
-    obj_frame_tiles(gMapObjectPic_Camper_5),
-    obj_frame_tiles(gMapObjectPic_Camper_6),
-    obj_frame_tiles(gMapObjectPic_Camper_7),
-    obj_frame_tiles(gMapObjectPic_Camper_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Picnicker[] = {
-    obj_frame_tiles(gMapObjectPic_Picnicker_0),
-    obj_frame_tiles(gMapObjectPic_Picnicker_1),
-    obj_frame_tiles(gMapObjectPic_Picnicker_2),
-    obj_frame_tiles(gMapObjectPic_Picnicker_3),
-    obj_frame_tiles(gMapObjectPic_Picnicker_4),
-    obj_frame_tiles(gMapObjectPic_Picnicker_5),
-    obj_frame_tiles(gMapObjectPic_Picnicker_6),
-    obj_frame_tiles(gMapObjectPic_Picnicker_7),
-    obj_frame_tiles(gMapObjectPic_Picnicker_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man4[] = {
-    obj_frame_tiles(gMapObjectPic_Man4_0),
-    obj_frame_tiles(gMapObjectPic_Man4_1),
-    obj_frame_tiles(gMapObjectPic_Man4_2),
-    obj_frame_tiles(gMapObjectPic_Man4_3),
-    obj_frame_tiles(gMapObjectPic_Man4_4),
-    obj_frame_tiles(gMapObjectPic_Man4_5),
-    obj_frame_tiles(gMapObjectPic_Man4_6),
-    obj_frame_tiles(gMapObjectPic_Man4_7),
-    obj_frame_tiles(gMapObjectPic_Man4_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman7[] = {
-    obj_frame_tiles(gMapObjectPic_Woman7_0),
-    obj_frame_tiles(gMapObjectPic_Woman7_1),
-    obj_frame_tiles(gMapObjectPic_Woman7_2),
-    obj_frame_tiles(gMapObjectPic_Woman7_3),
-    obj_frame_tiles(gMapObjectPic_Woman7_4),
-    obj_frame_tiles(gMapObjectPic_Woman7_5),
-    obj_frame_tiles(gMapObjectPic_Woman7_6),
-    obj_frame_tiles(gMapObjectPic_Woman7_7),
-    obj_frame_tiles(gMapObjectPic_Woman7_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Youngster[] = {
-    obj_frame_tiles(gMapObjectPic_Youngster_0),
-    obj_frame_tiles(gMapObjectPic_Youngster_1),
-    obj_frame_tiles(gMapObjectPic_Youngster_2),
-    obj_frame_tiles(gMapObjectPic_Youngster_3),
-    obj_frame_tiles(gMapObjectPic_Youngster_4),
-    obj_frame_tiles(gMapObjectPic_Youngster_5),
-    obj_frame_tiles(gMapObjectPic_Youngster_6),
-    obj_frame_tiles(gMapObjectPic_Youngster_7),
-    obj_frame_tiles(gMapObjectPic_Youngster_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BugCatcher[] = {
-    obj_frame_tiles(gMapObjectPic_BugCatcher_0),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_1),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_2),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_3),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_4),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_5),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_6),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_7),
-    obj_frame_tiles(gMapObjectPic_BugCatcher_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_PsychicM[] = {
-    obj_frame_tiles(gMapObjectPic_PsychicM_0),
-    obj_frame_tiles(gMapObjectPic_PsychicM_1),
-    obj_frame_tiles(gMapObjectPic_PsychicM_2),
-    obj_frame_tiles(gMapObjectPic_PsychicM_3),
-    obj_frame_tiles(gMapObjectPic_PsychicM_4),
-    obj_frame_tiles(gMapObjectPic_PsychicM_5),
-    obj_frame_tiles(gMapObjectPic_PsychicM_6),
-    obj_frame_tiles(gMapObjectPic_PsychicM_7),
-    obj_frame_tiles(gMapObjectPic_PsychicM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SchoolKidM[] = {
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_0),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_1),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_2),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_3),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_4),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_5),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_6),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_7),
-    obj_frame_tiles(gMapObjectPic_SchoolKidM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Maniac[] = {
-    obj_frame_tiles(gMapObjectPic_Maniac_0),
-    obj_frame_tiles(gMapObjectPic_Maniac_1),
-    obj_frame_tiles(gMapObjectPic_Maniac_2),
-    obj_frame_tiles(gMapObjectPic_Maniac_3),
-    obj_frame_tiles(gMapObjectPic_Maniac_4),
-    obj_frame_tiles(gMapObjectPic_Maniac_5),
-    obj_frame_tiles(gMapObjectPic_Maniac_6),
-    obj_frame_tiles(gMapObjectPic_Maniac_7),
-    obj_frame_tiles(gMapObjectPic_Maniac_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_HexManiac[] = {
-    obj_frame_tiles(gMapObjectPic_HexManiac_0),
-    obj_frame_tiles(gMapObjectPic_HexManiac_1),
-    obj_frame_tiles(gMapObjectPic_HexManiac_2),
-    obj_frame_tiles(gMapObjectPic_HexManiac_3),
-    obj_frame_tiles(gMapObjectPic_HexManiac_4),
-    obj_frame_tiles(gMapObjectPic_HexManiac_5),
-    obj_frame_tiles(gMapObjectPic_HexManiac_6),
-    obj_frame_tiles(gMapObjectPic_HexManiac_7),
-    obj_frame_tiles(gMapObjectPic_HexManiac_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Woman8[] = {
-    obj_frame_tiles(gMapObjectPic_Woman8_0),
-    obj_frame_tiles(gMapObjectPic_Woman8_1),
-    obj_frame_tiles(gMapObjectPic_Woman8_2),
-    obj_frame_tiles(gMapObjectPic_Woman8_3),
-    obj_frame_tiles(gMapObjectPic_Woman8_4),
-    obj_frame_tiles(gMapObjectPic_Woman8_5),
-    obj_frame_tiles(gMapObjectPic_Woman8_6),
-    obj_frame_tiles(gMapObjectPic_Woman8_7),
-    obj_frame_tiles(gMapObjectPic_Woman8_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SwimmerM[] = {
-    obj_frame_tiles(gMapObjectPic_SwimmerM_0),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_1),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_2),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_3),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_4),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_5),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_6),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_7),
-    obj_frame_tiles(gMapObjectPic_SwimmerM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SwimmerF[] = {
-    obj_frame_tiles(gMapObjectPic_SwimmerF_0),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_1),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_2),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_3),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_4),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_5),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_6),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_7),
-    obj_frame_tiles(gMapObjectPic_SwimmerF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BlackBelt[] = {
-    obj_frame_tiles(gMapObjectPic_BlackBelt_0),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_1),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_2),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_3),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_4),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_5),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_6),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_7),
-    obj_frame_tiles(gMapObjectPic_BlackBelt_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Beauty[] = {
-    obj_frame_tiles(gMapObjectPic_Beauty_0),
-    obj_frame_tiles(gMapObjectPic_Beauty_1),
-    obj_frame_tiles(gMapObjectPic_Beauty_2),
-    obj_frame_tiles(gMapObjectPic_Beauty_3),
-    obj_frame_tiles(gMapObjectPic_Beauty_4),
-    obj_frame_tiles(gMapObjectPic_Beauty_5),
-    obj_frame_tiles(gMapObjectPic_Beauty_6),
-    obj_frame_tiles(gMapObjectPic_Beauty_7),
-    obj_frame_tiles(gMapObjectPic_Beauty_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Scientist1[] = {
-    obj_frame_tiles(gMapObjectPic_Scientist1_0),
-    obj_frame_tiles(gMapObjectPic_Scientist1_1),
-    obj_frame_tiles(gMapObjectPic_Scientist1_2),
-    obj_frame_tiles(gMapObjectPic_Scientist1_3),
-    obj_frame_tiles(gMapObjectPic_Scientist1_4),
-    obj_frame_tiles(gMapObjectPic_Scientist1_5),
-    obj_frame_tiles(gMapObjectPic_Scientist1_6),
-    obj_frame_tiles(gMapObjectPic_Scientist1_7),
-    obj_frame_tiles(gMapObjectPic_Scientist1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Lass[] = {
-    obj_frame_tiles(gMapObjectPic_Lass_0),
-    obj_frame_tiles(gMapObjectPic_Lass_1),
-    obj_frame_tiles(gMapObjectPic_Lass_2),
-    obj_frame_tiles(gMapObjectPic_Lass_3),
-    obj_frame_tiles(gMapObjectPic_Lass_4),
-    obj_frame_tiles(gMapObjectPic_Lass_5),
-    obj_frame_tiles(gMapObjectPic_Lass_6),
-    obj_frame_tiles(gMapObjectPic_Lass_7),
-    obj_frame_tiles(gMapObjectPic_Lass_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Gentleman[] = {
-    obj_frame_tiles(gMapObjectPic_Gentleman_0),
-    obj_frame_tiles(gMapObjectPic_Gentleman_1),
-    obj_frame_tiles(gMapObjectPic_Gentleman_2),
-    obj_frame_tiles(gMapObjectPic_Gentleman_3),
-    obj_frame_tiles(gMapObjectPic_Gentleman_4),
-    obj_frame_tiles(gMapObjectPic_Gentleman_5),
-    obj_frame_tiles(gMapObjectPic_Gentleman_6),
-    obj_frame_tiles(gMapObjectPic_Gentleman_7),
-    obj_frame_tiles(gMapObjectPic_Gentleman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Sailor[] = {
-    obj_frame_tiles(gMapObjectPic_Sailor_0),
-    obj_frame_tiles(gMapObjectPic_Sailor_1),
-    obj_frame_tiles(gMapObjectPic_Sailor_2),
-    obj_frame_tiles(gMapObjectPic_Sailor_3),
-    obj_frame_tiles(gMapObjectPic_Sailor_4),
-    obj_frame_tiles(gMapObjectPic_Sailor_5),
-    obj_frame_tiles(gMapObjectPic_Sailor_6),
-    obj_frame_tiles(gMapObjectPic_Sailor_7),
-    obj_frame_tiles(gMapObjectPic_Sailor_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Fisherman[] = {
-    obj_frame_tiles(gMapObjectPic_Fisherman_0),
-    obj_frame_tiles(gMapObjectPic_Fisherman_1),
-    obj_frame_tiles(gMapObjectPic_Fisherman_2),
-    obj_frame_tiles(gMapObjectPic_Fisherman_3),
-    obj_frame_tiles(gMapObjectPic_Fisherman_4),
-    obj_frame_tiles(gMapObjectPic_Fisherman_5),
-    obj_frame_tiles(gMapObjectPic_Fisherman_6),
-    obj_frame_tiles(gMapObjectPic_Fisherman_7),
-    obj_frame_tiles(gMapObjectPic_Fisherman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_RunningTriathleteM[] = {
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_0),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_1),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_2),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_3),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_4),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_5),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_6),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_7),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_RunningTriathleteF[] = {
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_0),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_1),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_2),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_3),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_4),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_5),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_6),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_7),
-    obj_frame_tiles(gMapObjectPic_RunningTriathleteF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TuberF[] = {
-    obj_frame_tiles(gMapObjectPic_TuberF_0),
-    obj_frame_tiles(gMapObjectPic_TuberF_1),
-    obj_frame_tiles(gMapObjectPic_TuberF_2),
-    obj_frame_tiles(gMapObjectPic_TuberF_3),
-    obj_frame_tiles(gMapObjectPic_TuberF_4),
-    obj_frame_tiles(gMapObjectPic_TuberF_5),
-    obj_frame_tiles(gMapObjectPic_TuberF_6),
-    obj_frame_tiles(gMapObjectPic_TuberF_7),
-    obj_frame_tiles(gMapObjectPic_TuberF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TuberM[] = {
-    obj_frame_tiles(gMapObjectPic_TuberM_0),
-    obj_frame_tiles(gMapObjectPic_TuberM_1),
-    obj_frame_tiles(gMapObjectPic_TuberM_2),
-    obj_frame_tiles(gMapObjectPic_TuberM_3),
-    obj_frame_tiles(gMapObjectPic_TuberM_4),
-    obj_frame_tiles(gMapObjectPic_TuberM_5),
-    obj_frame_tiles(gMapObjectPic_TuberM_6),
-    obj_frame_tiles(gMapObjectPic_TuberM_7),
-    obj_frame_tiles(gMapObjectPic_TuberM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Hiker[] = {
-    obj_frame_tiles(gMapObjectPic_Hiker_0),
-    obj_frame_tiles(gMapObjectPic_Hiker_1),
-    obj_frame_tiles(gMapObjectPic_Hiker_2),
-    obj_frame_tiles(gMapObjectPic_Hiker_3),
-    obj_frame_tiles(gMapObjectPic_Hiker_4),
-    obj_frame_tiles(gMapObjectPic_Hiker_5),
-    obj_frame_tiles(gMapObjectPic_Hiker_6),
-    obj_frame_tiles(gMapObjectPic_Hiker_7),
-    obj_frame_tiles(gMapObjectPic_Hiker_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_CyclingTriathleteM[] = {
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_0),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_1),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_2),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_3),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_4),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_5),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_6),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_7),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_CyclingTriathleteF[] = {
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_0),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_1),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_2),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_3),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_4),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_5),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_6),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_7),
-    obj_frame_tiles(gMapObjectPic_CyclingTriathleteF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Nurse[] = {
-    obj_frame_tiles(gMapObjectPic_Nurse_0),
-    obj_frame_tiles(gMapObjectPic_Nurse_1),
-    obj_frame_tiles(gMapObjectPic_Nurse_2),
-    obj_frame_tiles(gMapObjectPic_Nurse_3),
-    obj_frame_tiles(gMapObjectPic_Nurse_4),
-    obj_frame_tiles(gMapObjectPic_Nurse_5),
-    obj_frame_tiles(gMapObjectPic_Nurse_6),
-    obj_frame_tiles(gMapObjectPic_Nurse_7),
-    obj_frame_tiles(gMapObjectPic_Nurse_8),
-    obj_frame_tiles(gMapObjectPic_Nurse_9)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ItemBall[] = {
-    obj_frame_tiles(gMapObjectPic_ItemBall)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ProfBirch[] = {
-    obj_frame_tiles(gMapObjectPic_ProfBirch_0),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_1),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_2),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_3),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_4),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_5),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_6),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_7),
-    obj_frame_tiles(gMapObjectPic_ProfBirch_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man5[] = {
-    obj_frame_tiles(gMapObjectPic_Man5_0),
-    obj_frame_tiles(gMapObjectPic_Man5_1),
-    obj_frame_tiles(gMapObjectPic_Man5_2),
-    obj_frame_tiles(gMapObjectPic_Man5_3),
-    obj_frame_tiles(gMapObjectPic_Man5_4),
-    obj_frame_tiles(gMapObjectPic_Man5_5),
-    obj_frame_tiles(gMapObjectPic_Man5_6),
-    obj_frame_tiles(gMapObjectPic_Man5_7),
-    obj_frame_tiles(gMapObjectPic_Man5_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man6[] = {
-    obj_frame_tiles(gMapObjectPic_Man6_0),
-    obj_frame_tiles(gMapObjectPic_Man6_1),
-    obj_frame_tiles(gMapObjectPic_Man6_2),
-    obj_frame_tiles(gMapObjectPic_Man6_3),
-    obj_frame_tiles(gMapObjectPic_Man6_4),
-    obj_frame_tiles(gMapObjectPic_Man6_5),
-    obj_frame_tiles(gMapObjectPic_Man6_6),
-    obj_frame_tiles(gMapObjectPic_Man6_7),
-    obj_frame_tiles(gMapObjectPic_Man6_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ReporterM[] = {
-    obj_frame_tiles(gMapObjectPic_ReporterM_0),
-    obj_frame_tiles(gMapObjectPic_ReporterM_1),
-    obj_frame_tiles(gMapObjectPic_ReporterM_2),
-    obj_frame_tiles(gMapObjectPic_ReporterM_3),
-    obj_frame_tiles(gMapObjectPic_ReporterM_4),
-    obj_frame_tiles(gMapObjectPic_ReporterM_5),
-    obj_frame_tiles(gMapObjectPic_ReporterM_6),
-    obj_frame_tiles(gMapObjectPic_ReporterM_7),
-    obj_frame_tiles(gMapObjectPic_ReporterM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ReporterF[] = {
-    obj_frame_tiles(gMapObjectPic_ReporterF_0),
-    obj_frame_tiles(gMapObjectPic_ReporterF_1),
-    obj_frame_tiles(gMapObjectPic_ReporterF_2),
-    obj_frame_tiles(gMapObjectPic_ReporterF_3),
-    obj_frame_tiles(gMapObjectPic_ReporterF_4),
-    obj_frame_tiles(gMapObjectPic_ReporterF_5),
-    obj_frame_tiles(gMapObjectPic_ReporterF_6),
-    obj_frame_tiles(gMapObjectPic_ReporterF_7),
-    obj_frame_tiles(gMapObjectPic_ReporterF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MauvilleOldMan1[] = {
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_0),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_1),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_2),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_3),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_4),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_5),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_6),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_7),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan1_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MauvilleOldMan2[] = {
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_0),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_1),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_2),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_3),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_4),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_5),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_6),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_7),
-    obj_frame_tiles(gMapObjectPic_MauvilleOldMan2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedNatuDoll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedNatuDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedMagnemiteDoll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedMagnemiteDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedSquirtleDoll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedSquirtleDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedWooperDoll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedWooperDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedPikachuDoll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedPikachuDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_UnusedPorygon2Doll[] = {
-    obj_frame_tiles(gMapObjectPic_UnusedPorygon2Doll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_CuttableTree[] = {
-    obj_frame_tiles(gMapObjectPic_CuttableTree_0),
-    obj_frame_tiles(gMapObjectPic_CuttableTree_1),
-    obj_frame_tiles(gMapObjectPic_CuttableTree_2),
-    obj_frame_tiles(gMapObjectPic_CuttableTree_3)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MartEmployee[] = {
-    obj_frame_tiles(gMapObjectPic_MartEmployee_0),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_1),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_2),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_3),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_4),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_5),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_6),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_7),
-    obj_frame_tiles(gMapObjectPic_MartEmployee_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_RooftopSaleWoman[] = {
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_0),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_1),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_2),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_3),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_4),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_5),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_6),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_7),
-    obj_frame_tiles(gMapObjectPic_RooftopSaleWoman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Teala[] = {
-    obj_frame_tiles(gMapObjectPic_Teala_0),
-    obj_frame_tiles(gMapObjectPic_Teala_1),
-    obj_frame_tiles(gMapObjectPic_Teala_2),
-    obj_frame_tiles(gMapObjectPic_Teala_3),
-    obj_frame_tiles(gMapObjectPic_Teala_4),
-    obj_frame_tiles(gMapObjectPic_Teala_5),
-    obj_frame_tiles(gMapObjectPic_Teala_6),
-    obj_frame_tiles(gMapObjectPic_Teala_7),
-    obj_frame_tiles(gMapObjectPic_Teala_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BreakableRock[] = {
-    obj_frame_tiles(gMapObjectPic_BreakableRock_0),
-    obj_frame_tiles(gMapObjectPic_BreakableRock_1),
-    obj_frame_tiles(gMapObjectPic_BreakableRock_2),
-    obj_frame_tiles(gMapObjectPic_BreakableRock_3)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_PushableBoulder[] = {
-    obj_frame_tiles(gMapObjectPic_PushableBoulder)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MrBrineysBoat[] = {
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_0),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_1),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_2),
-    obj_frame_tiles(gMapObjectPic_MrBrineysBoat_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Truck[] = {
-    obj_frame_tiles(gMapObjectPic_Truck)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MachokeCarryingBox[] = {
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_0),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_0),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_0),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_1),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_2),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_1),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_2),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_1),
-    obj_frame_tiles(gMapObjectPic_MachokeCarryingBox_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MachokeFacingAway[] = {
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_0),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_0),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_0),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1),
-    obj_frame_tiles(gMapObjectPic_MachokeFacingAway_1)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BirchsBag[] = {
-    obj_frame_tiles(gMapObjectPic_BirchsBag)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Poochyena[] = {
-    obj_frame_tiles(gMapObjectPic_Poochyena_0),
-    obj_frame_tiles(gMapObjectPic_Poochyena_1),
-    obj_frame_tiles(gMapObjectPic_Poochyena_2),
-    obj_frame_tiles(gMapObjectPic_Poochyena_3),
-    obj_frame_tiles(gMapObjectPic_Poochyena_4),
-    obj_frame_tiles(gMapObjectPic_Poochyena_5),
-    obj_frame_tiles(gMapObjectPic_Poochyena_6),
-    obj_frame_tiles(gMapObjectPic_Poochyena_7),
-    obj_frame_tiles(gMapObjectPic_Poochyena_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Artist[] = {
-    obj_frame_tiles(gMapObjectPic_Artist_0),
-    obj_frame_tiles(gMapObjectPic_Artist_1),
-    obj_frame_tiles(gMapObjectPic_Artist_2),
-    obj_frame_tiles(gMapObjectPic_Artist_3),
-    obj_frame_tiles(gMapObjectPic_Artist_4),
-    obj_frame_tiles(gMapObjectPic_Artist_5),
-    obj_frame_tiles(gMapObjectPic_Artist_6),
-    obj_frame_tiles(gMapObjectPic_Artist_7),
-    obj_frame_tiles(gMapObjectPic_Artist_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayNormal[] = {
-    obj_frame_tiles(gMapObjectPic_MayNormal_0),
-    obj_frame_tiles(gMapObjectPic_MayNormal_1),
-    obj_frame_tiles(gMapObjectPic_MayNormal_2),
-    obj_frame_tiles(gMapObjectPic_MayNormal_3),
-    obj_frame_tiles(gMapObjectPic_MayNormal_4),
-    obj_frame_tiles(gMapObjectPic_MayNormal_5),
-    obj_frame_tiles(gMapObjectPic_MayNormal_6),
-    obj_frame_tiles(gMapObjectPic_MayNormal_7),
-    obj_frame_tiles(gMapObjectPic_MayNormal_8),
-    obj_frame_tiles(gMapObjectPic_MayNormal_9),
-    obj_frame_tiles(gMapObjectPic_MayNormal_10),
-    obj_frame_tiles(gMapObjectPic_MayNormal_11),
-    obj_frame_tiles(gMapObjectPic_MayNormal_12),
-    obj_frame_tiles(gMapObjectPic_MayNormal_13),
-    obj_frame_tiles(gMapObjectPic_MayNormal_14),
-    obj_frame_tiles(gMapObjectPic_MayNormal_15),
-    obj_frame_tiles(gMapObjectPic_MayNormal_16),
-    obj_frame_tiles(gMapObjectPic_MayNormal_17)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayMachBike[] = {
-    obj_frame_tiles(gMapObjectPic_MayMachBike_0),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_1),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_2),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_3),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_4),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_5),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_6),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_7),
-    obj_frame_tiles(gMapObjectPic_MayMachBike_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayAcroBike[] = {
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_0),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_1),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_2),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_3),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_4),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_5),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_6),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_7),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_8),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_9),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_10),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_11),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_12),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_13),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_14),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_15),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_16),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_17),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_18),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_19),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_20),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_21),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_22),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_23),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_24),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_25),
-    obj_frame_tiles(gMapObjectPic_MayAcroBike_26)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MaySurfing[] = {
-    obj_frame_tiles(gMapObjectPic_MaySurfing_0),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_1),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_2),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_0),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_0),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_1),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_1),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_2),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_2),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_3),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_4),
-    obj_frame_tiles(gMapObjectPic_MaySurfing_5)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayUnderwater[] = {
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_0),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_1),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_2),
-    obj_frame_tiles(gMapObjectPic_MayUnderwater_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayFieldMove[] = {
-    obj_frame_tiles(gMapObjectPic_MayFieldMove_0),
-    obj_frame_tiles(gMapObjectPic_MayFieldMove_1),
-    obj_frame_tiles(gMapObjectPic_MayFieldMove_2),
-    obj_frame_tiles(gMapObjectPic_MayFieldMove_3),
-    obj_frame_tiles(gMapObjectPic_MayFieldMove_4)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Cameraman[] = {
-    obj_frame_tiles(gMapObjectPic_Cameraman_0),
-    obj_frame_tiles(gMapObjectPic_Cameraman_1),
-    obj_frame_tiles(gMapObjectPic_Cameraman_2),
-    obj_frame_tiles(gMapObjectPic_Cameraman_3),
-    obj_frame_tiles(gMapObjectPic_Cameraman_4),
-    obj_frame_tiles(gMapObjectPic_Cameraman_5),
-    obj_frame_tiles(gMapObjectPic_Cameraman_6),
-    obj_frame_tiles(gMapObjectPic_Cameraman_7),
-    obj_frame_tiles(gMapObjectPic_Cameraman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MovingBox[] = {
-    obj_frame_tiles(gMapObjectPic_MovingBox)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_CableCar[] = {
-    obj_frame_tiles(gMapObjectPic_CableCar)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Scientist2[] = {
-    obj_frame_tiles(gMapObjectPic_Scientist2_0),
-    obj_frame_tiles(gMapObjectPic_Scientist2_1),
-    obj_frame_tiles(gMapObjectPic_Scientist2_2),
-    obj_frame_tiles(gMapObjectPic_Scientist2_3),
-    obj_frame_tiles(gMapObjectPic_Scientist2_4),
-    obj_frame_tiles(gMapObjectPic_Scientist2_5),
-    obj_frame_tiles(gMapObjectPic_Scientist2_6),
-    obj_frame_tiles(gMapObjectPic_Scientist2_7),
-    obj_frame_tiles(gMapObjectPic_Scientist2_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Man7[] = {
-    obj_frame_tiles(gMapObjectPic_Man7_0),
-    obj_frame_tiles(gMapObjectPic_Man7_1),
-    obj_frame_tiles(gMapObjectPic_Man7_2),
-    obj_frame_tiles(gMapObjectPic_Man7_3),
-    obj_frame_tiles(gMapObjectPic_Man7_4),
-    obj_frame_tiles(gMapObjectPic_Man7_5),
-    obj_frame_tiles(gMapObjectPic_Man7_6),
-    obj_frame_tiles(gMapObjectPic_Man7_7),
-    obj_frame_tiles(gMapObjectPic_Man7_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_AquaMemberM[] = {
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_0),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_1),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_2),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_3),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_4),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_5),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_6),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_7),
-    obj_frame_tiles(gMapObjectPic_AquaMemberM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_AquaMemberF[] = {
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_0),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_1),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_2),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_3),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_4),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_5),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_6),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_7),
-    obj_frame_tiles(gMapObjectPic_AquaMemberF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MagmaMemberM[] = {
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_0),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_1),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_2),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_3),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_4),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_5),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_6),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_7),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberM_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MagmaMemberF[] = {
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_0),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_1),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_2),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_3),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_4),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_5),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_6),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_7),
-    obj_frame_tiles(gMapObjectPic_MagmaMemberF_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Sidney[] = {
-    obj_frame_tiles(gMapObjectPic_Sidney_0),
-    obj_frame_tiles(gMapObjectPic_Sidney_1),
-    obj_frame_tiles(gMapObjectPic_Sidney_2),
-    obj_frame_tiles(gMapObjectPic_Sidney_0),
-    obj_frame_tiles(gMapObjectPic_Sidney_0),
-    obj_frame_tiles(gMapObjectPic_Sidney_1),
-    obj_frame_tiles(gMapObjectPic_Sidney_1),
-    obj_frame_tiles(gMapObjectPic_Sidney_2),
-    obj_frame_tiles(gMapObjectPic_Sidney_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Phoebe[] = {
-    obj_frame_tiles(gMapObjectPic_Phoebe_0),
-    obj_frame_tiles(gMapObjectPic_Phoebe_1),
-    obj_frame_tiles(gMapObjectPic_Phoebe_2),
-    obj_frame_tiles(gMapObjectPic_Phoebe_0),
-    obj_frame_tiles(gMapObjectPic_Phoebe_0),
-    obj_frame_tiles(gMapObjectPic_Phoebe_1),
-    obj_frame_tiles(gMapObjectPic_Phoebe_1),
-    obj_frame_tiles(gMapObjectPic_Phoebe_2),
-    obj_frame_tiles(gMapObjectPic_Phoebe_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Glacia[] = {
-    obj_frame_tiles(gMapObjectPic_Glacia_0),
-    obj_frame_tiles(gMapObjectPic_Glacia_1),
-    obj_frame_tiles(gMapObjectPic_Glacia_2),
-    obj_frame_tiles(gMapObjectPic_Glacia_0),
-    obj_frame_tiles(gMapObjectPic_Glacia_0),
-    obj_frame_tiles(gMapObjectPic_Glacia_1),
-    obj_frame_tiles(gMapObjectPic_Glacia_1),
-    obj_frame_tiles(gMapObjectPic_Glacia_2),
-    obj_frame_tiles(gMapObjectPic_Glacia_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Drake[] = {
-    obj_frame_tiles(gMapObjectPic_Drake_0),
-    obj_frame_tiles(gMapObjectPic_Drake_1),
-    obj_frame_tiles(gMapObjectPic_Drake_2),
-    obj_frame_tiles(gMapObjectPic_Drake_0),
-    obj_frame_tiles(gMapObjectPic_Drake_0),
-    obj_frame_tiles(gMapObjectPic_Drake_1),
-    obj_frame_tiles(gMapObjectPic_Drake_1),
-    obj_frame_tiles(gMapObjectPic_Drake_2),
-    obj_frame_tiles(gMapObjectPic_Drake_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Roxanne[] = {
-    obj_frame_tiles(gMapObjectPic_Roxanne_0),
-    obj_frame_tiles(gMapObjectPic_Roxanne_1),
-    obj_frame_tiles(gMapObjectPic_Roxanne_2),
-    obj_frame_tiles(gMapObjectPic_Roxanne_0),
-    obj_frame_tiles(gMapObjectPic_Roxanne_0),
-    obj_frame_tiles(gMapObjectPic_Roxanne_1),
-    obj_frame_tiles(gMapObjectPic_Roxanne_1),
-    obj_frame_tiles(gMapObjectPic_Roxanne_2),
-    obj_frame_tiles(gMapObjectPic_Roxanne_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Brawly[] = {
-    obj_frame_tiles(gMapObjectPic_Brawly_0),
-    obj_frame_tiles(gMapObjectPic_Brawly_1),
-    obj_frame_tiles(gMapObjectPic_Brawly_2),
-    obj_frame_tiles(gMapObjectPic_Brawly_0),
-    obj_frame_tiles(gMapObjectPic_Brawly_0),
-    obj_frame_tiles(gMapObjectPic_Brawly_1),
-    obj_frame_tiles(gMapObjectPic_Brawly_1),
-    obj_frame_tiles(gMapObjectPic_Brawly_2),
-    obj_frame_tiles(gMapObjectPic_Brawly_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Wattson[] = {
-    obj_frame_tiles(gMapObjectPic_Wattson_0),
-    obj_frame_tiles(gMapObjectPic_Wattson_1),
-    obj_frame_tiles(gMapObjectPic_Wattson_2),
-    obj_frame_tiles(gMapObjectPic_Wattson_0),
-    obj_frame_tiles(gMapObjectPic_Wattson_0),
-    obj_frame_tiles(gMapObjectPic_Wattson_1),
-    obj_frame_tiles(gMapObjectPic_Wattson_1),
-    obj_frame_tiles(gMapObjectPic_Wattson_2),
-    obj_frame_tiles(gMapObjectPic_Wattson_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Flannery[] = {
-    obj_frame_tiles(gMapObjectPic_Flannery_0),
-    obj_frame_tiles(gMapObjectPic_Flannery_1),
-    obj_frame_tiles(gMapObjectPic_Flannery_2),
-    obj_frame_tiles(gMapObjectPic_Flannery_0),
-    obj_frame_tiles(gMapObjectPic_Flannery_0),
-    obj_frame_tiles(gMapObjectPic_Flannery_1),
-    obj_frame_tiles(gMapObjectPic_Flannery_1),
-    obj_frame_tiles(gMapObjectPic_Flannery_2),
-    obj_frame_tiles(gMapObjectPic_Flannery_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Norman[] = {
-    obj_frame_tiles(gMapObjectPic_Norman_0),
-    obj_frame_tiles(gMapObjectPic_Norman_1),
-    obj_frame_tiles(gMapObjectPic_Norman_2),
-    obj_frame_tiles(gMapObjectPic_Norman_3),
-    obj_frame_tiles(gMapObjectPic_Norman_4),
-    obj_frame_tiles(gMapObjectPic_Norman_5),
-    obj_frame_tiles(gMapObjectPic_Norman_6),
-    obj_frame_tiles(gMapObjectPic_Norman_7),
-    obj_frame_tiles(gMapObjectPic_Norman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Winona[] = {
-    obj_frame_tiles(gMapObjectPic_Winona_0),
-    obj_frame_tiles(gMapObjectPic_Winona_1),
-    obj_frame_tiles(gMapObjectPic_Winona_2),
-    obj_frame_tiles(gMapObjectPic_Winona_0),
-    obj_frame_tiles(gMapObjectPic_Winona_0),
-    obj_frame_tiles(gMapObjectPic_Winona_1),
-    obj_frame_tiles(gMapObjectPic_Winona_1),
-    obj_frame_tiles(gMapObjectPic_Winona_2),
-    obj_frame_tiles(gMapObjectPic_Winona_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Liza[] = {
-    obj_frame_tiles(gMapObjectPic_Liza_0),
-    obj_frame_tiles(gMapObjectPic_Liza_1),
-    obj_frame_tiles(gMapObjectPic_Liza_2),
-    obj_frame_tiles(gMapObjectPic_Liza_0),
-    obj_frame_tiles(gMapObjectPic_Liza_0),
-    obj_frame_tiles(gMapObjectPic_Liza_1),
-    obj_frame_tiles(gMapObjectPic_Liza_1),
-    obj_frame_tiles(gMapObjectPic_Liza_2),
-    obj_frame_tiles(gMapObjectPic_Liza_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Tate[] = {
-    obj_frame_tiles(gMapObjectPic_Tate_0),
-    obj_frame_tiles(gMapObjectPic_Tate_1),
-    obj_frame_tiles(gMapObjectPic_Tate_2),
-    obj_frame_tiles(gMapObjectPic_Tate_0),
-    obj_frame_tiles(gMapObjectPic_Tate_0),
-    obj_frame_tiles(gMapObjectPic_Tate_1),
-    obj_frame_tiles(gMapObjectPic_Tate_1),
-    obj_frame_tiles(gMapObjectPic_Tate_2),
-    obj_frame_tiles(gMapObjectPic_Tate_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Wallace[] = {
-    obj_frame_tiles(gMapObjectPic_Wallace_0),
-    obj_frame_tiles(gMapObjectPic_Wallace_1),
-    obj_frame_tiles(gMapObjectPic_Wallace_2),
-    obj_frame_tiles(gMapObjectPic_Wallace_3),
-    obj_frame_tiles(gMapObjectPic_Wallace_4),
-    obj_frame_tiles(gMapObjectPic_Wallace_5),
-    obj_frame_tiles(gMapObjectPic_Wallace_6),
-    obj_frame_tiles(gMapObjectPic_Wallace_7),
-    obj_frame_tiles(gMapObjectPic_Wallace_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Steven[] = {
-    obj_frame_tiles(gMapObjectPic_Steven_0),
-    obj_frame_tiles(gMapObjectPic_Steven_1),
-    obj_frame_tiles(gMapObjectPic_Steven_2),
-    obj_frame_tiles(gMapObjectPic_Steven_3),
-    obj_frame_tiles(gMapObjectPic_Steven_4),
-    obj_frame_tiles(gMapObjectPic_Steven_5),
-    obj_frame_tiles(gMapObjectPic_Steven_6),
-    obj_frame_tiles(gMapObjectPic_Steven_7),
-    obj_frame_tiles(gMapObjectPic_Steven_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Wally[] = {
-    obj_frame_tiles(gMapObjectPic_Wally_0),
-    obj_frame_tiles(gMapObjectPic_Wally_1),
-    obj_frame_tiles(gMapObjectPic_Wally_2),
-    obj_frame_tiles(gMapObjectPic_Wally_3),
-    obj_frame_tiles(gMapObjectPic_Wally_4),
-    obj_frame_tiles(gMapObjectPic_Wally_5),
-    obj_frame_tiles(gMapObjectPic_Wally_6),
-    obj_frame_tiles(gMapObjectPic_Wally_7),
-    obj_frame_tiles(gMapObjectPic_Wally_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LittleBoy3[] = {
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_0),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_1),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_2),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_3),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_4),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_5),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_6),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_7),
-    obj_frame_tiles(gMapObjectPic_LittleBoy3_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanFishing[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_0),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_1),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_2),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_3),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_4),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_5),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_6),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_7),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_8),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_9),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_10),
-    obj_frame_tiles(gMapObjectPic_BrendanFishing_11)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayFishing[] = {
-    obj_frame_tiles(gMapObjectPic_MayFishing_0),
-    obj_frame_tiles(gMapObjectPic_MayFishing_1),
-    obj_frame_tiles(gMapObjectPic_MayFishing_2),
-    obj_frame_tiles(gMapObjectPic_MayFishing_3),
-    obj_frame_tiles(gMapObjectPic_MayFishing_4),
-    obj_frame_tiles(gMapObjectPic_MayFishing_5),
-    obj_frame_tiles(gMapObjectPic_MayFishing_6),
-    obj_frame_tiles(gMapObjectPic_MayFishing_7),
-    obj_frame_tiles(gMapObjectPic_MayFishing_8),
-    obj_frame_tiles(gMapObjectPic_MayFishing_9),
-    obj_frame_tiles(gMapObjectPic_MayFishing_10),
-    obj_frame_tiles(gMapObjectPic_MayFishing_11)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_HotSpringsOldWoman[] = {
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_0),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_1),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_2),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_3),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_4),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_5),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_6),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_7),
-    obj_frame_tiles(gMapObjectPic_HotSpringsOldWoman_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SSTidal[] = {
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal),
-    obj_frame_tiles(gMapObjectPic_SSTidal)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SubmarineShadow[] = {
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow),
-    obj_frame_tiles(gMapObjectPic_SubmarineShadow)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_PichuDoll[] = {
-    obj_frame_tiles(gMapObjectPic_PichuDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_PikachuDoll[] = {
-    obj_frame_tiles(gMapObjectPic_PikachuDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MarillDoll[] = {
-    obj_frame_tiles(gMapObjectPic_MarillDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TogepiDoll[] = {
-    obj_frame_tiles(gMapObjectPic_TogepiDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_CyndaquilDoll[] = {
-    obj_frame_tiles(gMapObjectPic_CyndaquilDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ChikoritaDoll[] = {
-    obj_frame_tiles(gMapObjectPic_ChikoritaDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TotodileDoll[] = {
-    obj_frame_tiles(gMapObjectPic_TotodileDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_JigglypuffDoll[] = {
-    obj_frame_tiles(gMapObjectPic_JigglypuffDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MeowthDoll[] = {
-    obj_frame_tiles(gMapObjectPic_MeowthDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ClefairyDoll[] = {
-    obj_frame_tiles(gMapObjectPic_ClefairyDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_DittoDoll[] = {
-    obj_frame_tiles(gMapObjectPic_DittoDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SmoochumDoll[] = {
-    obj_frame_tiles(gMapObjectPic_SmoochumDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TreeckoDoll[] = {
-    obj_frame_tiles(gMapObjectPic_TreeckoDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TorchicDoll[] = {
-    obj_frame_tiles(gMapObjectPic_TorchicDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MudkipDoll[] = {
-    obj_frame_tiles(gMapObjectPic_MudkipDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_DuskullDoll[] = {
-    obj_frame_tiles(gMapObjectPic_DuskullDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_WynautDoll[] = {
-    obj_frame_tiles(gMapObjectPic_WynautDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BaltoyDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BaltoyDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_KecleonDoll[] = {
-    obj_frame_tiles(gMapObjectPic_KecleonDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_AzurillDoll[] = {
-    obj_frame_tiles(gMapObjectPic_AzurillDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SkittyDoll[] = {
-    obj_frame_tiles(gMapObjectPic_SkittyDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SwabluDoll[] = {
-    obj_frame_tiles(gMapObjectPic_SwabluDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_GulpinDoll[] = {
-    obj_frame_tiles(gMapObjectPic_GulpinDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LotadDoll[] = {
-    obj_frame_tiles(gMapObjectPic_LotadDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SeedotDoll[] = {
-    obj_frame_tiles(gMapObjectPic_SeedotDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_PikaCushion[] = {
-    obj_frame_tiles(gMapObjectPic_PikaCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_RoundCushion[] = {
-    obj_frame_tiles(gMapObjectPic_RoundCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_KissCushion[] = {
-    obj_frame_tiles(gMapObjectPic_KissCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ZigzagCushion[] = {
-    obj_frame_tiles(gMapObjectPic_ZigzagCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_SpinCushion[] = {
-    obj_frame_tiles(gMapObjectPic_SpinCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_DiamondCushion[] = {
-    obj_frame_tiles(gMapObjectPic_DiamondCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BallCushion[] = {
-    obj_frame_tiles(gMapObjectPic_BallCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_GrassCushion[] = {
-    obj_frame_tiles(gMapObjectPic_GrassCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_FireCushion[] = {
-    obj_frame_tiles(gMapObjectPic_FireCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_WaterCushion[] = {
-    obj_frame_tiles(gMapObjectPic_WaterCushion)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigSnorlaxDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigSnorlaxDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigRhydonDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigRhydonDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigLaprasDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigLaprasDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigVenusaurDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigVenusaurDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigCharizardDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigCharizardDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigBlastoiseDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigBlastoiseDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigWailmerDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigWailmerDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigRegirockDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigRegirockDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigRegiceDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigRegiceDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BigRegisteelDoll[] = {
-    obj_frame_tiles(gMapObjectPic_BigRegisteelDoll)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_LatiasLatios[] = {
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_0),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_2),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_1),
-    obj_frame_tiles(gMapObjectPic_LatiasLatios_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Boy5[] = {
-    obj_frame_tiles(gMapObjectPic_Boy5_0),
-    obj_frame_tiles(gMapObjectPic_Boy5_1),
-    obj_frame_tiles(gMapObjectPic_Boy5_2),
-    obj_frame_tiles(gMapObjectPic_Boy5_0),
-    obj_frame_tiles(gMapObjectPic_Boy5_0),
-    obj_frame_tiles(gMapObjectPic_Boy5_1),
-    obj_frame_tiles(gMapObjectPic_Boy5_1),
-    obj_frame_tiles(gMapObjectPic_Boy5_2),
-    obj_frame_tiles(gMapObjectPic_Boy5_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_ContestJudge[] = {
-    obj_frame_tiles(gMapObjectPic_ContestJudge_0),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_1),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_2),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_3),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_4),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_5),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_6),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_7),
-    obj_frame_tiles(gMapObjectPic_ContestJudge_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanWatering[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_0),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_1),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_2),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_3),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_4),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_5),
-    obj_frame_tiles(gMapObjectPic_BrendanWatering_5)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayWatering[] = {
-    obj_frame_tiles(gMapObjectPic_MayWatering_0),
-    obj_frame_tiles(gMapObjectPic_MayWatering_1),
-    obj_frame_tiles(gMapObjectPic_MayWatering_2),
-    obj_frame_tiles(gMapObjectPic_MayWatering_3),
-    obj_frame_tiles(gMapObjectPic_MayWatering_3),
-    obj_frame_tiles(gMapObjectPic_MayWatering_4),
-    obj_frame_tiles(gMapObjectPic_MayWatering_4),
-    obj_frame_tiles(gMapObjectPic_MayWatering_5),
-    obj_frame_tiles(gMapObjectPic_MayWatering_5)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_BrendanDecorating[] = {
-    obj_frame_tiles(gMapObjectPic_BrendanDecorating)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_MayDecorating[] = {
-    obj_frame_tiles(gMapObjectPic_MayDecorating)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Archie[] = {
-    obj_frame_tiles(gMapObjectPic_Archie_0),
-    obj_frame_tiles(gMapObjectPic_Archie_1),
-    obj_frame_tiles(gMapObjectPic_Archie_2),
-    obj_frame_tiles(gMapObjectPic_Archie_3),
-    obj_frame_tiles(gMapObjectPic_Archie_4),
-    obj_frame_tiles(gMapObjectPic_Archie_5),
-    obj_frame_tiles(gMapObjectPic_Archie_6),
-    obj_frame_tiles(gMapObjectPic_Archie_7),
-    obj_frame_tiles(gMapObjectPic_Archie_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Maxie[] = {
-    obj_frame_tiles(gMapObjectPic_Maxie_0),
-    obj_frame_tiles(gMapObjectPic_Maxie_1),
-    obj_frame_tiles(gMapObjectPic_Maxie_2),
-    obj_frame_tiles(gMapObjectPic_Maxie_3),
-    obj_frame_tiles(gMapObjectPic_Maxie_4),
-    obj_frame_tiles(gMapObjectPic_Maxie_5),
-    obj_frame_tiles(gMapObjectPic_Maxie_6),
-    obj_frame_tiles(gMapObjectPic_Maxie_7),
-    obj_frame_tiles(gMapObjectPic_Maxie_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Kyogre[] = {
-    obj_frame_tiles(gMapObjectPic_Kyogre_0),
-    obj_frame_tiles(gMapObjectPic_Kyogre_0),
-    obj_frame_tiles(gMapObjectPic_Kyogre_0),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1),
-    obj_frame_tiles(gMapObjectPic_Kyogre_1)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Groudon[] = {
-    obj_frame_tiles(gMapObjectPic_Groudon_0),
-    obj_frame_tiles(gMapObjectPic_Groudon_0),
-    obj_frame_tiles(gMapObjectPic_Groudon_0),
-    obj_frame_tiles(gMapObjectPic_Groudon_1),
-    obj_frame_tiles(gMapObjectPic_Groudon_1),
-    obj_frame_tiles(gMapObjectPic_Groudon_1),
-    obj_frame_tiles(gMapObjectPic_Groudon_1),
-    obj_frame_tiles(gMapObjectPic_Groudon_1),
-    obj_frame_tiles(gMapObjectPic_Groudon_1)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Fossil[] = {
-    obj_frame_tiles(gMapObjectPic_Fossil)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Regi[] = {
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi),
-    obj_frame_tiles(gMapObjectPic_Regi)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Skitty[] = {
-    obj_frame_tiles(gMapObjectPic_Skitty_0),
-    obj_frame_tiles(gMapObjectPic_Skitty_1),
-    obj_frame_tiles(gMapObjectPic_Skitty_2),
-    obj_frame_tiles(gMapObjectPic_Skitty_0),
-    obj_frame_tiles(gMapObjectPic_Skitty_0),
-    obj_frame_tiles(gMapObjectPic_Skitty_1),
-    obj_frame_tiles(gMapObjectPic_Skitty_1),
-    obj_frame_tiles(gMapObjectPic_Skitty_2),
-    obj_frame_tiles(gMapObjectPic_Skitty_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Kecleon[] = {
-    obj_frame_tiles(gMapObjectPic_Kecleon_0),
-    obj_frame_tiles(gMapObjectPic_Kecleon_1),
-    obj_frame_tiles(gMapObjectPic_Kecleon_2),
-    obj_frame_tiles(gMapObjectPic_Kecleon_0),
-    obj_frame_tiles(gMapObjectPic_Kecleon_0),
-    obj_frame_tiles(gMapObjectPic_Kecleon_1),
-    obj_frame_tiles(gMapObjectPic_Kecleon_1),
-    obj_frame_tiles(gMapObjectPic_Kecleon_2),
-    obj_frame_tiles(gMapObjectPic_Kecleon_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Rayquaza[] = {
-    obj_frame_tiles(gMapObjectPic_Rayquaza_0),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_0),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_0),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1),
-    obj_frame_tiles(gMapObjectPic_Rayquaza_1)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Zigzagoon[] = {
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_0),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_1),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_2),
-    obj_frame_tiles(gMapObjectPic_Zigzagoon_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Pikachu[] = {
-    obj_frame_tiles(gMapObjectPic_Pikachu_0),
-    obj_frame_tiles(gMapObjectPic_Pikachu_1),
-    obj_frame_tiles(gMapObjectPic_Pikachu_2),
-    obj_frame_tiles(gMapObjectPic_Pikachu_0),
-    obj_frame_tiles(gMapObjectPic_Pikachu_0),
-    obj_frame_tiles(gMapObjectPic_Pikachu_1),
-    obj_frame_tiles(gMapObjectPic_Pikachu_1),
-    obj_frame_tiles(gMapObjectPic_Pikachu_2),
-    obj_frame_tiles(gMapObjectPic_Pikachu_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Azumarill[] = {
-    obj_frame_tiles(gMapObjectPic_Azumarill_0),
-    obj_frame_tiles(gMapObjectPic_Azumarill_1),
-    obj_frame_tiles(gMapObjectPic_Azumarill_2),
-    obj_frame_tiles(gMapObjectPic_Azumarill_0),
-    obj_frame_tiles(gMapObjectPic_Azumarill_0),
-    obj_frame_tiles(gMapObjectPic_Azumarill_1),
-    obj_frame_tiles(gMapObjectPic_Azumarill_1),
-    obj_frame_tiles(gMapObjectPic_Azumarill_2),
-    obj_frame_tiles(gMapObjectPic_Azumarill_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Wingull[] = {
-    obj_frame_tiles(gMapObjectPic_Wingull_0),
-    obj_frame_tiles(gMapObjectPic_Wingull_1),
-    obj_frame_tiles(gMapObjectPic_Wingull_2),
-    obj_frame_tiles(gMapObjectPic_Wingull_3),
-    obj_frame_tiles(gMapObjectPic_Wingull_3),
-    obj_frame_tiles(gMapObjectPic_Wingull_4),
-    obj_frame_tiles(gMapObjectPic_Wingull_4),
-    obj_frame_tiles(gMapObjectPic_Wingull_5),
-    obj_frame_tiles(gMapObjectPic_Wingull_5)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_TuberMSwimming[] = {
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_0),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_1),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_2),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_3),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_4),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_5),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_6),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_7),
-    obj_frame_tiles(gMapObjectPic_TuberMSwimming_8)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Azurill[] = {
-    obj_frame_tiles(gMapObjectPic_Azurill_0),
-    obj_frame_tiles(gMapObjectPic_Azurill_1),
-    obj_frame_tiles(gMapObjectPic_Azurill_2),
-    obj_frame_tiles(gMapObjectPic_Azurill_0),
-    obj_frame_tiles(gMapObjectPic_Azurill_0),
-    obj_frame_tiles(gMapObjectPic_Azurill_1),
-    obj_frame_tiles(gMapObjectPic_Azurill_1),
-    obj_frame_tiles(gMapObjectPic_Azurill_2),
-    obj_frame_tiles(gMapObjectPic_Azurill_2)
-};
-
-const struct SpriteFrameImage gMapObjectPicTable_Mom[] = {
-    obj_frame_tiles(gMapObjectPic_Mom_0),
-    obj_frame_tiles(gMapObjectPic_Mom_1),
-    obj_frame_tiles(gMapObjectPic_Mom_2),
-    obj_frame_tiles(gMapObjectPic_Mom_3),
-    obj_frame_tiles(gMapObjectPic_Mom_4),
-    obj_frame_tiles(gMapObjectPic_Mom_5),
-    obj_frame_tiles(gMapObjectPic_Mom_6),
-    obj_frame_tiles(gMapObjectPic_Mom_7),
-    obj_frame_tiles(gMapObjectPic_Mom_8),
-};
-
-#endif //POKERUBY_MAP_OBJECT_PIC_TABLES_H
diff --git a/src/decoration.c b/src/decoration.c
index b00a51ef0..6c1953677 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "constants/decorations.h"
 #include "main.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "overworld.h"
 #include "sound.h"
 #include "constants/songs.h"
@@ -1088,183 +1088,183 @@ const u16 DecorGfx_KISS_POSTER[] = {
 };
 
 const u16 DecorGfx_PICHU_DOLL[] = {
-    MAP_OBJ_GFX_PICHU_DOLL
+    EVENT_OBJ_GFX_PICHU_DOLL
 };
 
 const u16 DecorGfx_PIKACHU_DOLL[] = {
-    MAP_OBJ_GFX_PIKACHU_DOLL
+    EVENT_OBJ_GFX_PIKACHU_DOLL
 };
 
 const u16 DecorGfx_MARILL_DOLL[] = {
-    MAP_OBJ_GFX_MARILL_DOLL
+    EVENT_OBJ_GFX_MARILL_DOLL
 };
 
 const u16 DecorGfx_TOGEPI_DOLL[] = {
-    MAP_OBJ_GFX_TOGEPI_DOLL
+    EVENT_OBJ_GFX_TOGEPI_DOLL
 };
 
 const u16 DecorGfx_CYNDAQUIL_DOLL[] = {
-    MAP_OBJ_GFX_CYNDAQUIL_DOLL
+    EVENT_OBJ_GFX_CYNDAQUIL_DOLL
 };
 
 const u16 DecorGfx_CHIKORITA_DOLL[] = {
-    MAP_OBJ_GFX_CHIKORITA_DOLL
+    EVENT_OBJ_GFX_CHIKORITA_DOLL
 };
 
 const u16 DecorGfx_TOTODILE_DOLL[] = {
-    MAP_OBJ_GFX_TOTODILE_DOLL
+    EVENT_OBJ_GFX_TOTODILE_DOLL
 };
 
 const u16 DecorGfx_JIGGLYPUFF_DOLL[] = {
-    MAP_OBJ_GFX_JIGGLYPUFF_DOLL
+    EVENT_OBJ_GFX_JIGGLYPUFF_DOLL
 };
 
 const u16 DecorGfx_MEOWTH_DOLL[] = {
-    MAP_OBJ_GFX_MEOWTH_DOLL
+    EVENT_OBJ_GFX_MEOWTH_DOLL
 };
 
 const u16 DecorGfx_CLEFAIRY_DOLL[] = {
-    MAP_OBJ_GFX_CLEFAIRY_DOLL
+    EVENT_OBJ_GFX_CLEFAIRY_DOLL
 };
 
 const u16 DecorGfx_DITTO_DOLL[] = {
-    MAP_OBJ_GFX_DITTO_DOLL
+    EVENT_OBJ_GFX_DITTO_DOLL
 };
 
 const u16 DecorGfx_SMOOCHUM_DOLL[] = {
-    MAP_OBJ_GFX_SMOOCHUM_DOLL
+    EVENT_OBJ_GFX_SMOOCHUM_DOLL
 };
 
 const u16 DecorGfx_TREECKO_DOLL[] = {
-    MAP_OBJ_GFX_TREECKO_DOLL
+    EVENT_OBJ_GFX_TREECKO_DOLL
 };
 
 const u16 DecorGfx_TORCHIC_DOLL[] = {
-    MAP_OBJ_GFX_TORCHIC_DOLL
+    EVENT_OBJ_GFX_TORCHIC_DOLL
 };
 
 const u16 DecorGfx_MUDKIP_DOLL[] = {
-    MAP_OBJ_GFX_MUDKIP_DOLL
+    EVENT_OBJ_GFX_MUDKIP_DOLL
 };
 
 const u16 DecorGfx_DUSKULL_DOLL[] = {
-    MAP_OBJ_GFX_DUSKULL_DOLL
+    EVENT_OBJ_GFX_DUSKULL_DOLL
 };
 
 const u16 DecorGfx_WYNAUT_DOLL[] = {
-    MAP_OBJ_GFX_WYNAUT_DOLL
+    EVENT_OBJ_GFX_WYNAUT_DOLL
 };
 
 const u16 DecorGfx_BALTOY_DOLL[] = {
-    MAP_OBJ_GFX_BALTOY_DOLL
+    EVENT_OBJ_GFX_BALTOY_DOLL
 };
 
 const u16 DecorGfx_KECLEON_DOLL[] = {
-    MAP_OBJ_GFX_KECLEON_DOLL
+    EVENT_OBJ_GFX_KECLEON_DOLL
 };
 
 const u16 DecorGfx_AZURILL_DOLL[] = {
-    MAP_OBJ_GFX_AZURILL_DOLL
+    EVENT_OBJ_GFX_AZURILL_DOLL
 };
 
 const u16 DecorGfx_SKITTY_DOLL[] = {
-    MAP_OBJ_GFX_SKITTY_DOLL
+    EVENT_OBJ_GFX_SKITTY_DOLL
 };
 
 const u16 DecorGfx_SWABLU_DOLL[] = {
-    MAP_OBJ_GFX_SWABLU_DOLL
+    EVENT_OBJ_GFX_SWABLU_DOLL
 };
 
 const u16 DecorGfx_GULPIN_DOLL[] = {
-    MAP_OBJ_GFX_GULPIN_DOLL
+    EVENT_OBJ_GFX_GULPIN_DOLL
 };
 
 const u16 DecorGfx_LOTAD_DOLL[] = {
-    MAP_OBJ_GFX_LOTAD_DOLL
+    EVENT_OBJ_GFX_LOTAD_DOLL
 };
 
 const u16 DecorGfx_SEEDOT_DOLL[] = {
-    MAP_OBJ_GFX_SEEDOT_DOLL
+    EVENT_OBJ_GFX_SEEDOT_DOLL
 };
 
 const u16 DecorGfx_PIKA_CUSHION[] = {
-    MAP_OBJ_GFX_PIKA_CUSHION
+    EVENT_OBJ_GFX_PIKA_CUSHION
 };
 
 const u16 DecorGfx_ROUND_CUSHION[] = {
-    MAP_OBJ_GFX_ROUND_CUSHION
+    EVENT_OBJ_GFX_ROUND_CUSHION
 };
 
 const u16 DecorGfx_KISS_CUSHION[] = {
-    MAP_OBJ_GFX_KISS_CUSHION
+    EVENT_OBJ_GFX_KISS_CUSHION
 };
 
 const u16 DecorGfx_ZIGZAG_CUSHION[] = {
-    MAP_OBJ_GFX_ZIGZAG_CUSHION
+    EVENT_OBJ_GFX_ZIGZAG_CUSHION
 };
 
 const u16 DecorGfx_SPIN_CUSHION[] = {
-    MAP_OBJ_GFX_SPIN_CUSHION
+    EVENT_OBJ_GFX_SPIN_CUSHION
 };
 
 const u16 DecorGfx_DIAMOND_CUSHION[] = {
-    MAP_OBJ_GFX_DIAMOND_CUSHION
+    EVENT_OBJ_GFX_DIAMOND_CUSHION
 };
 
 const u16 DecorGfx_BALL_CUSHION[] = {
-    MAP_OBJ_GFX_BALL_CUSHION
+    EVENT_OBJ_GFX_BALL_CUSHION
 };
 
 const u16 DecorGfx_GRASS_CUSHION[] = {
-    MAP_OBJ_GFX_GRASS_CUSHION
+    EVENT_OBJ_GFX_GRASS_CUSHION
 };
 
 const u16 DecorGfx_FIRE_CUSHION[] = {
-    MAP_OBJ_GFX_FIRE_CUSHION
+    EVENT_OBJ_GFX_FIRE_CUSHION
 };
 
 const u16 DecorGfx_WATER_CUSHION[] = {
-    MAP_OBJ_GFX_WATER_CUSHION
+    EVENT_OBJ_GFX_WATER_CUSHION
 };
 
 const u16 DecorGfx_SNORLAX_DOLL[] = {
-    MAP_OBJ_GFX_BIG_SNORLAX_DOLL
+    EVENT_OBJ_GFX_BIG_SNORLAX_DOLL
 };
 
 const u16 DecorGfx_RHYDON_DOLL[] = {
-    MAP_OBJ_GFX_BIG_RHYDON_DOLL
+    EVENT_OBJ_GFX_BIG_RHYDON_DOLL
 };
 
 const u16 DecorGfx_LAPRAS_DOLL[] = {
-    MAP_OBJ_GFX_BIG_LAPRAS_DOLL
+    EVENT_OBJ_GFX_BIG_LAPRAS_DOLL
 };
 
 const u16 DecorGfx_VENUSAUR_DOLL[] = {
-    MAP_OBJ_GFX_BIG_VENUSAUR_DOLL
+    EVENT_OBJ_GFX_BIG_VENUSAUR_DOLL
 };
 
 const u16 DecorGfx_CHARIZARD_DOLL[] = {
-    MAP_OBJ_GFX_BIG_CHARIZARD_DOLL
+    EVENT_OBJ_GFX_BIG_CHARIZARD_DOLL
 };
 
 const u16 DecorGfx_BLASTOISE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_BLASTOISE_DOLL
+    EVENT_OBJ_GFX_BIG_BLASTOISE_DOLL
 };
 
 const u16 DecorGfx_WAILMER_DOLL[] = {
-    MAP_OBJ_GFX_BIG_WAILMER_DOLL
+    EVENT_OBJ_GFX_BIG_WAILMER_DOLL
 };
 
 const u16 DecorGfx_REGIROCK_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGIROCK_DOLL
+    EVENT_OBJ_GFX_BIG_REGIROCK_DOLL
 };
 
 const u16 DecorGfx_REGICE_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGICE_DOLL
+    EVENT_OBJ_GFX_BIG_REGICE_DOLL
 };
 
 const u16 DecorGfx_REGISTEEL_DOLL[] = {
-    MAP_OBJ_GFX_BIG_REGISTEEL_DOLL
+    EVENT_OBJ_GFX_BIG_REGISTEEL_DOLL
 };
 
 #if ENGLISH
@@ -2196,20 +2196,20 @@ void sub_80FF474(void)
         if (FlagGet(i + FLAG_DECORATION_2) == 1)
         {
             FlagClear(i + FLAG_DECORATION_2);
-            for (j=0; j<gMapHeader.events->mapObjectCount; j++)
+            for (j=0; j<gMapHeader.events->eventObjectCount; j++)
             {
-                if (gMapHeader.events->mapObjects[j].flagId == i + FLAG_DECORATION_2)
+                if (gMapHeader.events->eventObjects[j].flagId == i + FLAG_DECORATION_2)
                 {
                     break;
                 }
             }
-            VarSet(0x3f20 + gMapHeader.events->mapObjects[j].graphicsId, gUnknown_02038900.decoration->tiles[0]);
-            gSpecialVar_0x8005 = gMapHeader.events->mapObjects[j].localId;
+            VarSet(0x3f20 + gMapHeader.events->eventObjects[j].graphicsId, gUnknown_02038900.decoration->tiles[0]);
+            gSpecialVar_0x8005 = gMapHeader.events->eventObjects[j].localId;
             gSpecialVar_0x8006 = gUnknown_020391A4;
             gSpecialVar_0x8007 = gUnknown_020391A6;
             show_sprite(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
             sub_805C0F8(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-            sub_805C78C(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+            TryOverrideTemplateCoordsForEventObject(gSpecialVar_0x8005, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
             break;
         }
     }
@@ -2281,7 +2281,7 @@ void sub_80FF6AC(u8 taskId)
             break;
         case 1:
             gPaletteFade.bufferTransferDisabled = 1;
-            AddDecorationIconObjectFromFieldObject(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]);
+            AddDecorationIconObjectFromEventObject(&gUnknown_02038900, gUnknown_020388D0[gUnknown_020388F5]);
             sub_80FF960(taskId);
             SetUpPlacingDecorationPlayerAvatar(taskId, &gUnknown_02038900);
             pal_fill_black();
@@ -2298,7 +2298,7 @@ void sub_80FF6AC(u8 taskId)
     }
 }
 
-void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx)
+void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_02038900, u8 decoIdx)
 {
     sub_80FEF74();
     sub_80FED1C();
@@ -2316,7 +2316,7 @@ void AddDecorationIconObjectFromFieldObject(struct UnkStruct_02038900 * unk_0203
     } else
     {
         gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0];
-        gUnknown_03004880.unk4 = AddPseudoFieldObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x,  gUnknown_083EC900[unk_02038900->decoration->shape].y, 1);
+        gUnknown_03004880.unk4 = AddPseudoEventObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x,  gUnknown_083EC900[unk_02038900->decoration->shape].y, 1);
         gSprites[gUnknown_03004880.unk4].oam.priority = 1;
     }
 }
@@ -2331,10 +2331,10 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct UnkStruct_02038900 *un
     }
     if (gSaveBlock2.playerGender == MALE)
     {
-        gUnknown_020391A9 = AddPseudoFieldObject(0xc1, SpriteCallbackDummy, v0, 0x48, 0);
+        gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, v0, 0x48, 0);
     } else
     {
-        gUnknown_020391A9 = AddPseudoFieldObject(0xc2, SpriteCallbackDummy, v0, 0x48, 0);
+        gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, v0, 0x48, 0);
     }
     gSprites[gUnknown_020391A9].oam.priority = 1;
     DestroySprite(&gSprites[gUnknown_020391A8]);
@@ -2475,7 +2475,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                    behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
                     if (behaviorAt != 0 && behaviorAt != 16)
                     {
                         return FALSE;
@@ -2500,7 +2500,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                     {
                         return FALSE;
                     }
-                    if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
+                    if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
                     {
                         return FALSE;
                     }
@@ -2520,7 +2520,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                 {
                     return FALSE;
                 }
-                behaviorAt = GetFieldObjectIdByXYZ(curX, curY, 0);
+                behaviorAt = GetEventObjectIdByXYZ(curX, curY, 0);
                 if (behaviorAt != 0 && behaviorAt != 16)
                 {
                     return FALSE;
@@ -2565,7 +2565,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
                         return FALSE;
                     }
                 }
-                if (GetFieldObjectIdByXYZ(curX, curY, 0) != 16)
+                if (GetEventObjectIdByXYZ(curX, curY, 0) != 16)
                 {
                     return FALSE;
                 }
@@ -2716,7 +2716,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tldr r2, [sp, 0xC]\n"
     "\tlsrs r1, r2, 16\n"
     "\tmovs r2, 0\n"
-    "\tbl GetFieldObjectIdByXYZ\n"
+    "\tbl GetEventObjectIdByXYZ\n"
     "\tlsls r0, 24\n"
     "\tlsrs r4, r0, 24\n"
     "\tcmp r4, 0\n"
@@ -2839,7 +2839,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tldr r2, [sp, 0x20]\n"
     "\tlsrs r1, r2, 16\n"
     "\tmovs r2, 0\n"
-    "\tbl GetFieldObjectIdByXYZ\n"
+    "\tbl GetEventObjectIdByXYZ\n"
     "\tlsls r0, 24\n"
     "\tlsrs r0, 24\n"
     "\tcmp r0, 0x10\n"
@@ -2943,7 +2943,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tldr r2, [sp, 0x20]\n"
     "\tlsrs r1, r2, 16\n"
     "\tmovs r2, 0\n"
-    "\tbl GetFieldObjectIdByXYZ\n"
+    "\tbl GetEventObjectIdByXYZ\n"
     "\tlsls r0, 24\n"
     "\tlsrs r4, r0, 24\n"
     "\tcmp r4, 0\n"
@@ -3083,7 +3083,7 @@ bool8 sub_80FFC24(u8 taskId, const struct Decoration *decoration)
     "\tldr r2, [sp, 0x20]\n"
     "\tlsrs r1, r2, 16\n"
     "\tmovs r2, 0\n"
-    "\tbl GetFieldObjectIdByXYZ\n"
+    "\tbl GetEventObjectIdByXYZ\n"
     "\tlsls r0, 24\n"
     "\tlsrs r0, 24\n"
     "\tcmp r0, 0x10\n"
@@ -3656,11 +3656,11 @@ void sub_8100A7C(void)
     {
         gSpecialVar_0x8005 = gUnknown_020391B4[gSpecialVar_0x8004].flagId;
         sub_8100A60(gUnknown_020391B4[gSpecialVar_0x8004].decorId);
-        for (i=0; i<gMapHeader.events->mapObjectCount; i++)
+        for (i=0; i<gMapHeader.events->eventObjectCount; i++)
         {
-            if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8005)
+            if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8005)
             {
-                gSpecialVar_0x8006 = gMapHeader.events->mapObjects[i].localId;
+                gSpecialVar_0x8006 = gMapHeader.events->eventObjects[i].localId;
                 break;
             }
         }
@@ -3670,11 +3670,11 @@ void sub_8100A7C(void)
 void sub_8100B20(void)
 {
     u8 i;
-    for (i=0; i<gMapHeader.events->mapObjectCount; i++)
+    for (i=0; i<gMapHeader.events->eventObjectCount; i++)
     {
-        if (gMapHeader.events->mapObjects[i].flagId == gSpecialVar_0x8004)
+        if (gMapHeader.events->eventObjects[i].flagId == gSpecialVar_0x8004)
         {
-            gSpecialVar_0x8005 = gMapHeader.events->mapObjects[i].localId;
+            gSpecialVar_0x8005 = gMapHeader.events->eventObjects[i].localId;
             break;
         }
     }
@@ -3760,17 +3760,17 @@ bool8 sub_8100D38(u8 taskId)
 
 void SetUpPuttingAwayDecorationPlayerAvatar(void)
 {
-    player_get_direction_lower_nybble();
+    GetPlayerFacingDirection();
     Menu_EraseWindowRect(0, 0, 29, 19);
     gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0];
     sub_81016C8();
     gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0);
     if (gSaveBlock2.playerGender == MALE)
     {
-        gUnknown_020391A9 = AddPseudoFieldObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0);
+        gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0);
     } else
     {
-        gUnknown_020391A9 = AddPseudoFieldObject(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0);
+        gUnknown_020391A9 = AddPseudoEventObject(0xc2, SpriteCallbackDummy, 0x88, 0x48, 0);
     }
     gSprites[gUnknown_020391A9].oam.priority = 1;
     DestroySprite(&gSprites[gUnknown_020391A8]);
@@ -3953,9 +3953,9 @@ void sub_81012A0(void)
     yOff = ewram_1f000.pos[gUnknown_020391B4[gUnknown_02039234].decorId] & 0xf;
     for (i=0; i<0x40; i++)
     {
-        if (gSaveBlock1.mapObjectTemplates[i].x == xOff && gSaveBlock1.mapObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1.mapObjectTemplates[i].flagId))
+        if (gSaveBlock1.eventObjectTemplates[i].x == xOff && gSaveBlock1.eventObjectTemplates[i].y == yOff && !FlagGet(gSaveBlock1.eventObjectTemplates[i].flagId))
         {
-            gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.mapObjectTemplates[i].flagId;
+            gUnknown_020391B4[gUnknown_02039234].flagId = gSaveBlock1.eventObjectTemplates[i].flagId;
             break;
         }
     }
diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c
index 01f5e016d..530c2ae5e 100644
--- a/src/easy_chat_2.c
+++ b/src/easy_chat_2.c
@@ -1,6 +1,6 @@
 #include "global.h"
 #include "constants/easy_chat.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "data2.h"
 #include "decompress.h"
 #include "easy_chat.h"
@@ -740,10 +740,10 @@ void sub_80E8BF4(u8 reporter, u8 b)
     {
     case 0:  // Gabby
     default:
-        gabbyTyGfxId = MAP_OBJ_GFX_REPORTER_M;
+        gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_M;
         break;
     case 1:  // Ty
-        gabbyTyGfxId = MAP_OBJ_GFX_REPORTER_F;
+        gabbyTyGfxId = EVENT_OBJ_GFX_REPORTER_F;
         break;
     }
 
@@ -751,8 +751,8 @@ void sub_80E8BF4(u8 reporter, u8 b)
     LoadSpritePalette(&gUnknown_083DBD38);
     CreateSprite(&gSpriteTemplate_83DBD48, x, y, 1);
 
-    spriteId = AddPseudoFieldObject(
-      (gSaveBlock2.playerGender == MALE) ? MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL : MAP_OBJ_GFX_RIVAL_MAY_NORMAL,
+    spriteId = AddPseudoEventObject(
+      (gSaveBlock2.playerGender == MALE) ? EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL : EVENT_OBJ_GFX_RIVAL_MAY_NORMAL,
       SpriteCallbackDummy, x - 12, y, 0);
     if (spriteId != MAX_SPRITES)
     {
@@ -760,7 +760,7 @@ void sub_80E8BF4(u8 reporter, u8 b)
         StartSpriteAnim(&gSprites[spriteId], 3);
     }
 
-    spriteId = AddPseudoFieldObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0);
+    spriteId = AddPseudoEventObject(gabbyTyGfxId, SpriteCallbackDummy, x + 12, y, 0);
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].oam.priority = 0;
diff --git a/src/event_data.c b/src/event_data.c
index 9d6d2372b..bfa9ff821 100644
--- a/src/event_data.c
+++ b/src/event_data.c
@@ -136,7 +136,7 @@ bool8 VarSet(u16 id, u16 value)
     return TRUE;
 }
 
-u8 VarGetFieldObjectGraphicsId(u8 id)
+u8 VarGetEventObjectGraphicsId(u8 id)
 {
     return VarGet(VAR_OBJ_GFX_ID_0 + id);
 }
diff --git a/src/map_obj_lock.c b/src/event_obj_lock.c
index bac306cd8..624cf0b35 100644
--- a/src/map_obj_lock.c
+++ b/src/event_obj_lock.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "script_movement.h"
@@ -37,9 +37,9 @@ bool8 sub_8064CFC(void)
     }
 }
 
-void ScriptFreezeMapObjects(void)
+void ScriptFreezeEventObjects(void)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_8064CDC, 80);
 }
 
@@ -52,9 +52,9 @@ void sub_8064D38(u8 taskId)
         sub_80594C0();
         task->data[0] = 1;
     }
-    if (!task->data[1] && !gMapObjects[gSelectedMapObject].regularAnimActive)
+    if (!task->data[1] && !gEventObjects[gSelectedEventObject].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[gSelectedMapObject]);
+        FreezeEventObject(&gEventObjects[gSelectedEventObject]);
         task->data[1] = 1;
     }
     if (task->data[0] && task->data[1])
@@ -74,44 +74,44 @@ bool8 sub_8064DB4(void)
     }
 }
 
-void LockSelectedMapObject(void)
+void LockSelectedEventObject(void)
 {
     u8 taskId;
-    FreezeMapObjectsExceptOne(gSelectedMapObject);
+    FreezeEventObjectsExceptOne(gSelectedEventObject);
     taskId = CreateTask(sub_8064D38, 80);
-    if (!gMapObjects[gSelectedMapObject].regularAnimActive)
+    if (!gEventObjects[gSelectedEventObject].singleMovementActive)
     {
-        FreezeMapObject(&gMapObjects[gSelectedMapObject]);
+        FreezeEventObject(&gEventObjects[gSelectedEventObject]);
         gTasks[taskId].data[1] = 1;
     }
 }
 
 void sub_8064E2C(void)
 {
-    u8 objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    u8 objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80A2178();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
 }
 
 void unref_sub_8064E5C(void)
 {
     u8 objectId;
 
-    if (gMapObjects[gSelectedMapObject].active)
-        FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]);
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    if (gEventObjects[gSelectedEventObject].active)
+        EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80A2178();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
 }
 
 void sub_8064EAC(void)
 {
-    FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing);
+    EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject], gSpecialVar_Facing);
 }
 
 void sub_8064ED4(void)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[gSelectedMapObject]);
+    EventObjectClearHeldMovementIfActive(&gEventObjects[gSelectedEventObject]);
 }
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 78ed41d77..319274f98 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -15,1606 +15,343 @@
 #include "trainer_see.h"
 #include "constants/field_effects.h"
 #include "constants/maps.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 
 // this file was known as evobjmv.c in Game Freak's original source
 
-// rodata
+static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject*, struct Sprite*);
+static u8 MovementType_Disguise_Callback(struct EventObject*, struct Sprite*);
+static u8 MovementType_Hidden_Callback(struct EventObject*, struct Sprite*);
+static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject*, s16, s16);
+static bool8 DoesObjectCollideWithObjectAt(struct EventObject*, s16, s16);
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject*, s16, s16, u8);
+static void ClearEventObjectMovement(struct EventObject*, struct Sprite *sprite);
+static void EventObjectSetSingleMovement(struct EventObject*, struct Sprite*, u8);
+static u8 EventObjectExecSingleMovementAction(struct EventObject*, struct Sprite*);
+static void SetMovementDelay(struct Sprite*, s16);
+static u8 WaitForMovementDelay(struct Sprite*);
+static u8 GetCollisionInDirection(struct EventObject*, u8);
+static void MoveCoordsInDirection(u32, s16 *, s16 *, s16, s16);
+static void DoGroundEffects_OnSpawn(struct EventObject*, struct Sprite*);
+static void DoGroundEffects_OnBeginStep(struct EventObject*, struct Sprite*);
+static void DoGroundEffects_OnFinishStep(struct EventObject*, struct Sprite*);
+static void UpdateEventObjectSpriteAnimPause(struct EventObject*, struct Sprite*);
+static void TryEnableEventObjectAnim(struct EventObject*, struct Sprite*);
+static void EventObjectExecHeldMovementAction(struct EventObject*, struct Sprite*);
+static void EventObjectUpdateSubpriority(struct EventObject*, struct Sprite*);
+static void UpdateEventObjectVisibility(struct EventObject*, struct Sprite*);
+static void UpdateEventObjectIsOffscreen(struct EventObject*, struct Sprite*);
+static void UpdateEventObjSpriteVisibility(struct EventObject*, struct Sprite*);
+static void nullsub(struct EventObject*, struct Sprite*, u8);
+static void DoTracksGroundEffect_Footprints(struct EventObject*, struct Sprite*, u8);
+static void DoTracksGroundEffect_BikeTireTracks(struct EventObject*, struct Sprite*, u8);
+static u8 GetReflectionTypeByMetatileBehavior(u32);
+static void Step1(struct Sprite *sprite, u8 direction);
+static void Step2(struct Sprite *sprite, u8 direction);
+static void Step3(struct Sprite *sprite, u8 direction);
+static void Step4(struct Sprite *sprite, u8 direction);
+static void Step8(struct Sprite *sprite, u8 direction);
+static void oamt_npc_ministep_reset(struct Sprite*, u8, u8);
+static void CameraObject_0(struct Sprite *);
+static void CameraObject_1(struct Sprite *);
+static void CameraObject_2(struct Sprite *);
+static void ObjectCB_CameraObject(struct Sprite *sprite);
+static bool8 EventObjectZCoordIsCompatible(struct EventObject*, u8);
+static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8, struct EventObjectTemplate*, u8);
+static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *);
+static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z);
 
 const u8 gUnknown_0830FD14[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11, 0, 0, 0, 0};
 
-void ObjectCB_CameraObject(struct Sprite *sprite);
-const struct SpriteTemplate gSpriteTemplate_830FD24 = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject};
+const struct SpriteTemplate gCameraSpriteTemplate = {0, 0xFFFF, &gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject};
 
-void CameraObject_0(struct Sprite *);
-void CameraObject_1(struct Sprite *);
-void CameraObject_2(struct Sprite *);
 void (*const gCameraObjectFuncs[])(struct Sprite *) = {
     CameraObject_0,
     CameraObject_1,
     CameraObject_2,
 };
 
-const u32 gMapObjectPic_BrendanNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/00.4bpp");
-const u32 gMapObjectPic_BrendanNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/01.4bpp");
-const u32 gMapObjectPic_BrendanNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/02.4bpp");
-const u32 gMapObjectPic_BrendanNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/03.4bpp");
-const u32 gMapObjectPic_BrendanNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/04.4bpp");
-const u32 gMapObjectPic_BrendanNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/05.4bpp");
-const u32 gMapObjectPic_BrendanNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/06.4bpp");
-const u32 gMapObjectPic_BrendanNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/07.4bpp");
-const u32 gMapObjectPic_BrendanNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/08.4bpp");
-const u32 gMapObjectPic_BrendanNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/09.4bpp");
-const u32 gMapObjectPic_BrendanNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/10.4bpp");
-const u32 gMapObjectPic_BrendanNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/11.4bpp");
-const u32 gMapObjectPic_BrendanNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/12.4bpp");
-const u32 gMapObjectPic_BrendanNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/13.4bpp");
-const u32 gMapObjectPic_BrendanNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/14.4bpp");
-const u32 gMapObjectPic_BrendanNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/15.4bpp");
-const u32 gMapObjectPic_BrendanNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/16.4bpp");
-const u32 gMapObjectPic_BrendanNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/normal/17.4bpp");
-const u16 gMapObjectPalette8[] = INCBIN_U16("graphics/map_objects/palettes/08.gbapal");
-const u16 NullPalette_8310F68[16] = {};
-const u16 NullPalette_8310F88[16] = {};
-const u16 NullPalette_8310FA8[16] = {};
-const u16 NullPalette_8310FC8[16] = {};
-const u16 NullPalette_8310FE8[16] = {};
-const u16 NullPalette_8311008[16] = {};
-const u16 NullPalette_8311028[16] = {};
-const u16 NullPalette_8311048[16] = {};
-const u16 NullPalette_8311068[16] = {};
-const u16 NullPalette_8311088[16] = {};
-const u16 NullPalette_83110A8[16] = {};
-const u16 NullPalette_83110C8[16] = {};
-const u16 NullPalette_83110E8[16] = {};
-const u16 NullPalette_8311108[16] = {};
-const u16 NullPalette_8311128[16] = {};
-const u16 gMapObjectPalette9[] = INCBIN_U16("graphics/map_objects/palettes/09.gbapal");
-const u16 gMapObjectPalette10[] = INCBIN_U16("graphics/map_objects/palettes/10.gbapal");
-const u32 gMapObjectPic_BrendanFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/0.4bpp");
-const u32 gMapObjectPic_BrendanFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/1.4bpp");
-const u32 gMapObjectPic_BrendanFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/2.4bpp");
-const u32 gMapObjectPic_BrendanFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/3.4bpp");
-const u32 gMapObjectPic_BrendanFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/field_move/4.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/0.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/3.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/1.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/4.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/2.4bpp");
-const u32 gMapObjectPic_BrendanSurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/surfing/5.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp");
-const u32 gMapObjectPic_BrendanMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp");
-const u32 gMapObjectPic_BrendanAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp");
-const u32 gMapObjectPic_BrendanFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/00.4bpp");
-const u32 gMapObjectPic_BrendanFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/01.4bpp");
-const u32 gMapObjectPic_BrendanFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/02.4bpp");
-const u32 gMapObjectPic_BrendanFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/03.4bpp");
-const u32 gMapObjectPic_BrendanFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/04.4bpp");
-const u32 gMapObjectPic_BrendanFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/05.4bpp");
-const u32 gMapObjectPic_BrendanFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/06.4bpp");
-const u32 gMapObjectPic_BrendanFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/07.4bpp");
-const u32 gMapObjectPic_BrendanFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/08.4bpp");
-const u32 gMapObjectPic_BrendanFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/09.4bpp");
-const u32 gMapObjectPic_BrendanFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/10.4bpp");
-const u32 gMapObjectPic_BrendanFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/fishing/11.4bpp");
-const u32 gMapObjectPic_BrendanWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/0.4bpp");
-const u32 gMapObjectPic_BrendanWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/3.4bpp");
-const u32 gMapObjectPic_BrendanWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/1.4bpp");
-const u32 gMapObjectPic_BrendanWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/4.4bpp");
-const u32 gMapObjectPic_BrendanWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/2.4bpp");
-const u32 gMapObjectPic_BrendanWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/watering/5.4bpp");
-const u32 gMapObjectPic_BrendanDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/decorating.4bpp");
-const u32 gMapObjectPic_MayDecorating[] = INCBIN_U32("graphics/map_objects/pics/people/may/decorating.4bpp");
-const u32 gMapObjectPic_BrendanUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/0.4bpp");
-const u32 gMapObjectPic_BrendanUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/1.4bpp");
-const u32 gMapObjectPic_BrendanUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/2.4bpp");
-const u32 gMapObjectPic_BrendanUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/brendan/underwater/3.4bpp");
-const u32 gMapObjectPic_MayUnderwater_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/0.4bpp");
-const u32 gMapObjectPic_MayUnderwater_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/1.4bpp");
-const u32 gMapObjectPic_MayUnderwater_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/2.4bpp");
-const u32 gMapObjectPic_MayUnderwater_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/underwater/3.4bpp");
-const u16 gMapObjectPalette11[] = INCBIN_U16("graphics/map_objects/palettes/11.gbapal");
-const u32 gMapObjectPic_MayNormal_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/00.4bpp");
-const u32 gMapObjectPic_MayNormal_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/01.4bpp");
-const u32 gMapObjectPic_MayNormal_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/02.4bpp");
-const u32 gMapObjectPic_MayNormal_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/03.4bpp");
-const u32 gMapObjectPic_MayNormal_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/04.4bpp");
-const u32 gMapObjectPic_MayNormal_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/05.4bpp");
-const u32 gMapObjectPic_MayNormal_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/06.4bpp");
-const u32 gMapObjectPic_MayNormal_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/07.4bpp");
-const u32 gMapObjectPic_MayNormal_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/08.4bpp");
-const u32 gMapObjectPic_MayNormal_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/09.4bpp");
-const u32 gMapObjectPic_MayNormal_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/10.4bpp");
-const u32 gMapObjectPic_MayNormal_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/11.4bpp");
-const u32 gMapObjectPic_MayNormal_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/12.4bpp");
-const u32 gMapObjectPic_MayNormal_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/13.4bpp");
-const u32 gMapObjectPic_MayNormal_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/14.4bpp");
-const u32 gMapObjectPic_MayNormal_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/15.4bpp");
-const u32 gMapObjectPic_MayNormal_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/16.4bpp");
-const u32 gMapObjectPic_MayNormal_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/normal/17.4bpp");
-const u16 gMapObjectPalette17[] = INCBIN_U16("graphics/map_objects/palettes/17.gbapal");
-const u16 gMapObjectPalette18[] = INCBIN_U16("graphics/map_objects/palettes/18.gbapal");
-const u16 NullPalette_831B7E8[16] = {};
-const u16 NullPalette_831B808[16] = {};
-const u16 NullPalette_831B828[16] = {};
-const u16 NullPalette_831B848[16] = {};
-const u16 NullPalette_831B868[16] = {};
-const u16 NullPalette_831B888[16] = {};
-const u16 NullPalette_831B8A8[16] = {};
-const u16 NullPalette_831B8C8[16] = {};
-const u16 NullPalette_831B8E8[16] = {};
-const u16 NullPalette_831B908[16] = {};
-const u16 NullPalette_831B928[16] = {};
-const u16 NullPalette_831B948[16] = {};
-const u16 NullPalette_831B968[16] = {};
-const u16 NullPalette_831B988[16] = {};
-const u32 gMapObjectPic_MayMachBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/0.4bpp");
-const u32 gMapObjectPic_MayMachBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/1.4bpp");
-const u32 gMapObjectPic_MayMachBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/2.4bpp");
-const u32 gMapObjectPic_MayMachBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/3.4bpp");
-const u32 gMapObjectPic_MayMachBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/4.4bpp");
-const u32 gMapObjectPic_MayMachBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/5.4bpp");
-const u32 gMapObjectPic_MayMachBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/6.4bpp");
-const u32 gMapObjectPic_MayMachBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/7.4bpp");
-const u32 gMapObjectPic_MayMachBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/mach_bike/8.4bpp");
-const u32 gMapObjectPic_MayAcroBike_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/00.4bpp");
-const u32 gMapObjectPic_MayAcroBike_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/01.4bpp");
-const u32 gMapObjectPic_MayAcroBike_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/02.4bpp");
-const u32 gMapObjectPic_MayAcroBike_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/03.4bpp");
-const u32 gMapObjectPic_MayAcroBike_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/04.4bpp");
-const u32 gMapObjectPic_MayAcroBike_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/05.4bpp");
-const u32 gMapObjectPic_MayAcroBike_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/06.4bpp");
-const u32 gMapObjectPic_MayAcroBike_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/07.4bpp");
-const u32 gMapObjectPic_MayAcroBike_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/08.4bpp");
-const u32 gMapObjectPic_MayAcroBike_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/09.4bpp");
-const u32 gMapObjectPic_MayAcroBike_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/10.4bpp");
-const u32 gMapObjectPic_MayAcroBike_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/11.4bpp");
-const u32 gMapObjectPic_MayAcroBike_12[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/12.4bpp");
-const u32 gMapObjectPic_MayAcroBike_13[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/13.4bpp");
-const u32 gMapObjectPic_MayAcroBike_14[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/14.4bpp");
-const u32 gMapObjectPic_MayAcroBike_15[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/15.4bpp");
-const u32 gMapObjectPic_MayAcroBike_16[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/16.4bpp");
-const u32 gMapObjectPic_MayAcroBike_17[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/17.4bpp");
-const u32 gMapObjectPic_MayAcroBike_18[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/18.4bpp");
-const u32 gMapObjectPic_MayAcroBike_19[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/19.4bpp");
-const u32 gMapObjectPic_MayAcroBike_20[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/20.4bpp");
-const u32 gMapObjectPic_MayAcroBike_21[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/21.4bpp");
-const u32 gMapObjectPic_MayAcroBike_22[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/22.4bpp");
-const u32 gMapObjectPic_MayAcroBike_23[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/23.4bpp");
-const u32 gMapObjectPic_MayAcroBike_24[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/24.4bpp");
-const u32 gMapObjectPic_MayAcroBike_25[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/25.4bpp");
-const u32 gMapObjectPic_MayAcroBike_26[] = INCBIN_U32("graphics/map_objects/pics/people/may/acro_bike/26.4bpp");
-const u32 gMapObjectPic_MaySurfing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/0.4bpp");
-const u32 gMapObjectPic_MaySurfing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/3.4bpp");
-const u32 gMapObjectPic_MaySurfing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/1.4bpp");
-const u32 gMapObjectPic_MaySurfing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/4.4bpp");
-const u32 gMapObjectPic_MaySurfing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/2.4bpp");
-const u32 gMapObjectPic_MaySurfing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/surfing/5.4bpp");
-const u32 gMapObjectPic_MayFieldMove_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/0.4bpp");
-const u32 gMapObjectPic_MayFieldMove_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/1.4bpp");
-const u32 gMapObjectPic_MayFieldMove_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/2.4bpp");
-const u32 gMapObjectPic_MayFieldMove_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/3.4bpp");
-const u32 gMapObjectPic_MayFieldMove_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/field_move/4.4bpp");
-const u32 gMapObjectPic_MayFishing_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/00.4bpp");
-const u32 gMapObjectPic_MayFishing_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/01.4bpp");
-const u32 gMapObjectPic_MayFishing_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/02.4bpp");
-const u32 gMapObjectPic_MayFishing_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/03.4bpp");
-const u32 gMapObjectPic_MayFishing_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/04.4bpp");
-const u32 gMapObjectPic_MayFishing_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/05.4bpp");
-const u32 gMapObjectPic_MayFishing_6[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/06.4bpp");
-const u32 gMapObjectPic_MayFishing_7[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/07.4bpp");
-const u32 gMapObjectPic_MayFishing_8[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/08.4bpp");
-const u32 gMapObjectPic_MayFishing_9[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/09.4bpp");
-const u32 gMapObjectPic_MayFishing_10[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/10.4bpp");
-const u32 gMapObjectPic_MayFishing_11[] = INCBIN_U32("graphics/map_objects/pics/people/may/fishing/11.4bpp");
-const u32 gMapObjectPic_MayWatering_0[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/0.4bpp");
-const u32 gMapObjectPic_MayWatering_3[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/3.4bpp");
-const u32 gMapObjectPic_MayWatering_1[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/1.4bpp");
-const u32 gMapObjectPic_MayWatering_4[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/4.4bpp");
-const u32 gMapObjectPic_MayWatering_2[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/2.4bpp");
-const u32 gMapObjectPic_MayWatering_5[] = INCBIN_U32("graphics/map_objects/pics/people/may/watering/5.4bpp");
-const u16 gMapObjectPalette0[] = INCBIN_U16("graphics/map_objects/palettes/00.gbapal");
-const u16 gMapObjectPalette1[] = INCBIN_U16("graphics/map_objects/palettes/01.gbapal");
-const u16 gMapObjectPalette2[] = INCBIN_U16("graphics/map_objects/palettes/02.gbapal");
-const u16 gMapObjectPalette3[] = INCBIN_U16("graphics/map_objects/palettes/03.gbapal");
-const u16 gMapObjectPalette4[] = INCBIN_U16("graphics/map_objects/palettes/04.gbapal");
-const u16 gMapObjectPalette5[] = INCBIN_U16("graphics/map_objects/palettes/05.gbapal");
-const u16 gMapObjectPalette6[] = INCBIN_U16("graphics/map_objects/palettes/06.gbapal");
-const u16 gMapObjectPalette7[] = INCBIN_U16("graphics/map_objects/palettes/07.gbapal");
-const u32 gMapObjectPic_LittleBoy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/0.4bpp");
-const u32 gMapObjectPic_LittleBoy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/1.4bpp");
-const u32 gMapObjectPic_LittleBoy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/2.4bpp");
-const u32 gMapObjectPic_LittleBoy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/3.4bpp");
-const u32 gMapObjectPic_LittleBoy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/4.4bpp");
-const u32 gMapObjectPic_LittleBoy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/5.4bpp");
-const u32 gMapObjectPic_LittleBoy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/6.4bpp");
-const u32 gMapObjectPic_LittleBoy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/7.4bpp");
-const u32 gMapObjectPic_LittleBoy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_1/8.4bpp");
-const u32 gMapObjectPic_LittleGirl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/0.4bpp");
-const u32 gMapObjectPic_LittleGirl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/1.4bpp");
-const u32 gMapObjectPic_LittleGirl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/2.4bpp");
-const u32 gMapObjectPic_LittleGirl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/3.4bpp");
-const u32 gMapObjectPic_LittleGirl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/4.4bpp");
-const u32 gMapObjectPic_LittleGirl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/5.4bpp");
-const u32 gMapObjectPic_LittleGirl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/6.4bpp");
-const u32 gMapObjectPic_LittleGirl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/7.4bpp");
-const u32 gMapObjectPic_LittleGirl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_1/8.4bpp");
-const u32 gMapObjectPic_Boy1_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/0.4bpp");
-const u32 gMapObjectPic_Boy1_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/1.4bpp");
-const u32 gMapObjectPic_Boy1_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/2.4bpp");
-const u32 gMapObjectPic_Boy1_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/3.4bpp");
-const u32 gMapObjectPic_Boy1_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/4.4bpp");
-const u32 gMapObjectPic_Boy1_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/5.4bpp");
-const u32 gMapObjectPic_Boy1_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/6.4bpp");
-const u32 gMapObjectPic_Boy1_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/7.4bpp");
-const u32 gMapObjectPic_Boy1_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_1/8.4bpp");
-const u32 gMapObjectPic_Girl1_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/0.4bpp");
-const u32 gMapObjectPic_Girl1_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/1.4bpp");
-const u32 gMapObjectPic_Girl1_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/2.4bpp");
-const u32 gMapObjectPic_Girl1_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/3.4bpp");
-const u32 gMapObjectPic_Girl1_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/4.4bpp");
-const u32 gMapObjectPic_Girl1_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/5.4bpp");
-const u32 gMapObjectPic_Girl1_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/6.4bpp");
-const u32 gMapObjectPic_Girl1_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/7.4bpp");
-const u32 gMapObjectPic_Girl1_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_1/8.4bpp");
-const u32 gMapObjectPic_Boy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/0.4bpp");
-const u32 gMapObjectPic_Boy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/1.4bpp");
-const u32 gMapObjectPic_Boy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/2.4bpp");
-const u32 gMapObjectPic_Boy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/3.4bpp");
-const u32 gMapObjectPic_Boy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/4.4bpp");
-const u32 gMapObjectPic_Boy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/5.4bpp");
-const u32 gMapObjectPic_Boy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/6.4bpp");
-const u32 gMapObjectPic_Boy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/7.4bpp");
-const u32 gMapObjectPic_Boy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_2/8.4bpp");
-const u32 gMapObjectPic_Girl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/0.4bpp");
-const u32 gMapObjectPic_Girl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/1.4bpp");
-const u32 gMapObjectPic_Girl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/2.4bpp");
-const u32 gMapObjectPic_Girl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/3.4bpp");
-const u32 gMapObjectPic_Girl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/4.4bpp");
-const u32 gMapObjectPic_Girl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/5.4bpp");
-const u32 gMapObjectPic_Girl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/6.4bpp");
-const u32 gMapObjectPic_Girl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/7.4bpp");
-const u32 gMapObjectPic_Girl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_2/8.4bpp");
-const u32 gMapObjectPic_LittleBoy2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/0.4bpp");
-const u32 gMapObjectPic_LittleBoy2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/1.4bpp");
-const u32 gMapObjectPic_LittleBoy2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/2.4bpp");
-const u32 gMapObjectPic_LittleBoy2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/3.4bpp");
-const u32 gMapObjectPic_LittleBoy2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/4.4bpp");
-const u32 gMapObjectPic_LittleBoy2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/5.4bpp");
-const u32 gMapObjectPic_LittleBoy2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/6.4bpp");
-const u32 gMapObjectPic_LittleBoy2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/7.4bpp");
-const u32 gMapObjectPic_LittleBoy2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_2/8.4bpp");
-const u32 gMapObjectPic_LittleGirl2_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/0.4bpp");
-const u32 gMapObjectPic_LittleGirl2_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/1.4bpp");
-const u32 gMapObjectPic_LittleGirl2_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/2.4bpp");
-const u32 gMapObjectPic_LittleGirl2_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/3.4bpp");
-const u32 gMapObjectPic_LittleGirl2_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/4.4bpp");
-const u32 gMapObjectPic_LittleGirl2_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/5.4bpp");
-const u32 gMapObjectPic_LittleGirl2_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/6.4bpp");
-const u32 gMapObjectPic_LittleGirl2_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/7.4bpp");
-const u32 gMapObjectPic_LittleGirl2_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_girl_2/8.4bpp");
-const u32 gMapObjectPic_Boy3_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/0.4bpp");
-const u32 gMapObjectPic_Boy3_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/1.4bpp");
-const u32 gMapObjectPic_Boy3_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/2.4bpp");
-const u32 gMapObjectPic_Boy3_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/3.4bpp");
-const u32 gMapObjectPic_Boy3_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/4.4bpp");
-const u32 gMapObjectPic_Boy3_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/5.4bpp");
-const u32 gMapObjectPic_Boy3_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/6.4bpp");
-const u32 gMapObjectPic_Boy3_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/7.4bpp");
-const u32 gMapObjectPic_Boy3_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_3/8.4bpp");
-const u32 gMapObjectPic_Girl3_0[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/0.4bpp");
-const u32 gMapObjectPic_Girl3_1[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/1.4bpp");
-const u32 gMapObjectPic_Girl3_2[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/2.4bpp");
-const u32 gMapObjectPic_Girl3_3[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/3.4bpp");
-const u32 gMapObjectPic_Girl3_4[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/4.4bpp");
-const u32 gMapObjectPic_Girl3_5[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/5.4bpp");
-const u32 gMapObjectPic_Girl3_6[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/6.4bpp");
-const u32 gMapObjectPic_Girl3_7[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/7.4bpp");
-const u32 gMapObjectPic_Girl3_8[] = INCBIN_U32("graphics/map_objects/pics/people/girl_3/8.4bpp");
-const u32 gMapObjectPic_Boy4_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/0.4bpp");
-const u32 gMapObjectPic_Boy4_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/1.4bpp");
-const u32 gMapObjectPic_Boy4_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/2.4bpp");
-const u32 gMapObjectPic_Boy4_3[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/3.4bpp");
-const u32 gMapObjectPic_Boy4_4[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/4.4bpp");
-const u32 gMapObjectPic_Boy4_5[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/5.4bpp");
-const u32 gMapObjectPic_Boy4_6[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/6.4bpp");
-const u32 gMapObjectPic_Boy4_7[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/7.4bpp");
-const u32 gMapObjectPic_Boy4_8[] = INCBIN_U32("graphics/map_objects/pics/people/boy_4/8.4bpp");
-const u32 gMapObjectPic_Woman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/0.4bpp");
-const u32 gMapObjectPic_Woman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/1.4bpp");
-const u32 gMapObjectPic_Woman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/2.4bpp");
-const u32 gMapObjectPic_Woman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/3.4bpp");
-const u32 gMapObjectPic_Woman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/4.4bpp");
-const u32 gMapObjectPic_Woman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/5.4bpp");
-const u32 gMapObjectPic_Woman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/6.4bpp");
-const u32 gMapObjectPic_Woman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/7.4bpp");
-const u32 gMapObjectPic_Woman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_1/8.4bpp");
-const u32 gMapObjectPic_FatMan_0[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/0.4bpp");
-const u32 gMapObjectPic_FatMan_1[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/1.4bpp");
-const u32 gMapObjectPic_FatMan_2[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/2.4bpp");
-const u32 gMapObjectPic_FatMan_3[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/3.4bpp");
-const u32 gMapObjectPic_FatMan_4[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/4.4bpp");
-const u32 gMapObjectPic_FatMan_5[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/5.4bpp");
-const u32 gMapObjectPic_FatMan_6[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/6.4bpp");
-const u32 gMapObjectPic_FatMan_7[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/7.4bpp");
-const u32 gMapObjectPic_FatMan_8[] = INCBIN_U32("graphics/map_objects/pics/people/fat_man/8.4bpp");
-const u32 gMapObjectPic_Woman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/0.4bpp");
-const u32 gMapObjectPic_Woman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/1.4bpp");
-const u32 gMapObjectPic_Woman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/2.4bpp");
-const u32 gMapObjectPic_Woman2_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/3.4bpp");
-const u32 gMapObjectPic_Woman2_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/4.4bpp");
-const u32 gMapObjectPic_Woman2_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/5.4bpp");
-const u32 gMapObjectPic_Woman2_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/6.4bpp");
-const u32 gMapObjectPic_Woman2_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/7.4bpp");
-const u32 gMapObjectPic_Woman2_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_2/8.4bpp");
-const u32 gMapObjectPic_Man1_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/0.4bpp");
-const u32 gMapObjectPic_Man1_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/1.4bpp");
-const u32 gMapObjectPic_Man1_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/2.4bpp");
-const u32 gMapObjectPic_Man1_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/3.4bpp");
-const u32 gMapObjectPic_Man1_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/4.4bpp");
-const u32 gMapObjectPic_Man1_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/5.4bpp");
-const u32 gMapObjectPic_Man1_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/6.4bpp");
-const u32 gMapObjectPic_Man1_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/7.4bpp");
-const u32 gMapObjectPic_Man1_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_1/8.4bpp");
-const u32 gMapObjectPic_Woman3_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/0.4bpp");
-const u32 gMapObjectPic_Woman3_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/1.4bpp");
-const u32 gMapObjectPic_Woman3_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/2.4bpp");
-const u32 gMapObjectPic_Woman3_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/3.4bpp");
-const u32 gMapObjectPic_Woman3_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/4.4bpp");
-const u32 gMapObjectPic_Woman3_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/5.4bpp");
-const u32 gMapObjectPic_Woman3_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/6.4bpp");
-const u32 gMapObjectPic_Woman3_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/7.4bpp");
-const u32 gMapObjectPic_Woman3_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_3/8.4bpp");
-const u32 gMapObjectPic_OldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/0.4bpp");
-const u32 gMapObjectPic_OldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/1.4bpp");
-const u32 gMapObjectPic_OldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/2.4bpp");
-const u32 gMapObjectPic_OldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/3.4bpp");
-const u32 gMapObjectPic_OldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/4.4bpp");
-const u32 gMapObjectPic_OldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/5.4bpp");
-const u32 gMapObjectPic_OldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/6.4bpp");
-const u32 gMapObjectPic_OldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/7.4bpp");
-const u32 gMapObjectPic_OldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_1/8.4bpp");
-const u32 gMapObjectPic_OldWoman1_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/0.4bpp");
-const u32 gMapObjectPic_OldWoman1_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/1.4bpp");
-const u32 gMapObjectPic_OldWoman1_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/2.4bpp");
-const u32 gMapObjectPic_OldWoman1_3[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/3.4bpp");
-const u32 gMapObjectPic_OldWoman1_4[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/4.4bpp");
-const u32 gMapObjectPic_OldWoman1_5[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/5.4bpp");
-const u32 gMapObjectPic_OldWoman1_6[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/6.4bpp");
-const u32 gMapObjectPic_OldWoman1_7[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/7.4bpp");
-const u32 gMapObjectPic_OldWoman1_8[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_1/8.4bpp");
-const u32 gMapObjectPic_Man2_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/0.4bpp");
-const u32 gMapObjectPic_Man2_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/1.4bpp");
-const u32 gMapObjectPic_Man2_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/2.4bpp");
-const u32 gMapObjectPic_Man2_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/3.4bpp");
-const u32 gMapObjectPic_Man2_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/4.4bpp");
-const u32 gMapObjectPic_Man2_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/5.4bpp");
-const u32 gMapObjectPic_Man2_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/6.4bpp");
-const u32 gMapObjectPic_Man2_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/7.4bpp");
-const u32 gMapObjectPic_Man2_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_2/8.4bpp");
-const u32 gMapObjectPic_Woman4_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/0.4bpp");
-const u32 gMapObjectPic_Woman4_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/1.4bpp");
-const u32 gMapObjectPic_Woman4_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/2.4bpp");
-const u32 gMapObjectPic_Woman4_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/3.4bpp");
-const u32 gMapObjectPic_Woman4_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/4.4bpp");
-const u32 gMapObjectPic_Woman4_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/5.4bpp");
-const u32 gMapObjectPic_Woman4_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/6.4bpp");
-const u32 gMapObjectPic_Woman4_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/7.4bpp");
-const u32 gMapObjectPic_Woman4_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_4/8.4bpp");
-const u32 gMapObjectPic_Man3_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/0.4bpp");
-const u32 gMapObjectPic_Man3_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/1.4bpp");
-const u32 gMapObjectPic_Man3_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/2.4bpp");
-const u32 gMapObjectPic_Man3_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/3.4bpp");
-const u32 gMapObjectPic_Man3_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/4.4bpp");
-const u32 gMapObjectPic_Man3_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/5.4bpp");
-const u32 gMapObjectPic_Man3_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/6.4bpp");
-const u32 gMapObjectPic_Man3_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/7.4bpp");
-const u32 gMapObjectPic_Man3_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_3/8.4bpp");
-const u32 gMapObjectPic_Woman5_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/0.4bpp");
-const u32 gMapObjectPic_Woman5_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/1.4bpp");
-const u32 gMapObjectPic_Woman5_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/2.4bpp");
-const u32 gMapObjectPic_Woman5_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/3.4bpp");
-const u32 gMapObjectPic_Woman5_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/4.4bpp");
-const u32 gMapObjectPic_Woman5_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/5.4bpp");
-const u32 gMapObjectPic_Woman5_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/6.4bpp");
-const u32 gMapObjectPic_Woman5_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/7.4bpp");
-const u32 gMapObjectPic_Woman5_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_5/8.4bpp");
-const u32 gMapObjectPic_Cook_0[] = INCBIN_U32("graphics/map_objects/pics/people/cook/0.4bpp");
-const u32 gMapObjectPic_Cook_1[] = INCBIN_U32("graphics/map_objects/pics/people/cook/1.4bpp");
-const u32 gMapObjectPic_Cook_2[] = INCBIN_U32("graphics/map_objects/pics/people/cook/2.4bpp");
-const u32 gMapObjectPic_Woman6_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/0.4bpp");
-const u32 gMapObjectPic_Woman6_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/1.4bpp");
-const u32 gMapObjectPic_Woman6_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/2.4bpp");
-const u32 gMapObjectPic_Woman6_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/3.4bpp");
-const u32 gMapObjectPic_Woman6_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/4.4bpp");
-const u32 gMapObjectPic_Woman6_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/5.4bpp");
-const u32 gMapObjectPic_Woman6_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/6.4bpp");
-const u32 gMapObjectPic_Woman6_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/7.4bpp");
-const u32 gMapObjectPic_Woman6_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_6/8.4bpp");
-const u32 gMapObjectPic_OldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/0.4bpp");
-const u32 gMapObjectPic_OldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/1.4bpp");
-const u32 gMapObjectPic_OldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_man_2/2.4bpp");
-const u32 gMapObjectPic_OldWoman2_0[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/0.4bpp");
-const u32 gMapObjectPic_OldWoman2_1[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/1.4bpp");
-const u32 gMapObjectPic_OldWoman2_2[] = INCBIN_U32("graphics/map_objects/pics/people/old_woman_2/2.4bpp");
-const u32 gMapObjectPic_Camper_0[] = INCBIN_U32("graphics/map_objects/pics/people/camper/0.4bpp");
-const u32 gMapObjectPic_Camper_1[] = INCBIN_U32("graphics/map_objects/pics/people/camper/1.4bpp");
-const u32 gMapObjectPic_Camper_2[] = INCBIN_U32("graphics/map_objects/pics/people/camper/2.4bpp");
-const u32 gMapObjectPic_Camper_3[] = INCBIN_U32("graphics/map_objects/pics/people/camper/3.4bpp");
-const u32 gMapObjectPic_Camper_4[] = INCBIN_U32("graphics/map_objects/pics/people/camper/4.4bpp");
-const u32 gMapObjectPic_Camper_5[] = INCBIN_U32("graphics/map_objects/pics/people/camper/5.4bpp");
-const u32 gMapObjectPic_Camper_6[] = INCBIN_U32("graphics/map_objects/pics/people/camper/6.4bpp");
-const u32 gMapObjectPic_Camper_7[] = INCBIN_U32("graphics/map_objects/pics/people/camper/7.4bpp");
-const u32 gMapObjectPic_Camper_8[] = INCBIN_U32("graphics/map_objects/pics/people/camper/8.4bpp");
-const u32 gMapObjectPic_Picnicker_0[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/0.4bpp");
-const u32 gMapObjectPic_Picnicker_1[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/1.4bpp");
-const u32 gMapObjectPic_Picnicker_2[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/2.4bpp");
-const u32 gMapObjectPic_Picnicker_3[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/3.4bpp");
-const u32 gMapObjectPic_Picnicker_4[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/4.4bpp");
-const u32 gMapObjectPic_Picnicker_5[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/5.4bpp");
-const u32 gMapObjectPic_Picnicker_6[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/6.4bpp");
-const u32 gMapObjectPic_Picnicker_7[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/7.4bpp");
-const u32 gMapObjectPic_Picnicker_8[] = INCBIN_U32("graphics/map_objects/pics/people/picnicker/8.4bpp");
-const u32 gMapObjectPic_Man4_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/0.4bpp");
-const u32 gMapObjectPic_Man4_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/1.4bpp");
-const u32 gMapObjectPic_Man4_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/2.4bpp");
-const u32 gMapObjectPic_Man4_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/3.4bpp");
-const u32 gMapObjectPic_Man4_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/4.4bpp");
-const u32 gMapObjectPic_Man4_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/5.4bpp");
-const u32 gMapObjectPic_Man4_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/6.4bpp");
-const u32 gMapObjectPic_Man4_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/7.4bpp");
-const u32 gMapObjectPic_Man4_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_4/8.4bpp");
-const u32 gMapObjectPic_Woman7_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/0.4bpp");
-const u32 gMapObjectPic_Woman7_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/1.4bpp");
-const u32 gMapObjectPic_Woman7_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/2.4bpp");
-const u32 gMapObjectPic_Woman7_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/3.4bpp");
-const u32 gMapObjectPic_Woman7_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/4.4bpp");
-const u32 gMapObjectPic_Woman7_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/5.4bpp");
-const u32 gMapObjectPic_Woman7_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/6.4bpp");
-const u32 gMapObjectPic_Woman7_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/7.4bpp");
-const u32 gMapObjectPic_Woman7_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_7/8.4bpp");
-const u32 gMapObjectPic_Youngster_0[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/0.4bpp");
-const u32 gMapObjectPic_Youngster_1[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/1.4bpp");
-const u32 gMapObjectPic_Youngster_2[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/2.4bpp");
-const u32 gMapObjectPic_Youngster_3[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/3.4bpp");
-const u32 gMapObjectPic_Youngster_4[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/4.4bpp");
-const u32 gMapObjectPic_Youngster_5[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/5.4bpp");
-const u32 gMapObjectPic_Youngster_6[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/6.4bpp");
-const u32 gMapObjectPic_Youngster_7[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/7.4bpp");
-const u32 gMapObjectPic_Youngster_8[] = INCBIN_U32("graphics/map_objects/pics/people/youngster/8.4bpp");
-const u32 gMapObjectPic_BugCatcher_0[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/0.4bpp");
-const u32 gMapObjectPic_BugCatcher_1[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/1.4bpp");
-const u32 gMapObjectPic_BugCatcher_2[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/2.4bpp");
-const u32 gMapObjectPic_BugCatcher_3[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/3.4bpp");
-const u32 gMapObjectPic_BugCatcher_4[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/4.4bpp");
-const u32 gMapObjectPic_BugCatcher_5[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/5.4bpp");
-const u32 gMapObjectPic_BugCatcher_6[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/6.4bpp");
-const u32 gMapObjectPic_BugCatcher_7[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/7.4bpp");
-const u32 gMapObjectPic_BugCatcher_8[] = INCBIN_U32("graphics/map_objects/pics/people/bug_catcher/8.4bpp");
-const u32 gMapObjectPic_PsychicM_0[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/0.4bpp");
-const u32 gMapObjectPic_PsychicM_1[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/1.4bpp");
-const u32 gMapObjectPic_PsychicM_2[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/2.4bpp");
-const u32 gMapObjectPic_PsychicM_3[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/3.4bpp");
-const u32 gMapObjectPic_PsychicM_4[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/4.4bpp");
-const u32 gMapObjectPic_PsychicM_5[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/5.4bpp");
-const u32 gMapObjectPic_PsychicM_6[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/6.4bpp");
-const u32 gMapObjectPic_PsychicM_7[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/7.4bpp");
-const u32 gMapObjectPic_PsychicM_8[] = INCBIN_U32("graphics/map_objects/pics/people/psychic_m/8.4bpp");
-const u32 gMapObjectPic_SchoolKidM_0[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/0.4bpp");
-const u32 gMapObjectPic_SchoolKidM_1[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/1.4bpp");
-const u32 gMapObjectPic_SchoolKidM_2[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/2.4bpp");
-const u32 gMapObjectPic_SchoolKidM_3[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/3.4bpp");
-const u32 gMapObjectPic_SchoolKidM_4[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/4.4bpp");
-const u32 gMapObjectPic_SchoolKidM_5[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/5.4bpp");
-const u32 gMapObjectPic_SchoolKidM_6[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/6.4bpp");
-const u32 gMapObjectPic_SchoolKidM_7[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/7.4bpp");
-const u32 gMapObjectPic_SchoolKidM_8[] = INCBIN_U32("graphics/map_objects/pics/people/school_kid_m/8.4bpp");
-const u32 gMapObjectPic_Maniac_0[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/0.4bpp");
-const u32 gMapObjectPic_Maniac_1[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/1.4bpp");
-const u32 gMapObjectPic_Maniac_2[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/2.4bpp");
-const u32 gMapObjectPic_Maniac_3[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/3.4bpp");
-const u32 gMapObjectPic_Maniac_4[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/4.4bpp");
-const u32 gMapObjectPic_Maniac_5[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/5.4bpp");
-const u32 gMapObjectPic_Maniac_6[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/6.4bpp");
-const u32 gMapObjectPic_Maniac_7[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/7.4bpp");
-const u32 gMapObjectPic_Maniac_8[] = INCBIN_U32("graphics/map_objects/pics/people/maniac/8.4bpp");
-const u32 gMapObjectPic_HexManiac_0[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/0.4bpp");
-const u32 gMapObjectPic_HexManiac_1[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/1.4bpp");
-const u32 gMapObjectPic_HexManiac_2[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/2.4bpp");
-const u32 gMapObjectPic_HexManiac_3[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/3.4bpp");
-const u32 gMapObjectPic_HexManiac_4[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/4.4bpp");
-const u32 gMapObjectPic_HexManiac_5[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/5.4bpp");
-const u32 gMapObjectPic_HexManiac_6[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/6.4bpp");
-const u32 gMapObjectPic_HexManiac_7[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/7.4bpp");
-const u32 gMapObjectPic_HexManiac_8[] = INCBIN_U32("graphics/map_objects/pics/people/hex_maniac/8.4bpp");
-const u32 gMapObjectPic_Woman8_0[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/0.4bpp");
-const u32 gMapObjectPic_Woman8_1[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/1.4bpp");
-const u32 gMapObjectPic_Woman8_2[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/2.4bpp");
-const u32 gMapObjectPic_Woman8_3[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/3.4bpp");
-const u32 gMapObjectPic_Woman8_4[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/4.4bpp");
-const u32 gMapObjectPic_Woman8_5[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/5.4bpp");
-const u32 gMapObjectPic_Woman8_6[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/6.4bpp");
-const u32 gMapObjectPic_Woman8_7[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/7.4bpp");
-const u32 gMapObjectPic_Woman8_8[] = INCBIN_U32("graphics/map_objects/pics/people/woman_8/8.4bpp");
-const u32 gMapObjectPic_SwimmerM_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/0.4bpp");
-const u32 gMapObjectPic_SwimmerM_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/1.4bpp");
-const u32 gMapObjectPic_SwimmerM_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/2.4bpp");
-const u32 gMapObjectPic_SwimmerM_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/3.4bpp");
-const u32 gMapObjectPic_SwimmerM_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/4.4bpp");
-const u32 gMapObjectPic_SwimmerM_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/5.4bpp");
-const u32 gMapObjectPic_SwimmerM_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/6.4bpp");
-const u32 gMapObjectPic_SwimmerM_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/7.4bpp");
-const u32 gMapObjectPic_SwimmerM_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_m/8.4bpp");
-const u32 gMapObjectPic_SwimmerF_0[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/0.4bpp");
-const u32 gMapObjectPic_SwimmerF_1[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/1.4bpp");
-const u32 gMapObjectPic_SwimmerF_2[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/2.4bpp");
-const u32 gMapObjectPic_SwimmerF_3[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/3.4bpp");
-const u32 gMapObjectPic_SwimmerF_4[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/4.4bpp");
-const u32 gMapObjectPic_SwimmerF_5[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/5.4bpp");
-const u32 gMapObjectPic_SwimmerF_6[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/6.4bpp");
-const u32 gMapObjectPic_SwimmerF_7[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/7.4bpp");
-const u32 gMapObjectPic_SwimmerF_8[] = INCBIN_U32("graphics/map_objects/pics/people/swimmer_f/8.4bpp");
-const u32 gMapObjectPic_BlackBelt_0[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/0.4bpp");
-const u32 gMapObjectPic_BlackBelt_1[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/1.4bpp");
-const u32 gMapObjectPic_BlackBelt_2[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/2.4bpp");
-const u32 gMapObjectPic_BlackBelt_3[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/3.4bpp");
-const u32 gMapObjectPic_BlackBelt_4[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/4.4bpp");
-const u32 gMapObjectPic_BlackBelt_5[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/5.4bpp");
-const u32 gMapObjectPic_BlackBelt_6[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/6.4bpp");
-const u32 gMapObjectPic_BlackBelt_7[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/7.4bpp");
-const u32 gMapObjectPic_BlackBelt_8[] = INCBIN_U32("graphics/map_objects/pics/people/black_belt/8.4bpp");
-const u32 gMapObjectPic_Beauty_0[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/0.4bpp");
-const u32 gMapObjectPic_Beauty_1[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/1.4bpp");
-const u32 gMapObjectPic_Beauty_2[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/2.4bpp");
-const u32 gMapObjectPic_Beauty_3[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/3.4bpp");
-const u32 gMapObjectPic_Beauty_4[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/4.4bpp");
-const u32 gMapObjectPic_Beauty_5[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/5.4bpp");
-const u32 gMapObjectPic_Beauty_6[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/6.4bpp");
-const u32 gMapObjectPic_Beauty_7[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/7.4bpp");
-const u32 gMapObjectPic_Beauty_8[] = INCBIN_U32("graphics/map_objects/pics/people/beauty/8.4bpp");
-const u32 gMapObjectPic_Scientist1_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/0.4bpp");
-const u32 gMapObjectPic_Scientist1_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/1.4bpp");
-const u32 gMapObjectPic_Scientist1_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/2.4bpp");
-const u32 gMapObjectPic_Scientist1_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/3.4bpp");
-const u32 gMapObjectPic_Scientist1_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/4.4bpp");
-const u32 gMapObjectPic_Scientist1_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/5.4bpp");
-const u32 gMapObjectPic_Scientist1_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/6.4bpp");
-const u32 gMapObjectPic_Scientist1_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/7.4bpp");
-const u32 gMapObjectPic_Scientist1_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_1/8.4bpp");
-const u32 gMapObjectPic_Lass_0[] = INCBIN_U32("graphics/map_objects/pics/people/lass/0.4bpp");
-const u32 gMapObjectPic_Lass_1[] = INCBIN_U32("graphics/map_objects/pics/people/lass/1.4bpp");
-const u32 gMapObjectPic_Lass_2[] = INCBIN_U32("graphics/map_objects/pics/people/lass/2.4bpp");
-const u32 gMapObjectPic_Lass_3[] = INCBIN_U32("graphics/map_objects/pics/people/lass/3.4bpp");
-const u32 gMapObjectPic_Lass_4[] = INCBIN_U32("graphics/map_objects/pics/people/lass/4.4bpp");
-const u32 gMapObjectPic_Lass_5[] = INCBIN_U32("graphics/map_objects/pics/people/lass/5.4bpp");
-const u32 gMapObjectPic_Lass_6[] = INCBIN_U32("graphics/map_objects/pics/people/lass/6.4bpp");
-const u32 gMapObjectPic_Lass_7[] = INCBIN_U32("graphics/map_objects/pics/people/lass/7.4bpp");
-const u32 gMapObjectPic_Lass_8[] = INCBIN_U32("graphics/map_objects/pics/people/lass/8.4bpp");
-const u32 gMapObjectPic_Gentleman_0[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/0.4bpp");
-const u32 gMapObjectPic_Gentleman_1[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/1.4bpp");
-const u32 gMapObjectPic_Gentleman_2[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/2.4bpp");
-const u32 gMapObjectPic_Gentleman_3[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/3.4bpp");
-const u32 gMapObjectPic_Gentleman_4[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/4.4bpp");
-const u32 gMapObjectPic_Gentleman_5[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/5.4bpp");
-const u32 gMapObjectPic_Gentleman_6[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/6.4bpp");
-const u32 gMapObjectPic_Gentleman_7[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/7.4bpp");
-const u32 gMapObjectPic_Gentleman_8[] = INCBIN_U32("graphics/map_objects/pics/people/gentleman/8.4bpp");
-const u32 gMapObjectPic_Sailor_0[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/0.4bpp");
-const u32 gMapObjectPic_Sailor_1[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/1.4bpp");
-const u32 gMapObjectPic_Sailor_2[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/2.4bpp");
-const u32 gMapObjectPic_Sailor_3[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/3.4bpp");
-const u32 gMapObjectPic_Sailor_4[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/4.4bpp");
-const u32 gMapObjectPic_Sailor_5[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/5.4bpp");
-const u32 gMapObjectPic_Sailor_6[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/6.4bpp");
-const u32 gMapObjectPic_Sailor_7[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/7.4bpp");
-const u32 gMapObjectPic_Sailor_8[] = INCBIN_U32("graphics/map_objects/pics/people/sailor/8.4bpp");
-const u32 gMapObjectPic_Fisherman_0[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/0.4bpp");
-const u32 gMapObjectPic_Fisherman_1[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/1.4bpp");
-const u32 gMapObjectPic_Fisherman_2[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/2.4bpp");
-const u32 gMapObjectPic_Fisherman_3[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/3.4bpp");
-const u32 gMapObjectPic_Fisherman_4[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/4.4bpp");
-const u32 gMapObjectPic_Fisherman_5[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/5.4bpp");
-const u32 gMapObjectPic_Fisherman_6[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/6.4bpp");
-const u32 gMapObjectPic_Fisherman_7[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/7.4bpp");
-const u32 gMapObjectPic_Fisherman_8[] = INCBIN_U32("graphics/map_objects/pics/people/fisherman/8.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/0.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/1.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/2.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/3.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/4.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/5.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/6.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/7.4bpp");
-const u32 gMapObjectPic_RunningTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_m/8.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/0.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/1.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/2.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/3.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/4.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/5.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/6.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/7.4bpp");
-const u32 gMapObjectPic_RunningTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/running_triathlete_f/8.4bpp");
-const u32 gMapObjectPic_TuberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/0.4bpp");
-const u32 gMapObjectPic_TuberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/1.4bpp");
-const u32 gMapObjectPic_TuberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/2.4bpp");
-const u32 gMapObjectPic_TuberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/3.4bpp");
-const u32 gMapObjectPic_TuberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/4.4bpp");
-const u32 gMapObjectPic_TuberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/5.4bpp");
-const u32 gMapObjectPic_TuberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/6.4bpp");
-const u32 gMapObjectPic_TuberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/7.4bpp");
-const u32 gMapObjectPic_TuberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_f/8.4bpp");
-const u32 gMapObjectPic_TuberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/0.4bpp");
-const u32 gMapObjectPic_TuberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/1.4bpp");
-const u32 gMapObjectPic_TuberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/2.4bpp");
-const u32 gMapObjectPic_TuberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/3.4bpp");
-const u32 gMapObjectPic_TuberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/4.4bpp");
-const u32 gMapObjectPic_TuberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/5.4bpp");
-const u32 gMapObjectPic_TuberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/6.4bpp");
-const u32 gMapObjectPic_TuberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/7.4bpp");
-const u32 gMapObjectPic_TuberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m/8.4bpp");
-const u32 gMapObjectPic_Hiker_0[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/0.4bpp");
-const u32 gMapObjectPic_Hiker_1[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/1.4bpp");
-const u32 gMapObjectPic_Hiker_2[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/2.4bpp");
-const u32 gMapObjectPic_Hiker_3[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/3.4bpp");
-const u32 gMapObjectPic_Hiker_4[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/4.4bpp");
-const u32 gMapObjectPic_Hiker_5[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/5.4bpp");
-const u32 gMapObjectPic_Hiker_6[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/6.4bpp");
-const u32 gMapObjectPic_Hiker_7[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/7.4bpp");
-const u32 gMapObjectPic_Hiker_8[] = INCBIN_U32("graphics/map_objects/pics/people/hiker/8.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteM_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_0[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_1[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_2[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_3[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_4[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_5[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_6[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_7[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp");
-const u32 gMapObjectPic_CyclingTriathleteF_8[] = INCBIN_U32("graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp");
-const u32 gMapObjectPic_Man5_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/0.4bpp");
-const u32 gMapObjectPic_Man5_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/1.4bpp");
-const u32 gMapObjectPic_Man5_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/2.4bpp");
-const u32 gMapObjectPic_Man5_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/3.4bpp");
-const u32 gMapObjectPic_Man5_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/4.4bpp");
-const u32 gMapObjectPic_Man5_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/5.4bpp");
-const u32 gMapObjectPic_Man5_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/6.4bpp");
-const u32 gMapObjectPic_Man5_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/7.4bpp");
-const u32 gMapObjectPic_Man5_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_5/8.4bpp");
-const u32 gMapObjectPic_Man6_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/0.4bpp");
-const u32 gMapObjectPic_Man6_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/1.4bpp");
-const u32 gMapObjectPic_Man6_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/2.4bpp");
-const u32 gMapObjectPic_Man6_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/3.4bpp");
-const u32 gMapObjectPic_Man6_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/4.4bpp");
-const u32 gMapObjectPic_Man6_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/5.4bpp");
-const u32 gMapObjectPic_Man6_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/6.4bpp");
-const u32 gMapObjectPic_Man6_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/7.4bpp");
-const u32 gMapObjectPic_Man6_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_6/8.4bpp");
-const u32 gMapObjectPic_Nurse_0[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/0.4bpp");
-const u32 gMapObjectPic_Nurse_1[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/1.4bpp");
-const u32 gMapObjectPic_Nurse_2[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/2.4bpp");
-const u32 gMapObjectPic_Nurse_3[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/3.4bpp");
-const u32 gMapObjectPic_Nurse_4[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/4.4bpp");
-const u32 gMapObjectPic_Nurse_5[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/5.4bpp");
-const u32 gMapObjectPic_Nurse_6[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/6.4bpp");
-const u32 gMapObjectPic_Nurse_7[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/7.4bpp");
-const u32 gMapObjectPic_Nurse_8[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/8.4bpp");
-const u32 gMapObjectPic_Nurse_9[] = INCBIN_U32("graphics/map_objects/pics/people/nurse/9.4bpp");
-const u32 gMapObjectPic_ItemBall[] = INCBIN_U32("graphics/map_objects/pics/misc/item_ball.4bpp");
-const u32 gMapObjectPic_ProfBirch_0[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/0.4bpp");
-const u32 gMapObjectPic_ProfBirch_1[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/1.4bpp");
-const u32 gMapObjectPic_ProfBirch_2[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/2.4bpp");
-const u32 gMapObjectPic_ProfBirch_3[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/3.4bpp");
-const u32 gMapObjectPic_ProfBirch_4[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/4.4bpp");
-const u32 gMapObjectPic_ProfBirch_5[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/5.4bpp");
-const u32 gMapObjectPic_ProfBirch_6[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/6.4bpp");
-const u32 gMapObjectPic_ProfBirch_7[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/7.4bpp");
-const u32 gMapObjectPic_ProfBirch_8[] = INCBIN_U32("graphics/map_objects/pics/people/prof_birch/8.4bpp");
-const u32 gMapObjectPic_ReporterM_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/0.4bpp");
-const u32 gMapObjectPic_ReporterM_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/1.4bpp");
-const u32 gMapObjectPic_ReporterM_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/2.4bpp");
-const u32 gMapObjectPic_ReporterM_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/3.4bpp");
-const u32 gMapObjectPic_ReporterM_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/4.4bpp");
-const u32 gMapObjectPic_ReporterM_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/5.4bpp");
-const u32 gMapObjectPic_ReporterM_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/6.4bpp");
-const u32 gMapObjectPic_ReporterM_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/7.4bpp");
-const u32 gMapObjectPic_ReporterM_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_m/8.4bpp");
-const u32 gMapObjectPic_ReporterF_0[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/0.4bpp");
-const u32 gMapObjectPic_ReporterF_1[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/1.4bpp");
-const u32 gMapObjectPic_ReporterF_2[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/2.4bpp");
-const u32 gMapObjectPic_ReporterF_3[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/3.4bpp");
-const u32 gMapObjectPic_ReporterF_4[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/4.4bpp");
-const u32 gMapObjectPic_ReporterF_5[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/5.4bpp");
-const u32 gMapObjectPic_ReporterF_6[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/6.4bpp");
-const u32 gMapObjectPic_ReporterF_7[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/7.4bpp");
-const u32 gMapObjectPic_ReporterF_8[] = INCBIN_U32("graphics/map_objects/pics/people/reporter_f/8.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan1_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_0[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_1[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_2[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_3[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_4[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_5[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_6[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_7[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp");
-const u32 gMapObjectPic_MauvilleOldMan2_8[] = INCBIN_U32("graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp");
-const u32 gMapObjectPic_MartEmployee_0[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/0.4bpp");
-const u32 gMapObjectPic_MartEmployee_1[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/1.4bpp");
-const u32 gMapObjectPic_MartEmployee_2[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/2.4bpp");
-const u32 gMapObjectPic_MartEmployee_3[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/3.4bpp");
-const u32 gMapObjectPic_MartEmployee_4[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/4.4bpp");
-const u32 gMapObjectPic_MartEmployee_5[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/5.4bpp");
-const u32 gMapObjectPic_MartEmployee_6[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/6.4bpp");
-const u32 gMapObjectPic_MartEmployee_7[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/7.4bpp");
-const u32 gMapObjectPic_MartEmployee_8[] = INCBIN_U32("graphics/map_objects/pics/people/mart_employee/8.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp");
-const u32 gMapObjectPic_RooftopSaleWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp");
-const u32 gMapObjectPic_Teala_0[] = INCBIN_U32("graphics/map_objects/pics/people/teala/0.4bpp");
-const u32 gMapObjectPic_Teala_1[] = INCBIN_U32("graphics/map_objects/pics/people/teala/1.4bpp");
-const u32 gMapObjectPic_Teala_2[] = INCBIN_U32("graphics/map_objects/pics/people/teala/2.4bpp");
-const u32 gMapObjectPic_Teala_3[] = INCBIN_U32("graphics/map_objects/pics/people/teala/3.4bpp");
-const u32 gMapObjectPic_Teala_4[] = INCBIN_U32("graphics/map_objects/pics/people/teala/4.4bpp");
-const u32 gMapObjectPic_Teala_5[] = INCBIN_U32("graphics/map_objects/pics/people/teala/5.4bpp");
-const u32 gMapObjectPic_Teala_6[] = INCBIN_U32("graphics/map_objects/pics/people/teala/6.4bpp");
-const u32 gMapObjectPic_Teala_7[] = INCBIN_U32("graphics/map_objects/pics/people/teala/7.4bpp");
-const u32 gMapObjectPic_Teala_8[] = INCBIN_U32("graphics/map_objects/pics/people/teala/8.4bpp");
-const u32 gMapObjectPic_Artist_0[] = INCBIN_U32("graphics/map_objects/pics/people/artist/0.4bpp");
-const u32 gMapObjectPic_Artist_1[] = INCBIN_U32("graphics/map_objects/pics/people/artist/1.4bpp");
-const u32 gMapObjectPic_Artist_2[] = INCBIN_U32("graphics/map_objects/pics/people/artist/2.4bpp");
-const u32 gMapObjectPic_Artist_3[] = INCBIN_U32("graphics/map_objects/pics/people/artist/3.4bpp");
-const u32 gMapObjectPic_Artist_4[] = INCBIN_U32("graphics/map_objects/pics/people/artist/4.4bpp");
-const u32 gMapObjectPic_Artist_5[] = INCBIN_U32("graphics/map_objects/pics/people/artist/5.4bpp");
-const u32 gMapObjectPic_Artist_6[] = INCBIN_U32("graphics/map_objects/pics/people/artist/6.4bpp");
-const u32 gMapObjectPic_Artist_7[] = INCBIN_U32("graphics/map_objects/pics/people/artist/7.4bpp");
-const u32 gMapObjectPic_Artist_8[] = INCBIN_U32("graphics/map_objects/pics/people/artist/8.4bpp");
-const u32 gMapObjectPic_Cameraman_0[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/0.4bpp");
-const u32 gMapObjectPic_Cameraman_1[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/1.4bpp");
-const u32 gMapObjectPic_Cameraman_2[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/2.4bpp");
-const u32 gMapObjectPic_Cameraman_3[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/3.4bpp");
-const u32 gMapObjectPic_Cameraman_4[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/4.4bpp");
-const u32 gMapObjectPic_Cameraman_5[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/5.4bpp");
-const u32 gMapObjectPic_Cameraman_6[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/6.4bpp");
-const u32 gMapObjectPic_Cameraman_7[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/7.4bpp");
-const u32 gMapObjectPic_Cameraman_8[] = INCBIN_U32("graphics/map_objects/pics/people/cameraman/8.4bpp");
-const u32 gMapObjectPic_Scientist2_0[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/0.4bpp");
-const u32 gMapObjectPic_Scientist2_1[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/1.4bpp");
-const u32 gMapObjectPic_Scientist2_2[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/2.4bpp");
-const u32 gMapObjectPic_Scientist2_3[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/3.4bpp");
-const u32 gMapObjectPic_Scientist2_4[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/4.4bpp");
-const u32 gMapObjectPic_Scientist2_5[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/5.4bpp");
-const u32 gMapObjectPic_Scientist2_6[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/6.4bpp");
-const u32 gMapObjectPic_Scientist2_7[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/7.4bpp");
-const u32 gMapObjectPic_Scientist2_8[] = INCBIN_U32("graphics/map_objects/pics/people/scientist_2/8.4bpp");
-const u32 gMapObjectPic_Man7_0[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/0.4bpp");
-const u32 gMapObjectPic_Man7_1[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/1.4bpp");
-const u32 gMapObjectPic_Man7_2[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/2.4bpp");
-const u32 gMapObjectPic_Man7_3[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/3.4bpp");
-const u32 gMapObjectPic_Man7_4[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/4.4bpp");
-const u32 gMapObjectPic_Man7_5[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/5.4bpp");
-const u32 gMapObjectPic_Man7_6[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/6.4bpp");
-const u32 gMapObjectPic_Man7_7[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/7.4bpp");
-const u32 gMapObjectPic_Man7_8[] = INCBIN_U32("graphics/map_objects/pics/people/man_7/8.4bpp");
-const u32 gMapObjectPic_AquaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/0.4bpp");
-const u32 gMapObjectPic_AquaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/1.4bpp");
-const u32 gMapObjectPic_AquaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/2.4bpp");
-const u32 gMapObjectPic_AquaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/3.4bpp");
-const u32 gMapObjectPic_AquaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/4.4bpp");
-const u32 gMapObjectPic_AquaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/5.4bpp");
-const u32 gMapObjectPic_AquaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/6.4bpp");
-const u32 gMapObjectPic_AquaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/7.4bpp");
-const u32 gMapObjectPic_AquaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_m/8.4bpp");
-const u32 gMapObjectPic_AquaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/0.4bpp");
-const u32 gMapObjectPic_AquaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/1.4bpp");
-const u32 gMapObjectPic_AquaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/2.4bpp");
-const u32 gMapObjectPic_AquaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/3.4bpp");
-const u32 gMapObjectPic_AquaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/4.4bpp");
-const u32 gMapObjectPic_AquaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/5.4bpp");
-const u32 gMapObjectPic_AquaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/6.4bpp");
-const u32 gMapObjectPic_AquaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/7.4bpp");
-const u32 gMapObjectPic_AquaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/aqua_member_f/8.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/0.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/1.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/2.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/3.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/4.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/5.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/6.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/7.4bpp");
-const u32 gMapObjectPic_MagmaMemberM_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_m/8.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_0[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/0.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_1[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/1.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_2[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/2.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_3[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/3.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_4[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/4.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_5[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/5.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_6[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/6.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_7[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/7.4bpp");
-const u32 gMapObjectPic_MagmaMemberF_8[] = INCBIN_U32("graphics/map_objects/pics/people/magma_member_f/8.4bpp");
-const u32 gMapObjectPic_Sidney_0[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/0.4bpp");
-const u32 gMapObjectPic_Sidney_1[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/1.4bpp");
-const u32 gMapObjectPic_Sidney_2[] = INCBIN_U32("graphics/map_objects/pics/people/sidney/2.4bpp");
-const u32 gMapObjectPic_Phoebe_0[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/0.4bpp");
-const u32 gMapObjectPic_Phoebe_1[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/1.4bpp");
-const u32 gMapObjectPic_Phoebe_2[] = INCBIN_U32("graphics/map_objects/pics/people/phoebe/2.4bpp");
-const u32 gMapObjectPic_Glacia_0[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/0.4bpp");
-const u32 gMapObjectPic_Glacia_1[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/1.4bpp");
-const u32 gMapObjectPic_Glacia_2[] = INCBIN_U32("graphics/map_objects/pics/people/glacia/2.4bpp");
-const u32 gMapObjectPic_Drake_0[] = INCBIN_U32("graphics/map_objects/pics/people/drake/0.4bpp");
-const u32 gMapObjectPic_Drake_1[] = INCBIN_U32("graphics/map_objects/pics/people/drake/1.4bpp");
-const u32 gMapObjectPic_Drake_2[] = INCBIN_U32("graphics/map_objects/pics/people/drake/2.4bpp");
-const u32 gMapObjectPic_Roxanne_0[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/0.4bpp");
-const u32 gMapObjectPic_Roxanne_1[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/1.4bpp");
-const u32 gMapObjectPic_Roxanne_2[] = INCBIN_U32("graphics/map_objects/pics/people/roxanne/2.4bpp");
-const u32 gMapObjectPic_Brawly_0[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/0.4bpp");
-const u32 gMapObjectPic_Brawly_1[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/1.4bpp");
-const u32 gMapObjectPic_Brawly_2[] = INCBIN_U32("graphics/map_objects/pics/people/brawly/2.4bpp");
-const u32 gMapObjectPic_Wattson_0[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/0.4bpp");
-const u32 gMapObjectPic_Wattson_1[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/1.4bpp");
-const u32 gMapObjectPic_Wattson_2[] = INCBIN_U32("graphics/map_objects/pics/people/wattson/2.4bpp");
-const u32 gMapObjectPic_Flannery_0[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/0.4bpp");
-const u32 gMapObjectPic_Flannery_1[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/1.4bpp");
-const u32 gMapObjectPic_Flannery_2[] = INCBIN_U32("graphics/map_objects/pics/people/flannery/2.4bpp");
-const u32 gMapObjectPic_Norman_0[] = INCBIN_U32("graphics/map_objects/pics/people/norman/0.4bpp");
-const u32 gMapObjectPic_Norman_1[] = INCBIN_U32("graphics/map_objects/pics/people/norman/1.4bpp");
-const u32 gMapObjectPic_Norman_2[] = INCBIN_U32("graphics/map_objects/pics/people/norman/2.4bpp");
-const u32 gMapObjectPic_Norman_3[] = INCBIN_U32("graphics/map_objects/pics/people/norman/3.4bpp");
-const u32 gMapObjectPic_Norman_4[] = INCBIN_U32("graphics/map_objects/pics/people/norman/4.4bpp");
-const u32 gMapObjectPic_Norman_5[] = INCBIN_U32("graphics/map_objects/pics/people/norman/5.4bpp");
-const u32 gMapObjectPic_Norman_6[] = INCBIN_U32("graphics/map_objects/pics/people/norman/6.4bpp");
-const u32 gMapObjectPic_Norman_7[] = INCBIN_U32("graphics/map_objects/pics/people/norman/7.4bpp");
-const u32 gMapObjectPic_Norman_8[] = INCBIN_U32("graphics/map_objects/pics/people/norman/8.4bpp");
-const u32 gMapObjectPic_Winona_0[] = INCBIN_U32("graphics/map_objects/pics/people/winona/0.4bpp");
-const u32 gMapObjectPic_Winona_1[] = INCBIN_U32("graphics/map_objects/pics/people/winona/1.4bpp");
-const u32 gMapObjectPic_Winona_2[] = INCBIN_U32("graphics/map_objects/pics/people/winona/2.4bpp");
-const u32 gMapObjectPic_Liza_0[] = INCBIN_U32("graphics/map_objects/pics/people/liza/0.4bpp");
-const u32 gMapObjectPic_Liza_1[] = INCBIN_U32("graphics/map_objects/pics/people/liza/1.4bpp");
-const u32 gMapObjectPic_Liza_2[] = INCBIN_U32("graphics/map_objects/pics/people/liza/2.4bpp");
-const u32 gMapObjectPic_Tate_0[] = INCBIN_U32("graphics/map_objects/pics/people/tate/0.4bpp");
-const u32 gMapObjectPic_Tate_1[] = INCBIN_U32("graphics/map_objects/pics/people/tate/1.4bpp");
-const u32 gMapObjectPic_Tate_2[] = INCBIN_U32("graphics/map_objects/pics/people/tate/2.4bpp");
-const u32 gMapObjectPic_Wallace_0[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/0.4bpp");
-const u32 gMapObjectPic_Wallace_1[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/1.4bpp");
-const u32 gMapObjectPic_Wallace_2[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/2.4bpp");
-const u32 gMapObjectPic_Wallace_3[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/3.4bpp");
-const u32 gMapObjectPic_Wallace_4[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/4.4bpp");
-const u32 gMapObjectPic_Wallace_5[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/5.4bpp");
-const u32 gMapObjectPic_Wallace_6[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/6.4bpp");
-const u32 gMapObjectPic_Wallace_7[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/7.4bpp");
-const u32 gMapObjectPic_Wallace_8[] = INCBIN_U32("graphics/map_objects/pics/people/wallace/8.4bpp");
-const u32 gMapObjectPic_Steven_0[] = INCBIN_U32("graphics/map_objects/pics/people/steven/0.4bpp");
-const u32 gMapObjectPic_Steven_1[] = INCBIN_U32("graphics/map_objects/pics/people/steven/1.4bpp");
-const u32 gMapObjectPic_Steven_2[] = INCBIN_U32("graphics/map_objects/pics/people/steven/2.4bpp");
-const u32 gMapObjectPic_Steven_3[] = INCBIN_U32("graphics/map_objects/pics/people/steven/3.4bpp");
-const u32 gMapObjectPic_Steven_4[] = INCBIN_U32("graphics/map_objects/pics/people/steven/4.4bpp");
-const u32 gMapObjectPic_Steven_5[] = INCBIN_U32("graphics/map_objects/pics/people/steven/5.4bpp");
-const u32 gMapObjectPic_Steven_6[] = INCBIN_U32("graphics/map_objects/pics/people/steven/6.4bpp");
-const u32 gMapObjectPic_Steven_7[] = INCBIN_U32("graphics/map_objects/pics/people/steven/7.4bpp");
-const u32 gMapObjectPic_Steven_8[] = INCBIN_U32("graphics/map_objects/pics/people/steven/8.4bpp");
-const u32 gMapObjectPic_Wally_0[] = INCBIN_U32("graphics/map_objects/pics/people/wally/0.4bpp");
-const u32 gMapObjectPic_Wally_1[] = INCBIN_U32("graphics/map_objects/pics/people/wally/1.4bpp");
-const u32 gMapObjectPic_Wally_2[] = INCBIN_U32("graphics/map_objects/pics/people/wally/2.4bpp");
-const u32 gMapObjectPic_Wally_3[] = INCBIN_U32("graphics/map_objects/pics/people/wally/3.4bpp");
-const u32 gMapObjectPic_Wally_4[] = INCBIN_U32("graphics/map_objects/pics/people/wally/4.4bpp");
-const u32 gMapObjectPic_Wally_5[] = INCBIN_U32("graphics/map_objects/pics/people/wally/5.4bpp");
-const u32 gMapObjectPic_Wally_6[] = INCBIN_U32("graphics/map_objects/pics/people/wally/6.4bpp");
-const u32 gMapObjectPic_Wally_7[] = INCBIN_U32("graphics/map_objects/pics/people/wally/7.4bpp");
-const u32 gMapObjectPic_Wally_8[] = INCBIN_U32("graphics/map_objects/pics/people/wally/8.4bpp");
-const u32 gMapObjectPic_LittleBoy3_0[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/0.4bpp");
-const u32 gMapObjectPic_LittleBoy3_1[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/1.4bpp");
-const u32 gMapObjectPic_LittleBoy3_2[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/2.4bpp");
-const u32 gMapObjectPic_LittleBoy3_3[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/3.4bpp");
-const u32 gMapObjectPic_LittleBoy3_4[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/4.4bpp");
-const u32 gMapObjectPic_LittleBoy3_5[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/5.4bpp");
-const u32 gMapObjectPic_LittleBoy3_6[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/6.4bpp");
-const u32 gMapObjectPic_LittleBoy3_7[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/7.4bpp");
-const u32 gMapObjectPic_LittleBoy3_8[] = INCBIN_U32("graphics/map_objects/pics/people/little_boy_3/8.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_0[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_1[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_2[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_3[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_4[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_5[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_6[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_7[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp");
-const u32 gMapObjectPic_HotSpringsOldWoman_8[] = INCBIN_U32("graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp");
-const u32 gMapObjectPic_LatiasLatios_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/0.4bpp");
-const u32 gMapObjectPic_LatiasLatios_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/1.4bpp");
-const u32 gMapObjectPic_LatiasLatios_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/latias_latios/2.4bpp");
-const u32 gMapObjectPic_Boy5_0[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/0.4bpp");
-const u32 gMapObjectPic_Boy5_1[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/1.4bpp");
-const u32 gMapObjectPic_Boy5_2[] = INCBIN_U32("graphics/map_objects/pics/people/boy_5/2.4bpp");
-const u32 gMapObjectPic_ContestJudge_0[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/0.4bpp");
-const u32 gMapObjectPic_ContestJudge_1[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/1.4bpp");
-const u32 gMapObjectPic_ContestJudge_2[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/2.4bpp");
-const u32 gMapObjectPic_ContestJudge_3[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/3.4bpp");
-const u32 gMapObjectPic_ContestJudge_4[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/4.4bpp");
-const u32 gMapObjectPic_ContestJudge_5[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/5.4bpp");
-const u32 gMapObjectPic_ContestJudge_6[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/6.4bpp");
-const u32 gMapObjectPic_ContestJudge_7[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/7.4bpp");
-const u32 gMapObjectPic_ContestJudge_8[] = INCBIN_U32("graphics/map_objects/pics/people/contest_judge/8.4bpp");
-const u32 gMapObjectPic_Archie_0[] = INCBIN_U32("graphics/map_objects/pics/people/archie/0.4bpp");
-const u32 gMapObjectPic_Archie_1[] = INCBIN_U32("graphics/map_objects/pics/people/archie/1.4bpp");
-const u32 gMapObjectPic_Archie_2[] = INCBIN_U32("graphics/map_objects/pics/people/archie/2.4bpp");
-const u32 gMapObjectPic_Archie_3[] = INCBIN_U32("graphics/map_objects/pics/people/archie/3.4bpp");
-const u32 gMapObjectPic_Archie_4[] = INCBIN_U32("graphics/map_objects/pics/people/archie/4.4bpp");
-const u32 gMapObjectPic_Archie_5[] = INCBIN_U32("graphics/map_objects/pics/people/archie/5.4bpp");
-const u32 gMapObjectPic_Archie_6[] = INCBIN_U32("graphics/map_objects/pics/people/archie/6.4bpp");
-const u32 gMapObjectPic_Archie_7[] = INCBIN_U32("graphics/map_objects/pics/people/archie/7.4bpp");
-const u32 gMapObjectPic_Archie_8[] = INCBIN_U32("graphics/map_objects/pics/people/archie/8.4bpp");
-const u32 gMapObjectPic_Maxie_0[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/0.4bpp");
-const u32 gMapObjectPic_Maxie_1[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/1.4bpp");
-const u32 gMapObjectPic_Maxie_2[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/2.4bpp");
-const u32 gMapObjectPic_Maxie_3[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/3.4bpp");
-const u32 gMapObjectPic_Maxie_4[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/4.4bpp");
-const u32 gMapObjectPic_Maxie_5[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/5.4bpp");
-const u32 gMapObjectPic_Maxie_6[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/6.4bpp");
-const u32 gMapObjectPic_Maxie_7[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/7.4bpp");
-const u32 gMapObjectPic_Maxie_8[] = INCBIN_U32("graphics/map_objects/pics/people/maxie/8.4bpp");
-const u32 gMapObjectPic_Kyogre_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre/0.4bpp");
-const u32 gMapObjectPic_Kyogre_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kyogre/1.4bpp");
-const u32 gMapObjectPic_Groudon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon/0.4bpp");
-const u32 gMapObjectPic_Groudon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/groudon/1.4bpp");
-const u32 gMapObjectPic_Regi[] = INCBIN_U32("graphics/map_objects/pics/pokemon/regi.4bpp");
-const u32 gMapObjectPic_Skitty_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/0.4bpp");
-const u32 gMapObjectPic_Skitty_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/1.4bpp");
-const u32 gMapObjectPic_Skitty_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/skitty/2.4bpp");
-const u32 gMapObjectPic_Kecleon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/0.4bpp");
-const u32 gMapObjectPic_Kecleon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/1.4bpp");
-const u32 gMapObjectPic_Kecleon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/kecleon/2.4bpp");
-const u32 gMapObjectPic_Rayquaza_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/0.4bpp");
-const u32 gMapObjectPic_Rayquaza_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/rayquaza/1.4bpp");
-const u32 gMapObjectPic_Zigzagoon_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp");
-const u32 gMapObjectPic_Zigzagoon_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp");
-const u32 gMapObjectPic_Zigzagoon_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp");
-const u32 gMapObjectPic_Pikachu_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/0.4bpp");
-const u32 gMapObjectPic_Pikachu_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/1.4bpp");
-const u32 gMapObjectPic_Pikachu_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/pikachu/2.4bpp");
-const u32 gMapObjectPic_Azumarill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/0.4bpp");
-const u32 gMapObjectPic_Azumarill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/1.4bpp");
-const u32 gMapObjectPic_Azumarill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azumarill/2.4bpp");
-const u32 gMapObjectPic_Wingull_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/0.4bpp");
-const u32 gMapObjectPic_Wingull_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/3.4bpp");
-const u32 gMapObjectPic_Wingull_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/1.4bpp");
-const u32 gMapObjectPic_Wingull_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/4.4bpp");
-const u32 gMapObjectPic_Wingull_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/2.4bpp");
-const u32 gMapObjectPic_Wingull_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/wingull/5.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_0[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_1[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_2[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_3[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_4[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_5[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_6[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_7[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp");
-const u32 gMapObjectPic_TuberMSwimming_8[] = INCBIN_U32("graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp");
-const u32 gMapObjectPic_Azurill_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/0.4bpp");
-const u32 gMapObjectPic_Azurill_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/1.4bpp");
-const u32 gMapObjectPic_Azurill_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/azurill/2.4bpp");
-const u32 gMapObjectPic_Mom_0[] = INCBIN_U32("graphics/map_objects/pics/people/mom/0.4bpp");
-const u32 gMapObjectPic_Mom_1[] = INCBIN_U32("graphics/map_objects/pics/people/mom/1.4bpp");
-const u32 gMapObjectPic_Mom_2[] = INCBIN_U32("graphics/map_objects/pics/people/mom/2.4bpp");
-const u32 gMapObjectPic_Mom_3[] = INCBIN_U32("graphics/map_objects/pics/people/mom/3.4bpp");
-const u32 gMapObjectPic_Mom_4[] = INCBIN_U32("graphics/map_objects/pics/people/mom/4.4bpp");
-const u32 gMapObjectPic_Mom_5[] = INCBIN_U32("graphics/map_objects/pics/people/mom/5.4bpp");
-const u32 gMapObjectPic_Mom_6[] = INCBIN_U32("graphics/map_objects/pics/people/mom/6.4bpp");
-const u32 gMapObjectPic_Mom_7[] = INCBIN_U32("graphics/map_objects/pics/people/mom/7.4bpp");
-const u32 gMapObjectPic_Mom_8[] = INCBIN_U32("graphics/map_objects/pics/people/mom/8.4bpp");
-const u16 gMapObjectPalette22[] = INCBIN_U16("graphics/map_objects/palettes/22.gbapal");
-const u16 gMapObjectPalette23[] = INCBIN_U16("graphics/map_objects/palettes/23.gbapal");
-const u16 gMapObjectPalette24[] = INCBIN_U16("graphics/map_objects/palettes/24.gbapal");
-const u16 gMapObjectPalette25[] = INCBIN_U16("graphics/map_objects/palettes/25.gbapal");
-const u32 gMapObjectPic_UnusedNatuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_natu_doll.4bpp");
-const u32 gMapObjectPic_UnusedMagnemiteDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp");
-const u32 gMapObjectPic_UnusedSquirtleDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp");
-const u32 gMapObjectPic_UnusedWooperDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp");
-const u32 gMapObjectPic_UnusedPikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp");
-const u32 gMapObjectPic_UnusedPorygon2Doll[] = INCBIN_U32("graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp");
-const u32 gMapObjectPic_PichuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pichu_doll.4bpp");
-const u32 gMapObjectPic_PikachuDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/pikachu_doll.4bpp");
-const u32 gMapObjectPic_MarillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/marill_doll.4bpp");
-const u32 gMapObjectPic_TogepiDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/togepi_doll.4bpp");
-const u32 gMapObjectPic_CyndaquilDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp");
-const u32 gMapObjectPic_ChikoritaDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/chikorita_doll.4bpp");
-const u32 gMapObjectPic_TotodileDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/totodile_doll.4bpp");
-const u32 gMapObjectPic_JigglypuffDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp");
-const u32 gMapObjectPic_MeowthDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/meowth_doll.4bpp");
-const u32 gMapObjectPic_ClefairyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/clefairy_doll.4bpp");
-const u32 gMapObjectPic_DittoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/ditto_doll.4bpp");
-const u32 gMapObjectPic_SmoochumDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/smoochum_doll.4bpp");
-const u32 gMapObjectPic_TreeckoDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/treecko_doll.4bpp");
-const u32 gMapObjectPic_TorchicDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/torchic_doll.4bpp");
-const u32 gMapObjectPic_MudkipDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/mudkip_doll.4bpp");
-const u32 gMapObjectPic_DuskullDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/duskull_doll.4bpp");
-const u32 gMapObjectPic_WynautDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/wynaut_doll.4bpp");
-const u32 gMapObjectPic_BaltoyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/baltoy_doll.4bpp");
-const u32 gMapObjectPic_KecleonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/kecleon_doll.4bpp");
-const u32 gMapObjectPic_AzurillDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/azurill_doll.4bpp");
-const u32 gMapObjectPic_SkittyDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/skitty_doll.4bpp");
-const u32 gMapObjectPic_SwabluDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/swablu_doll.4bpp");
-const u32 gMapObjectPic_GulpinDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/gulpin_doll.4bpp");
-const u32 gMapObjectPic_LotadDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/lotad_doll.4bpp");
-const u32 gMapObjectPic_SeedotDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/seedot_doll.4bpp");
-const u32 gMapObjectPic_PikaCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/pika_cushion.4bpp");
-const u32 gMapObjectPic_RoundCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/round_cushion.4bpp");
-const u32 gMapObjectPic_KissCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/kiss_cushion.4bpp");
-const u32 gMapObjectPic_ZigzagCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/zigzag_cushion.4bpp");
-const u32 gMapObjectPic_SpinCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/spin_cushion.4bpp");
-const u32 gMapObjectPic_DiamondCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/diamond_cushion.4bpp");
-const u32 gMapObjectPic_BallCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/ball_cushion.4bpp");
-const u32 gMapObjectPic_GrassCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/grass_cushion.4bpp");
-const u32 gMapObjectPic_FireCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/fire_cushion.4bpp");
-const u32 gMapObjectPic_WaterCushion[] = INCBIN_U32("graphics/map_objects/pics/cushions/water_cushion.4bpp");
-const u32 gMapObjectPic_BigSnorlaxDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp");
-const u32 gMapObjectPic_BigRhydonDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp");
-const u32 gMapObjectPic_BigLaprasDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_lapras_doll.4bpp");
-const u32 gMapObjectPic_BigVenusaurDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp");
-const u32 gMapObjectPic_BigCharizardDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_charizard_doll.4bpp");
-const u32 gMapObjectPic_BigBlastoiseDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp");
-const u32 gMapObjectPic_BigWailmerDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp");
-const u32 gMapObjectPic_BigRegirockDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regirock_doll.4bpp");
-const u32 gMapObjectPic_BigRegiceDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_regice_doll.4bpp");
-const u32 gMapObjectPic_BigRegisteelDoll[] = INCBIN_U32("graphics/map_objects/pics/dolls/big_registeel_doll.4bpp");
-const u32 gMapObjectPic_CuttableTree_0[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/0.4bpp");
-const u32 gMapObjectPic_CuttableTree_1[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/1.4bpp");
-const u32 gMapObjectPic_CuttableTree_2[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/2.4bpp");
-const u32 gMapObjectPic_CuttableTree_3[] = INCBIN_U32("graphics/map_objects/pics/misc/cuttable_tree/3.4bpp");
-const u32 gMapObjectPic_BreakableRock_0[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/0.4bpp");
-const u32 gMapObjectPic_BreakableRock_1[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/1.4bpp");
-const u32 gMapObjectPic_BreakableRock_2[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/2.4bpp");
-const u32 gMapObjectPic_BreakableRock_3[] = INCBIN_U32("graphics/map_objects/pics/misc/breakable_rock/3.4bpp");
-const u32 gMapObjectPic_PushableBoulder[] = INCBIN_U32("graphics/map_objects/pics/misc/pushable_boulder.4bpp");
-const u32 gMapObjectPic_MrBrineysBoat_0[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp");
-const u32 gMapObjectPic_MrBrineysBoat_1[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp");
-const u32 gMapObjectPic_MrBrineysBoat_2[] = INCBIN_U32("graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp");
-const u32 gMapObjectPic_Fossil[] = INCBIN_U32("graphics/map_objects/pics/misc/fossil.4bpp");
-const u32 gMapObjectPic_SubmarineShadow[] = INCBIN_U32("graphics/map_objects/pics/misc/submarine_shadow.4bpp");
-const u16 gMapObjectPalette26[] = INCBIN_U16("graphics/map_objects/palettes/26.gbapal");
-const u32 gMapObjectPic_Truck[] = INCBIN_U32("graphics/map_objects/pics/misc/truck.4bpp");
-const u16 gMapObjectPalette14[] = INCBIN_U16("graphics/map_objects/palettes/14.gbapal");
-const u32 gMapObjectPic_MachokeCarryingBox_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/machoke_carrying_box/0.4bpp");
-const u32 gMapObjectPic_MachokeCarryingBox_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/machoke_carrying_box/1.4bpp");
-const u32 gMapObjectPic_MachokeCarryingBox_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/machoke_carrying_box/2.4bpp");
-const u32 gMapObjectPic_MachokeFacingAway_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/machoke_facing_away/0.4bpp");
-const u32 gMapObjectPic_MachokeFacingAway_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/machoke_facing_away/1.4bpp");
-const u16 gMapObjectPalette15[] = INCBIN_U16("graphics/map_objects/palettes/15.gbapal");
-const u32 gMapObjectPic_BirchsBag[] = INCBIN_U32("graphics/map_objects/pics/misc/birchs_bag.4bpp");
-const u32 gMapObjectPic_Poochyena_0[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/0.4bpp");
-const u32 gMapObjectPic_Poochyena_1[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/1.4bpp");
-const u32 gMapObjectPic_Poochyena_2[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/2.4bpp");
-const u32 gMapObjectPic_Poochyena_3[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/3.4bpp");
-const u32 gMapObjectPic_Poochyena_4[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/4.4bpp");
-const u32 gMapObjectPic_Poochyena_5[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/5.4bpp");
-const u32 gMapObjectPic_Poochyena_6[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/6.4bpp");
-const u32 gMapObjectPic_Poochyena_7[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/7.4bpp");
-const u32 gMapObjectPic_Poochyena_8[] = INCBIN_U32("graphics/map_objects/pics/pokemon/poochyena/8.4bpp");
-const u16 gMapObjectPalette16[] = INCBIN_U16("graphics/map_objects/palettes/16.gbapal");
-const u32 gMapObjectPic_CableCar[] = INCBIN_U32("graphics/map_objects/pics/misc/cable_car.4bpp");
-const u16 gMapObjectPalette20[] = INCBIN_U16("graphics/map_objects/palettes/20.gbapal");
-const u32 gMapObjectPic_SSTidal[] = INCBIN_U32("graphics/map_objects/pics/misc/ss_tidal.4bpp");
-const u16 gMapObjectPalette21[] = INCBIN_U16("graphics/map_objects/palettes/21.gbapal");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/0.4bpp");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/1.4bpp");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_2[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/2.4bpp");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_3[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/3.4bpp");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_4[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/4.4bpp");
-const u32 gFieldEffectPic_BerryTreeGrowthSparkle_5[] = INCBIN_U32("graphics/field_effect_objects/pics/berry_tree_growth_sparkle/5.4bpp");
-const u32 gMapObjectPic_BerryTreeDirtPile[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/dirt_pile.4bpp");
-const u32 gMapObjectPic_BerryTreeSprout_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/0.4bpp");
-const u32 gMapObjectPic_BerryTreeSprout_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sprout/1.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/0.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/1.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/2.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/3.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/4.4bpp");
-const u32 gMapObjectPic_PechaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pecha/5.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp");
-const u32 gMapObjectPic_KelpsyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/0.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/1.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/2.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/3.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/4.4bpp");
-const u32 gMapObjectPic_WepearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wepear/5.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/0.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/1.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/2.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/3.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/4.4bpp");
-const u32 gMapObjectPic_IapapaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/iapapa/5.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/0.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/1.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/2.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/3.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/4.4bpp");
-const u32 gMapObjectPic_CheriBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cheri/5.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/0.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/1.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/2.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/3.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/4.4bpp");
-const u32 gMapObjectPic_FigyBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/figy/5.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/0.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/1.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/2.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/3.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/4.4bpp");
-const u32 gMapObjectPic_MagoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/mago/5.4bpp");
-const u32 gMapObjectPic_LumBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/0.4bpp");
-const u32 gMapObjectPic_LumBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/1.4bpp");
-const u32 gMapObjectPic_LumBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/2.4bpp");
-const u32 gMapObjectPic_LumBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/3.4bpp");
-const u32 gMapObjectPic_LumBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/4.4bpp");
-const u32 gMapObjectPic_LumBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lum/5.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/0.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/1.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/2.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/3.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/4.4bpp");
-const u32 gMapObjectPic_RazzBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/razz/5.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/0.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/1.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/2.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/3.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/4.4bpp");
-const u32 gMapObjectPic_GrepaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/grepa/5.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/0.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/1.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/2.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/3.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/4.4bpp");
-const u32 gMapObjectPic_RabutaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rabuta/5.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/0.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/1.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/2.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/3.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/4.4bpp");
-const u32 gMapObjectPic_NomelBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/nomel/5.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/0.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/1.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/2.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/3.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/4.4bpp");
-const u32 gMapObjectPic_LeppaBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/leppa/5.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/0.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/1.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/2.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/3.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/4.4bpp");
-const u32 gMapObjectPic_LiechiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/liechi/5.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/0.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/1.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/2.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/3.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/4.4bpp");
-const u32 gMapObjectPic_HondewBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/hondew/5.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/0.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/1.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/2.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/3.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/4.4bpp");
-const u32 gMapObjectPic_AguavBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aguav/5.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/0.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/1.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/2.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/3.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/4.4bpp");
-const u32 gMapObjectPic_WikiBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/wiki/5.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/0.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/1.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/2.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/3.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/4.4bpp");
-const u32 gMapObjectPic_PomegBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pomeg/5.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/0.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/1.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/2.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/3.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/4.4bpp");
-const u32 gMapObjectPic_RawstBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/rawst/5.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/0.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/1.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/2.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/3.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/4.4bpp");
-const u32 gMapObjectPic_SpelonBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/spelon/5.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/0.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/1.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/2.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/3.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/4.4bpp");
-const u32 gMapObjectPic_ChestoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/chesto/5.4bpp");
-const u32 gMapObjectPic_OranBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/0.4bpp");
-const u32 gMapObjectPic_OranBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/1.4bpp");
-const u32 gMapObjectPic_OranBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/2.4bpp");
-const u32 gMapObjectPic_OranBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/3.4bpp");
-const u32 gMapObjectPic_OranBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/4.4bpp");
-const u32 gMapObjectPic_OranBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/oran/5.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/0.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/1.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/2.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/3.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/4.4bpp");
-const u32 gMapObjectPic_PersimBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/persim/5.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/0.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/1.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/2.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/3.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/4.4bpp");
-const u32 gMapObjectPic_SitrusBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/sitrus/5.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/0.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/1.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/2.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/3.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/4.4bpp");
-const u32 gMapObjectPic_AspearBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/aspear/5.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/0.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/1.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/2.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/3.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/4.4bpp");
-const u32 gMapObjectPic_PamtreBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/pamtre/5.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/0.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/1.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/2.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/3.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/4.4bpp");
-const u32 gMapObjectPic_CornnBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/cornn/5.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/0.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/1.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/2.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/3.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/4.4bpp");
-const u32 gMapObjectPic_LansatBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/lansat/5.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/0.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/1.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/2.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/3.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/4.4bpp");
-const u32 gMapObjectPic_DurinBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/durin/5.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_0[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/0.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_1[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/1.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_2[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/2.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_3[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/3.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_4[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/4.4bpp");
-const u32 gMapObjectPic_TamatoBerryTree_5[] = INCBIN_U32("graphics/map_objects/pics/berry_trees/tamato/5.4bpp");
-const u32 gFieldEffectPic_SurfBlob_0[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/0.4bpp");
-const u32 gFieldEffectPic_SurfBlob_1[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/1.4bpp");
-const u32 gFieldEffectPic_SurfBlob_2[] = INCBIN_U32("graphics/field_effect_objects/pics/surf_blob/2.4bpp");
-const u32 gMapObjectPic_QuintyPlump_0[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/0.4bpp");
-const u32 gMapObjectPic_QuintyPlump_1[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/1.4bpp");
-const u32 gMapObjectPic_QuintyPlump_2[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/2.4bpp");
-const u32 gMapObjectPic_QuintyPlump_3[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/3.4bpp");
-const u32 gMapObjectPic_QuintyPlump_4[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/4.4bpp");
-const u32 gMapObjectPic_QuintyPlump_5[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/5.4bpp");
-const u32 gMapObjectPic_QuintyPlump_6[] = INCBIN_U32("graphics/map_objects/pics/people/quinty_plump/6.4bpp");
-const u16 gMapObjectPalette12[] = INCBIN_U16("graphics/map_objects/palettes/12.gbapal");
-const u16 gMapObjectPalette13[] = INCBIN_U16("graphics/map_objects/palettes/13.gbapal");
-
-const u32 gFieldEffectPic_ShadowSmall[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_small.4bpp");
-const u32 gFieldEffectPic_ShadowMedium[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_medium.4bpp");
-const u32 gFieldEffectPic_ShadowLarge[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_large.4bpp");
-const u32 gFieldEffectPic_ShadowExtraLarge[] = INCBIN_U32("graphics/field_effect_objects/pics/shadow_extra_large.4bpp");
-const u32 filler_8368A08[0x48] = {};
-const u8 gFieldEffectPic_CutGrass[] = INCBIN_U8("graphics/field_effect_objects/pics/cut_grass.4bpp");
-const u32 FieldEffectPic_CutGrass_Copy[] = INCBIN_U32("graphics/field_effect_objects/pics/cut_grass.4bpp");
-const u16 gFieldEffectObjectPalette6[] = INCBIN_U16("graphics/field_effect_objects/palettes/06.gbapal");
-const u32 gFieldEffectPic_Ripple_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/0.4bpp");
-const u32 gFieldEffectPic_Ripple_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/1.4bpp");
-const u32 gFieldEffectPic_Ripple_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/2.4bpp");
-const u32 gFieldEffectPic_Ripple_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/3.4bpp");
-const u32 gFieldEffectPic_Ripple_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ripple/4.4bpp");
-const u32 gFieldEffectPic_Ash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/0.4bpp");
-const u32 gFieldEffectPic_Ash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/1.4bpp");
-const u32 gFieldEffectPic_Ash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/2.4bpp");
-const u32 gFieldEffectPic_Ash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/3.4bpp");
-const u32 gFieldEffectPic_Ash_4[] = INCBIN_U32("graphics/field_effect_objects/pics/ash/4.4bpp");
-const u32 gFieldEffectPic_Arrow_0[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/0.4bpp");
-const u32 gFieldEffectPic_Arrow_1[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/1.4bpp");
-const u32 gFieldEffectPic_Arrow_2[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/2.4bpp");
-const u32 gFieldEffectPic_Arrow_3[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/3.4bpp");
-const u32 gFieldEffectPic_Arrow_4[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/4.4bpp");
-const u32 gFieldEffectPic_Arrow_5[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/5.4bpp");
-const u32 gFieldEffectPic_Arrow_6[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/6.4bpp");
-const u32 gFieldEffectPic_Arrow_7[] = INCBIN_U32("graphics/field_effect_objects/pics/arrow/7.4bpp");
-const u16 gFieldEffectObjectPalette0[] = INCBIN_U16("graphics/field_effect_objects/palettes/00.gbapal");
-const u16 gFieldEffectObjectPalette1[] = INCBIN_U16("graphics/field_effect_objects/palettes/01.gbapal");
-const u32 gFieldEffectPic_Dust_0[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/0.4bpp");
-const u32 gFieldEffectPic_Dust_1[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/1.4bpp");
-const u32 gFieldEffectPic_Dust_2[] = INCBIN_U32("graphics/field_effect_objects/pics/dust/2.4bpp");
-const u32 unknown_8369588[] = INCBIN_U32("graphics/field_effect_objects/unknown.bin");
-const u32 gFieldEffectPic_JumpTallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/0.4bpp");
-const u32 gFieldEffectPic_JumpTallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/1.4bpp");
-const u32 gFieldEffectPic_JumpTallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/2.4bpp");
-const u32 gFieldEffectPic_JumpTallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_tall_grass/3.4bpp");
-const u32 UnusedGrass0[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/0.4bpp");
-const u32 UnusedGrass1[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/1.4bpp");
-const u32 UnusedGrass2[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/2.4bpp");
-const u32 UnusedGrass3[] = INCBIN_U32("graphics/field_effect_objects/pics/unused_grass/3.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/0.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/1.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/2.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/3.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/4.4bpp");
-const u32 UnusedGrassLong[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/unused.4bpp");
-const u32 gFieldEffectPic_JumpLongGrass_5[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_long_grass/5.4bpp");
-const u32 gFieldEffectPic_Unknown17_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/0.4bpp");
-const u32 gFieldEffectPic_Unknown17_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/1.4bpp");
-const u32 gFieldEffectPic_Unknown17_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/2.4bpp");
-const u32 gFieldEffectPic_Unknown17_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/3.4bpp");
-const u32 gFieldEffectPic_Unknown17_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/4.4bpp");
-const u32 gFieldEffectPic_Unknown17_5[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/5.4bpp");
-const u32 gFieldEffectPic_Unknown17_6[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/6.4bpp");
-const u32 gFieldEffectPic_Unknown17_7[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_17/7.4bpp");
-const u32 gFieldEffectPic_Unknown18_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/0.4bpp");
-const u32 gFieldEffectPic_Unknown18_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/1.4bpp");
-const u32 gFieldEffectPic_Unknown18_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/2.4bpp");
-const u32 gFieldEffectPic_Unknown18_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_18/3.4bpp");
-const u32 gFieldEffectPic_LongGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/0.4bpp");
-const u32 gFieldEffectPic_LongGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/1.4bpp");
-const u32 gFieldEffectPic_LongGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/2.4bpp");
-const u32 gFieldEffectPic_LongGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/long_grass/3.4bpp");
-const u32 gFieldEffectPic_TallGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/0.4bpp");
-const u32 gFieldEffectPic_TallGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/1.4bpp");
-const u32 gFieldEffectPic_TallGrass_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/2.4bpp");
-const u32 gFieldEffectPic_TallGrass_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/3.4bpp");
-const u32 gFieldEffectPic_TallGrass_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tall_grass/4.4bpp");
-const u32 gFieldEffectPic_ShortGrass_0[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/0.4bpp");
-const u32 gFieldEffectPic_ShortGrass_1[] = INCBIN_U32("graphics/field_effect_objects/pics/short_grass/1.4bpp");
-const u32 gFieldEffectPic_SandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/0.4bpp");
-const u32 gFieldEffectPic_SandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_footprints/1.4bpp");
-const u32 gFieldEffectPic_DeepSandFootprints_0[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/0.4bpp");
-const u32 gFieldEffectPic_DeepSandFootprints_1[] = INCBIN_U32("graphics/field_effect_objects/pics/deep_sand_footprints/1.4bpp");
-const u32 gFieldEffectPic_BikeTireTracks_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/0.4bpp");
-const u32 gFieldEffectPic_BikeTireTracks_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/1.4bpp");
-const u32 gFieldEffectPic_BikeTireTracks_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/2.4bpp");
-const u32 gFieldEffectPic_BikeTireTracks_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bike_tire_tracks/3.4bpp");
-const u32 gFieldEffectPic_Unknown19_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/0.4bpp");
-const u32 gFieldEffectPic_Unknown19_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/1.4bpp");
-const u32 gFieldEffectPic_Unknown19_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/2.4bpp");
-const u32 gFieldEffectPic_Unknown19_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_19/3.4bpp");
-const u32 gFieldEffectPic_SandPile_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/0.4bpp");
-const u32 gFieldEffectPic_SandPile_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/1.4bpp");
-const u32 gFieldEffectPic_SandPile_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_pile/2.4bpp");
-const u32 gFieldEffectPic_JumpBigSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/0.4bpp");
-const u32 gFieldEffectPic_JumpBigSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/1.4bpp");
-const u32 gFieldEffectPic_JumpBigSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/2.4bpp");
-const u32 gFieldEffectPic_JumpBigSplash_3[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_big_splash/3.4bpp");
-const u32 gFieldEffectPic_Splash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/0.4bpp");
-const u32 gFieldEffectPic_Splash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/splash/1.4bpp");
-const u32 gFieldEffectPic_JumpSmallSplash_0[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/0.4bpp");
-const u32 gFieldEffectPic_JumpSmallSplash_1[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/1.4bpp");
-const u32 gFieldEffectPic_JumpSmallSplash_2[] = INCBIN_U32("graphics/field_effect_objects/pics/jump_small_splash/2.4bpp");
-const u32 gFieldEffectPic_Unknown20_0[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/0.4bpp");
-const u32 gFieldEffectPic_Unknown20_1[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/1.4bpp");
-const u32 gFieldEffectPic_Unknown20_2[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/2.4bpp");
-const u32 gFieldEffectPic_Unknown20_3[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/3.4bpp");
-const u32 gFieldEffectPic_Unknown20_4[] = INCBIN_U32("graphics/field_effect_objects/pics/unknown_20/4.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/0.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/1.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/2.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/3.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/4.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/5.4bpp");
-const u32 gFieldEffectPic_TreeDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/tree_disguise/6.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/0.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/1.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/2.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/3.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/4.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/5.4bpp");
-const u32 gFieldEffectPic_MountainDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/mountain_disguise/6.4bpp");
-const u32 gFieldEffectPic_SandDisguise_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/0.4bpp");
-const u32 gFieldEffectPic_SandDisguise_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/1.4bpp");
-const u32 gFieldEffectPic_SandDisguise_2[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/2.4bpp");
-const u32 gFieldEffectPic_SandDisguise_3[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/3.4bpp");
-const u32 gFieldEffectPic_SandDisguise_4[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/4.4bpp");
-const u32 gFieldEffectPic_SandDisguise_5[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/5.4bpp");
-const u32 gFieldEffectPic_SandDisguise_6[] = INCBIN_U32("graphics/field_effect_objects/pics/sand_disguise/6.4bpp");
-const u32 gFieldEffectPic_HotSpringsWater[] = INCBIN_U32("graphics/field_effect_objects/pics/hot_springs_water.4bpp");
-const u16 gFieldEffectObjectPalette2[] = INCBIN_U16("graphics/field_effect_objects/palettes/02.gbapal");
-const u32 gFieldEffectPic_PopOutOfAsh_0[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/0.4bpp");
-const u32 gFieldEffectPic_PopOutOfAsh_1[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/1.4bpp");
-const u32 gFieldEffectPic_PopOutOfAsh_2[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/2.4bpp");
-const u32 gFieldEffectPic_PopOutOfAsh_3[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/3.4bpp");
-const u32 gFieldEffectPic_PopOutOfAsh_4[] = INCBIN_U32("graphics/field_effect_objects/pics/pop_out_of_ash/4.4bpp");
-const u32 gFieldEffectPic_LavaridgeGymWarp_0[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/0.4bpp");
-const u32 gFieldEffectPic_LavaridgeGymWarp_1[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/1.4bpp");
-const u32 gFieldEffectPic_LavaridgeGymWarp_2[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/2.4bpp");
-const u32 gFieldEffectPic_LavaridgeGymWarp_3[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/3.4bpp");
-const u32 gFieldEffectPic_LavaridgeGymWarp_4[] = INCBIN_U32("graphics/field_effect_objects/pics/lavaridge_gym_warp/4.4bpp");
-const u32 gFieldEffectPic_Bubbles_0[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/0.4bpp");
-const u32 gFieldEffectPic_Bubbles_1[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/1.4bpp");
-const u32 gFieldEffectPic_Bubbles_2[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/2.4bpp");
-const u32 gFieldEffectPic_Bubbles_3[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/3.4bpp");
-const u32 gFieldEffectPic_Bubbles_4[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/4.4bpp");
-const u32 gFieldEffectPic_Bubbles_5[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/5.4bpp");
-const u32 gFieldEffectPic_Bubbles_6[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/6.4bpp");
-const u32 gFieldEffectPic_Bubbles_7[] = INCBIN_U32("graphics/field_effect_objects/pics/bubbles/7.4bpp");
-const u32 gFieldEffectPic_Sparkle_0[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/0.4bpp");
-const u32 gFieldEffectPic_Sparkle_1[] = INCBIN_U32("graphics/field_effect_objects/pics/sparkle/1.4bpp");
-const u16 gFieldEffectObjectPalette3[] = INCBIN_U16("graphics/field_effect_objects/palettes/03.gbapal");
-const u32 gFieldEffectPic_Bird[] = INCBIN_U32("graphics/field_effect_objects/pics/bird.4bpp");
-
-void (*const gUnknown_0836DA88[])(struct Sprite *) =
-{
-    sub_805C884,
-    sub_805CDE8,
-    sub_805C8AC,
-    sub_805CF28,
-    sub_805CF28,
-    sub_805D0AC,
-    sub_805D0AC,
-    sub_805D230,
-    sub_805D230,
-    sub_805D230,
-    sub_805D230,
-    sub_80587B4,
-    FieldObjectCB_BerryTree,
-    sub_805D4F4,
-    sub_805D634,
-    sub_805D774,
-    sub_805D8B4,
-    sub_805D9F4,
-    sub_805DB34,
-    sub_805DC74,
-    sub_805DDB4,
-    sub_805DEF4,
-    sub_805E034,
-    sub_805E174,
-    sub_805E278,
-    sub_805E37C,
-    sub_805E37C,
-    sub_805E37C,
-    sub_805E37C,
-    sub_805E5DC,
-    sub_805E668,
-    sub_805E6F4,
-    sub_805E780,
-    sub_805E80C,
-    sub_805E898,
-    sub_805E924,
-    sub_805E9B0,
-    sub_805EA3C,
-    sub_805EAC8,
-    sub_805EB54,
-    sub_805EBE0,
-    sub_805EC6C,
-    sub_805ECF8,
-    sub_805ED84,
-    sub_805EE10,
-    sub_805EE9C,
-    sub_805EF28,
-    sub_805EFB4,
-    sub_805F040,
-    sub_805F0CC,
-    sub_805F158,
-    sub_805F1E4,
-    sub_805F270,
-    sub_805F2FC,
-    sub_805F2FC,
-    sub_805F2FC,
-    sub_805F2FC,
-    FieldObjectCB_TreeDisguise,
-    FieldObjectCB_MountainDisguise,
-    sub_805F8E0,
-    sub_805F8E0,
-    sub_805F8E0,
-    sub_805F8E0,
-    FieldObjectCB_Hidden1,
-    sub_805FB20,
-    sub_805FB20,
-    sub_805FB20,
-    sub_805FB20,
-    sub_805FB90,
-    sub_805FB90,
-    sub_805FB90,
-    sub_805FB90,
-    sub_805FC00,
-    sub_805FC00,
-    sub_805FC00,
-    sub_805FC00,
-    sub_805FC70
+#include "data/field_event_obj/event_object_graphics.h"
+#include "data/field_event_obj/field_effect_object_graphics.h"
+
+// movement type callbacks
+static void (*const sMovementTypeCallbacks[])(struct Sprite *) =
+{
+    MovementType_None,                        // MOVEMENT_TYPE_NONE
+    MovementType_LookAround,                  // MOVEMENT_TYPE_LOOK_AROUND
+    MovementType_WanderAround,                // MOVEMENT_TYPE_WANDER_AROUND
+    MovementType_WanderUpAndDown,             // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    MovementType_WanderUpAndDown,             // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    MovementType_WanderLeftAndRight,          // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    MovementType_WanderLeftAndRight,          // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    MovementType_FaceDirection,               // MOVEMENT_TYPE_FACE_UP
+    MovementType_FaceDirection,               // MOVEMENT_TYPE_FACE_DOWN
+    MovementType_FaceDirection,               // MOVEMENT_TYPE_FACE_LEFT
+    MovementType_FaceDirection,               // MOVEMENT_TYPE_FACE_RIGHT
+    MovementType_Player,                      // MOVEMENT_TYPE_PLAYER
+    MovementType_BerryTreeGrowth,             // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    MovementType_FaceDownAndUp,               // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    MovementType_FaceLeftAndRight,            // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    MovementType_FaceUpAndLeft,               // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    MovementType_FaceUpAndRight,              // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    MovementType_FaceDownAndLeft,             // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    MovementType_FaceDownAndRight,            // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    MovementType_FaceDownUpAndLeft,           // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    MovementType_FaceDownUpAndRight,          // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    MovementType_FaceUpLeftAndRight,          // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    MovementType_FaceDownLeftAndRight,        // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    MovementType_RotateCounterclockwise,      // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    MovementType_RotateClockwise,             // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    MovementType_WalkBackAndForth,            // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    MovementType_WalkBackAndForth,            // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    MovementType_WalkBackAndForth,            // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    MovementType_WalkBackAndForth,            // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    MovementType_WalkSequenceUpRightLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    MovementType_WalkSequenceRightLeftDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    MovementType_WalkSequenceDownUpRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    MovementType_WalkSequenceLeftDownUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    MovementType_WalkSequenceUpLeftRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    MovementType_WalkSequenceLeftRightDownUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    MovementType_WalkSequenceDownUpLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    MovementType_WalkSequenceRightDownUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    MovementType_WalkSequenceLeftUpDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    MovementType_WalkSequenceUpDownRightLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    MovementType_WalkSequenceRightLeftUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    MovementType_WalkSequenceDownRightLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    MovementType_WalkSequenceRightUpDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    MovementType_WalkSequenceUpDownLeftRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    MovementType_WalkSequenceLeftRightUpDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    MovementType_WalkSequenceDownLeftRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    MovementType_WalkSequenceUpLeftDownRight, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    MovementType_WalkSequenceDownRightUpLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    MovementType_WalkSequenceLeftDownRightUp, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    MovementType_WalkSequenceRightUpLeftDown, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    MovementType_WalkSequenceUpRightDownLeft, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    MovementType_WalkSequenceDownLeftUpRight, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    MovementType_WalkSequenceLeftUpRightDown, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    MovementType_WalkSequenceRightDownLeftUp, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    MovementType_CopyPlayer,                  // MOVEMENT_TYPE_COPY_PLAYER
+    MovementType_CopyPlayer,                  // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    MovementType_CopyPlayer,                  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    MovementType_CopyPlayer,                  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    MovementType_TreeDisguise,                // MOVEMENT_TYPE_TREE_DISGUISE
+    MovementType_MountainDisguise,            // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    MovementType_CopyPlayerInGrass,           // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    MovementType_CopyPlayerInGrass,           // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    MovementType_CopyPlayerInGrass,           // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    MovementType_CopyPlayerInGrass,           // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    MovementType_Hidden,                      // MOVEMENT_TYPE_HIDDEN
+    MovementType_WalkInPlace,                 // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    MovementType_WalkInPlace,                 // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    MovementType_WalkInPlace,                 // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    MovementType_WalkInPlace,                 // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    MovementType_JogInPlace,                  // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    MovementType_JogInPlace,                  // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    MovementType_JogInPlace,                  // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    MovementType_JogInPlace,                  // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    MovementType_RunInPlace,                  // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    MovementType_RunInPlace,                  // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    MovementType_RunInPlace,                  // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    MovementType_RunInPlace,                  // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    MovementType_Invisible,                   // MOVEMENT_TYPE_INVISIBLE
 };
 
-const u8 gUnknown_0836DBBC[] = {0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-const u8 gUnknown_0836DC09[] = {DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WEST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_EAST, DIR_WEST, DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_EAST, DIR_NORTH, DIR_WEST, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH, DIR_NORTH, DIR_WEST, DIR_EAST, DIR_SOUTH};
+const u8 gRangedMovementTypes[] = {
+    0, // MOVEMENT_TYPE_NONE
+    0, // MOVEMENT_TYPE_LOOK_AROUND
+    1, // MOVEMENT_TYPE_WANDER_AROUND
+    1, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    1, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    1, // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    1, // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_UP
+    0, // MOVEMENT_TYPE_FACE_DOWN
+    0, // MOVEMENT_TYPE_FACE_LEFT
+    0, // MOVEMENT_TYPE_FACE_RIGHT
+    0, // MOVEMENT_TYPE_PLAYER
+    0, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    0, // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    0, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    0, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    0, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    1, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    1, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    1, // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    1, // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    1, // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    1, // MOVEMENT_TYPE_COPY_PLAYER
+    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    0, // MOVEMENT_TYPE_TREE_DISGUISE
+    0, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    1, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    1, // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    0, // MOVEMENT_TYPE_HIDDEN
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    0, // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    0, // MOVEMENT_TYPE_INVISIBLE
+};
+
+const u8 gInitialMovementTypeFacingDirections[] = {
+    DIR_SOUTH, // MOVEMENT_TYPE_NONE
+    DIR_SOUTH, // MOVEMENT_TYPE_LOOK_AROUND
+    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_AROUND
+    DIR_NORTH, // MOVEMENT_TYPE_WANDER_UP_AND_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WANDER_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WANDER_RIGHT_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN
+    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_FACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_PLAYER
+    DIR_SOUTH, // MOVEMENT_TYPE_BERRY_TREE_GROWTH
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE
+    DIR_SOUTH, // MOVEMENT_TYPE_ROTATE_CLOCKWISE
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_UP_AND_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_DOWN_AND_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_DOWN_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_RIGHT_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_UP_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_DOWN_UP
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_UP_LEFT_RIGHT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_UP_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_DOWN_RIGHT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_RIGHT_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_LEFT_UP_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_DOWN_LEFT
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_DOWN_LEFT_RIGHT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_RIGHT_UP_DOWN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_RIGHT_UP
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP
+    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER
+    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE
+    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE
+    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE
+    DIR_SOUTH, // MOVEMENT_TYPE_TREE_DISGUISE
+    DIR_SOUTH, // MOVEMENT_TYPE_MOUNTAIN_DISGUISE
+    DIR_NORTH, // MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS
+    DIR_SOUTH, // MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS
+    DIR_WEST,  // MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS
+    DIR_EAST,  // MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS
+    DIR_SOUTH, // MOVEMENT_TYPE_HIDDEN
+    DIR_SOUTH, // MOVEMENT_TYPE_WALK_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_WALK_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_WALK_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_JOG_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_JOG_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_JOG_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_RUN_IN_PLACE_DOWN
+    DIR_NORTH, // MOVEMENT_TYPE_RUN_IN_PLACE_UP
+    DIR_WEST,  // MOVEMENT_TYPE_RUN_IN_PLACE_LEFT
+    DIR_EAST,  // MOVEMENT_TYPE_RUN_IN_PLACE_RIGHT
+    DIR_SOUTH, // MOVEMENT_TYPE_INVISIBLE
+};
 
-#include "data/field_map_obj/map_object_graphics_info_pointers.h"
-#include "data/field_map_obj/field_effect_object_template_pointers.h"
-#include "data/field_map_obj/map_object_pic_tables.h"
-#include "data/field_map_obj/map_object_anims.h"
-#include "data/field_map_obj/base_oam.h"
-#include "data/field_map_obj/map_object_subsprites.h"
-#include "data/field_map_obj/map_object_graphics_info.h"
+#include "data/field_event_obj/event_object_graphics_info_pointers.h"
+#include "data/field_event_obj/field_effect_object_template_pointers.h"
+#include "data/field_event_obj/event_object_pic_tables.h"
+#include "data/field_event_obj/event_object_anims.h"
+#include "data/field_event_obj/base_oam.h"
+#include "data/field_event_obj/event_object_subsprites.h"
+#include "data/field_event_obj/event_object_graphics_info.h"
 
 const struct SpritePalette gUnknown_0837377C[] = {
-    {gMapObjectPalette0, 0x1103},
-    {gMapObjectPalette1, 0x1104},
-    {gMapObjectPalette2, 0x1105},
-    {gMapObjectPalette3, 0x1106},
-    {gMapObjectPalette4, 0x1107},
-    {gMapObjectPalette5, 0x1108},
-    {gMapObjectPalette6, 0x1109},
-    {gMapObjectPalette7, 0x110A},
-    {gMapObjectPalette8, 0x1100},
-    {gMapObjectPalette9, 0x1101},
-    {gMapObjectPalette10, 0x1102},
-    {gMapObjectPalette11, 0x1115},
-    {gMapObjectPalette12, 0x110B},
-    {gMapObjectPalette13, 0x110C},
-    {gMapObjectPalette14, 0x110D},
-    {gMapObjectPalette15, 0x110E},
-    {gMapObjectPalette16, 0x110F},
-    {gMapObjectPalette17, 0x1110},
-    {gMapObjectPalette18, 0x1111},
-    {gMapObjectPalette19, 0x1112},
-    {gMapObjectPalette20, 0x1113},
-    {gMapObjectPalette21, 0x1114},
-    {gMapObjectPalette22, 0x1116},
-    {gMapObjectPalette23, 0x1117},
-    {gMapObjectPalette24, 0x1118},
-    {gMapObjectPalette25, 0x1119},
-    {gMapObjectPalette26, 0x111A},
+    {gEventObjectPalette0, 0x1103},
+    {gEventObjectPalette1, 0x1104},
+    {gEventObjectPalette2, 0x1105},
+    {gEventObjectPalette3, 0x1106},
+    {gEventObjectPalette4, 0x1107},
+    {gEventObjectPalette5, 0x1108},
+    {gEventObjectPalette6, 0x1109},
+    {gEventObjectPalette7, 0x110A},
+    {gEventObjectPalette8, 0x1100},
+    {gEventObjectPalette9, 0x1101},
+    {gEventObjectPalette10, 0x1102},
+    {gEventObjectPalette11, 0x1115},
+    {gEventObjectPalette12, 0x110B},
+    {gEventObjectPalette13, 0x110C},
+    {gEventObjectPalette14, 0x110D},
+    {gEventObjectPalette15, 0x110E},
+    {gEventObjectPalette16, 0x110F},
+    {gEventObjectPalette17, 0x1110},
+    {gEventObjectPalette18, 0x1111},
+    {gEventObjectPalette19, 0x1112},
+    {gEventObjectPalette20, 0x1113},
+    {gEventObjectPalette21, 0x1114},
+    {gEventObjectPalette22, 0x1116},
+    {gEventObjectPalette23, 0x1117},
+    {gEventObjectPalette24, 0x1118},
+    {gEventObjectPalette25, 0x1119},
+    {gEventObjectPalette26, 0x111A},
     {NULL,                0x0000}
 };
 
@@ -1791,47 +528,208 @@ const u16 *const gUnknown_0837399C[] = {
     Unknown_8373988
 };
 
-#include "data/field_map_obj/berry_tree_graphics_tables.h"
-#include "data/field_map_obj/field_effect_objects.h"
-
-const s16 gUnknown_0837520C[] = {0x20, 0x40, 0x60, 0x80};
-const s16 gUnknown_08375204[] = {0x20, 0x40, 0x80, 0xc0};
-const s16 gUnknown_0837521C[] = {0x20, 0x30, 0x40, 0x50};
-
-#include "data/field_map_obj/callback_subroutine_pointers.h"
-
-const u8 gUnknown_083755F4[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
-const u8 gUnknown_083755FD[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
-const u8 gUnknown_08375606[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09};
-const u8 gUnknown_0837560F[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F, 0x0C, 0x0C, 0x0D, 0x0D};
-const u8 gUnknown_08375618[] = {0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11};
-const u8 gUnknown_08375621[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
-const u8 gUnknown_0837562A[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
-const u8 gUnknown_08375633[] = {0x18, 0x18, 0x19, 0x1A, 0x1B, 0x18, 0x18, 0x19, 0x19};
-const u8 gUnknown_0837563C[] = {0x1C, 0x1C, 0x1D, 0x1E, 0x1F, 0x1C, 0x1C, 0x1D, 0x1D};
-const u8 gUnknown_08375645[] = {0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21};
-const u8 gUnknown_0837564E[] = {0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25};
-const u8 gUnknown_08375657[] = {0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01};
-const u8 gUnknown_08375660[] = {0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05};
-const u8 gUnknown_08375669[] = {0x08, 0x08, 0x09, 0x0A, 0x0B, 0x08, 0x08, 0x09, 0x09};
-const u8 gUnknown_08375672[] = {0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15};
-const u8 gUnknown_0837567B[] = {0x08, 0x08, 0x07, 0x09, 0x0A, 0x08, 0x08, 0x07, 0x07};
-
-bool8 (*const gUnknown_08375684[])(u8) = {
+#include "data/field_event_obj/berry_tree_graphics_tables.h"
+#include "data/field_event_obj/field_effect_objects.h"
+
+const s16 gMovementDelaysMedium[] = {32, 64,  96, 128};
+const s16 gMovementDelaysLong[] =   {32, 64, 128, 192};
+const s16 gMovementDelaysShort[] =  {32, 48,  64,  80};
+
+#include "data/field_event_obj/movement_type_func_tables.h"
+
+const u8 gFaceDirectionAnimNums[] = {
+    0, // DIR_NONE
+    0, // DIR_SOUTH
+    1, // DIR_NORTH
+    2, // DIR_WEST
+    3, // DIR_EAST
+    0, // DIR_SOUTHWEST
+    0, // DIR_SOUTHEAST
+    1, // DIR_NORTHWEST
+    1, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionAnimNums[] = {
+    4, // DIR_NONE
+    4, // DIR_SOUTH
+    5, // DIR_NORTH
+    6, // DIR_WEST
+    7, // DIR_EAST
+    4, // DIR_SOUTHWEST
+    4, // DIR_SOUTHEAST
+    5, // DIR_NORTHWEST
+    5, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFastAnimNums[] = {
+    8,  // DIR_NONE
+    8,  // DIR_SOUTH
+    9,  // DIR_NORTH
+    10, // DIR_WEST
+    11, // DIR_EAST
+    8,  // DIR_SOUTHWEST
+    8,  // DIR_SOUTHEAST
+    9,  // DIR_NORTHWEST
+    9,  // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFasterAnimNums[] = {
+    12, // DIR_NONE
+    12, // DIR_SOUTH
+    13, // DIR_NORTH
+    14, // DIR_WEST
+    15, // DIR_EAST
+    12, // DIR_SOUTHWEST
+    12, // DIR_SOUTHEAST
+    13, // DIR_NORTHWEST
+    13, // DIR_NORTHEAST
+};
+const u8 gMoveDirectionFastestAnimNums[] = {
+    16, // DIR_NONE
+    16, // DIR_SOUTH
+    17, // DIR_NORTH
+    18, // DIR_WEST
+    19, // DIR_EAST
+    16, // DIR_SOUTHWEST
+    16, // DIR_SOUTHEAST
+    17, // DIR_NORTHWEST
+    17, // DIR_NORTHEAST
+};
+const u8 gJumpSpecialDirectionAnimNums[] = { // used for jumping onto surf mon
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+const u8 gAcroWheelieDirectionAnimNums[] = {
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+const u8 gUnrefAnimNums_08375633[] = {
+    24, // DIR_NONE
+    24, // DIR_SOUTH
+    25, // DIR_NORTH
+    26, // DIR_WEST
+    27, // DIR_EAST
+    24, // DIR_SOUTHWEST
+    24, // DIR_SOUTHEAST
+    25, // DIR_NORTHWEST
+    25, // DIR_NORTHEAST
+};
+const u8 gAcroEndWheelieDirectionAnimNums[] = {
+    28, // DIR_NONE
+    28, // DIR_SOUTH
+    29, // DIR_NORTH
+    30, // DIR_WEST
+    31, // DIR_EAST
+    28, // DIR_SOUTHWEST
+    28, // DIR_SOUTHEAST
+    29, // DIR_NORTHWEST
+    29, // DIR_NORTHEAST
+};
+const u8 gAcroUnusedActionDirectionAnimNums[] = {
+    32, // DIR_NONE
+    32, // DIR_SOUTH
+    33, // DIR_NORTH
+    34, // DIR_WEST
+    35, // DIR_EAST
+    32, // DIR_SOUTHWEST
+    32, // DIR_SOUTHEAST
+    33, // DIR_NORTHWEST
+    33, // DIR_NORTHEAST
+};
+const u8 gAcroWheeliePedalDirectionAnimNums[] = {
+    36, // DIR_NONE
+    36, // DIR_SOUTH
+    37, // DIR_NORTH
+    38, // DIR_WEST
+    39, // DIR_EAST
+    36, // DIR_SOUTHWEST
+    36, // DIR_SOUTHEAST
+    37, // DIR_NORTHWEST
+    37, // DIR_NORTHEAST
+};
+const u8 gFishingDirectionAnimNums[] = {
+    0, // DIR_NONE
+    0, // DIR_SOUTH
+    1, // DIR_NORTH
+    2, // DIR_WEST
+    3, // DIR_EAST
+    0, // DIR_SOUTHWEST
+    0, // DIR_SOUTHEAST
+    1, // DIR_NORTHWEST
+    1, // DIR_NORTHEAST
+};
+const u8 gFishingNoCatchDirectionAnimNums[] = {
+    4, // DIR_NONE
+    4, // DIR_SOUTH
+    5, // DIR_NORTH
+    6, // DIR_WEST
+    7, // DIR_EAST
+    4, // DIR_SOUTHWEST
+    4, // DIR_SOUTHEAST
+    5, // DIR_NORTHWEST
+    5, // DIR_NORTHEAST
+};
+const u8 gFishingBiteDirectionAnimNums[] = {
+    8,  // DIR_NONE
+    8,  // DIR_SOUTH
+    9,  // DIR_NORTH
+    10, // DIR_WEST
+    11, // DIR_EAST
+    8,  // DIR_SOUTHWEST
+    8,  // DIR_SOUTHEAST
+    9,  // DIR_NORTHWEST
+    9,  // DIR_NORTHEAST
+};
+const u8 gRunningDirectionAnimNums[] = {
+    20, // DIR_NONE
+    20, // DIR_SOUTH
+    21, // DIR_NORTH
+    22, // DIR_WEST
+    23, // DIR_EAST
+    20, // DIR_SOUTHWEST
+    20, // DIR_SOUTHEAST
+    21, // DIR_NORTHWEST
+    21, // DIR_NORTHEAST
+};
+
+const u8 gTrainerFacingDirectionMovementTypes[] = {
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_NONE
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTH
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTH
+    MOVEMENT_TYPE_FACE_LEFT,  // DIR_WEST
+    MOVEMENT_TYPE_FACE_RIGHT, // DIR_EAST
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHWEST
+    MOVEMENT_TYPE_FACE_DOWN,  // DIR_SOUTHEAST
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHWEST
+    MOVEMENT_TYPE_FACE_UP,    // DIR_NORTHEAST
+};
+
+bool8 (*const gOppositeDirectionBlockedMetatileFuncs[])(u8) = {
     MetatileBehavior_IsSouthBlocked,
     MetatileBehavior_IsNorthBlocked,
     MetatileBehavior_IsWestBlocked,
     MetatileBehavior_IsEastBlocked
 };
 
-bool8 (*const gUnknown_08375694[])(u8) = {
+bool8 (*const gDirectionBlockedMetatileFuncs[])(u8) = {
     MetatileBehavior_IsNorthBlocked,
     MetatileBehavior_IsSouthBlocked,
     MetatileBehavior_IsEastBlocked,
     MetatileBehavior_IsWestBlocked
 };
 
-const struct Coords16 gDirectionToVector[] = {
+const struct Coords16 gDirectionToVectors[] = {
     { 0,  0},
     { 0,  1},
     { 0, -1},
@@ -1843,35 +741,206 @@ const struct Coords16 gDirectionToVector[] = {
     { 1, -1}
 };
 
-const u8 gUnknown_083756C8[] = {0x00, 0x00, 0x01, 0x02, 0x03};
-const u8 gUnknown_083756CD[] = {0x04, 0x04, 0x05, 0x06, 0x07};
-const u8 gUnknown_083756D2[] = {0x08, 0x08, 0x09, 0x0A, 0x0B};
-const u8 gUnknown_083756D7[] = {0x15, 0x15, 0x16, 0x17, 0x18};
-const u8 gUnknown_083756DC[] = {0x29, 0x29, 0x2A, 0x2B, 0x2C};
-const u8 gUnknown_083756E1[] = {0x2D, 0x2D, 0x2E, 0x2F, 0x30};
-const u8 gUnknown_083756E6[] = {0x31, 0x31, 0x32, 0x33, 0x34};
-const u8 gUnknown_083756EB[] = {0x35, 0x35, 0x36, 0x37, 0x38};
-const u8 gUnknown_083756F0[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F};
-const u8 gUnknown_083756F5[] = {0x46, 0x46, 0x47, 0x48, 0x49};
-const u8 gUnknown_083756FA[] = {0x4B, 0x4B, 0x4A, 0x4D, 0x4C};
-const u8 gUnknown_083756FF[] = {0x42, 0x42, 0x43, 0x44, 0x45};
-const u8 gUnknown_08375704[] = {0x3A, 0x3A, 0x3B, 0x3C, 0x3D};
-const u8 gUnknown_08375709[] = {0x19, 0x19, 0x1A, 0x1B, 0x1C};
-const u8 gUnknown_0837570E[] = {0x1D, 0x1D, 0x1E, 0x1F, 0x20};
-const u8 gUnknown_08375713[] = {0x21, 0x21, 0x22, 0x23, 0x24};
-const u8 gUnknown_08375718[] = {0x25, 0x25, 0x26, 0x27, 0x28};
-const u8 gUnknown_0837571D[] = {0x62, 0x62, 0x63, 0x64, 0x65};
-const u8 gUnknown_08375722[] = {0x66, 0x66, 0x67, 0x68, 0x69};
-const u8 gUnknown_08375727[] = {0x6A, 0x6A, 0x6B, 0x6C, 0x6D};
-const u8 gUnknown_0837572C[] = {0x6E, 0x6E, 0x6F, 0x70, 0x71};
-const u8 gUnknown_08375731[] = {0x72, 0x72, 0x73, 0x74, 0x75};
-const u8 gUnknown_08375736[] = {0x76, 0x76, 0x77, 0x78, 0x79};
-const u8 gUnknown_0837573B[] = {0x7A, 0x7A, 0x7B, 0x7C, 0x7D};
-const u8 gUnknown_08375740[] = {0x7E, 0x7E, 0x7F, 0x80, 0x81};
-const u8 gUnknown_08375745[] = {0x82, 0x82, 0x83, 0x84, 0x85};
-const u8 gUnknown_0837574A[] = {0x86, 0x86, 0x87, 0x88, 0x89};
-
-const u8 gUnknown_0837574F[] = {2, 1, 4, 3, 8, 7, 6, 5};
+const u8 gFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_DOWN,
+    MOVEMENT_ACTION_FACE_UP,
+    MOVEMENT_ACTION_FACE_LEFT,
+    MOVEMENT_ACTION_FACE_RIGHT,
+};
+const u8 gWalkSlowMovementActions[] = {
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_SLOW_UP,
+    MOVEMENT_ACTION_WALK_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_SLOW_RIGHT,
+};
+const u8 gWalkNormalMovementActions[] = {
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_NORMAL_RIGHT,
+};
+const u8 gWalkFastMovementActions[] = {
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_FAST_UP,
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
+};
+const u8 gRideWaterCurrentMovementActions[] = {
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT,
+    MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT,
+};
+const u8 gWalkFastestMovementActions[] = {
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_FASTEST_RIGHT,
+};
+const u8 gSlideMovementActions[] = {
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_DOWN,
+    MOVEMENT_ACTION_SLIDE_UP,
+    MOVEMENT_ACTION_SLIDE_LEFT,
+    MOVEMENT_ACTION_SLIDE_RIGHT,
+};
+const u8 gPlayerRunMovementActions[] = {
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_DOWN,
+    MOVEMENT_ACTION_PLAYER_RUN_UP,
+    MOVEMENT_ACTION_PLAYER_RUN_LEFT,
+    MOVEMENT_ACTION_PLAYER_RUN_RIGHT,
+};
+const u8 gJump2MovementActions[] = {
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_DOWN,
+    MOVEMENT_ACTION_JUMP_2_UP,
+    MOVEMENT_ACTION_JUMP_2_LEFT,
+    MOVEMENT_ACTION_JUMP_2_RIGHT,
+};
+const u8 gJumpInPlaceMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT,
+};
+const u8 gJumpInPlaceTurnAroundMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT,
+    MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT,
+};
+const u8 gJumpMovementActions[] = {
+    MOVEMENT_ACITON_JUMP_DOWN,
+    MOVEMENT_ACITON_JUMP_DOWN,
+    MOVEMENT_ACITON_JUMP_UP,
+    MOVEMENT_ACITON_JUMP_LEFT,
+    MOVEMENT_ACITON_JUMP_RIGHT,
+};
+const u8 gJumpSpecialMovementActions[] = {
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_DOWN,
+    MOVEMENT_ACTION_JUMP_SPECIAL_UP,
+    MOVEMENT_ACTION_JUMP_SPECIAL_LEFT,
+    MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT,
+};
+const u8 gWalkInPlaceSlowMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT,
+};
+const u8 gWalkInPlaceNormalMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT,
+};
+const u8 gWalkInPlaceFastMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT,
+};
+const u8 gWalkInPlaceFastestMovementActions[] = {
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_DOWN,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_UP,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_LEFT,
+    MOVEMENT_ACTION_WALK_IN_PLACE_FASTEST_RIGHT,
+};
+const u8 gAcroWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT,
+};
+const u8 gAcroPopWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT,
+};
+const u8 gAcroEndWheelieFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT,
+};
+const u8 gAcroWheelieHopFaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT,
+};
+const u8 gAcroWheelieHopDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT,
+};
+const u8 gAcroWheelieJumpDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT,
+};
+const u8 gAcroWheelieInPlaceDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT,
+};
+const u8 gAcroPopWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT,
+};
+const u8 gAcroWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT,
+};
+const u8 gAcroEndWheelieMoveDirectionMovementActions[] = {
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT,
+    MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT,
+};
+
+const u8 gOppositeDirections[] = {
+    DIR_NORTH,
+    DIR_SOUTH,
+    DIR_EAST,
+    DIR_WEST,
+    DIR_NORTHEAST,
+    DIR_NORTHWEST,
+    DIR_SOUTHEAST,
+    DIR_SOUTHWEST
+};
 
 const u8 gUnknown_08375757[][4] = {
     {2, 1, 4, 3},
@@ -1887,291 +956,281 @@ const u8 gUnknown_08375767[][4] = {
     {3, 4, 2, 1}
 };
 
-#include "data/field_map_obj/anim_func_ptrs.h"
-
-// text
-
-extern void strange_npc_table_clear(void);
-extern void ClearPlayerAvatarInfo(void);
-extern void npc_load_two_palettes__no_record(u16, u8);
-extern void npc_load_two_palettes__and_record(u16, u8);
-extern void sub_8060388(s16, s16, s16 *, s16 *);
-void sub_80634D0(struct MapObject *, struct Sprite *);
-extern void pal_patch_for_npc(u16, u16);
-extern void CameraObjectReset1(void);
-
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
-extern u8 gReservedSpritePaletteCount;
-extern struct Camera gCamera;
+#include "data/field_event_obj/movement_action_func_tables.h"
 
 static u8 gUnknown_030005A4;
 static u16 gUnknown_030005A6;
 
-struct MapObject gMapObjects[16];
+extern struct LinkPlayerEventObject gLinkPlayerEventObjects[];
+extern u8 gReservedSpritePaletteCount;
+extern struct Camera gCamera;
+extern struct EventObject gEventObjects[16];
 #if DEBUG
 u8 gUnknown_Debug_03004BC0;
 #endif
 
-void npc_clear_ids_and_state(struct MapObject *mapObj)
+static void ClearEventObject(struct EventObject *eventObj)
 {
-    memset(mapObj, 0, sizeof(struct MapObject));
-    mapObj->localId = 0xFF;
-    mapObj->mapNum = 0xFF;
-    mapObj->mapGroup = 0xFF;
-    mapObj->animId = 0xFF;
+    memset(eventObj, 0, sizeof(struct EventObject));
+    eventObj->localId = 0xFF;
+    eventObj->mapNum = 0xFF;
+    eventObj->mapGroup = 0xFF;
+    eventObj->movementActionId = 0xFF;
 }
 
-void npcs_clear_ids_and_state(void)
+static void ClearAllEventObjects(void)
 {
     u8 i;
 
     for (i = 0; i < 16; i++)
-        npc_clear_ids_and_state(&gMapObjects[i]);
+        ClearEventObject(&gEventObjects[i]);
 #if DEBUG
-	gUnknown_Debug_03004BC0 = 0;
+    gUnknown_Debug_03004BC0 = 0;
 #endif
 }
 
 void sub_805AA98(void)
 {
-    strange_npc_table_clear();
-    npcs_clear_ids_and_state();
+    ClearLinkPlayerEventObjects();
+    ClearAllEventObjects();
     ClearPlayerAvatarInfo();
     sub_805AAB0();
 }
 
 void sub_805AAB0(void)
 {
-    u8 spriteId;
-
-    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 0x1F);
-
+    u8 spriteId = spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 0x1F);
     gSprites[spriteId].oam.affineMode = 1;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 0);
     gSprites[spriteId].invisible = 1;
 
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[21], 0, 0, 0x1F);
-
     gSprites[spriteId].oam.affineMode = 1;
     InitSpriteAffineAnim(&gSprites[spriteId]);
     StartSpriteAffineAnim(&gSprites[spriteId], 1);
     gSprites[spriteId].invisible = 1;
 }
 
-u8 sub_805AB54(void)
+u8 GetFirstInactiveEventObjectId(void)
 {
     u8 i;
-
     for (i = 0; i < 16; i++)
     {
-        if (!gMapObjects[i].active)
+        if (!gEventObjects[i].active)
             break;
     }
+
     return i;
 }
 
-u8 GetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+u8 GetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
     if (localId < 255)
-        return GetFieldObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroup);
+        return GetEventObjectIdByLocalIdAndMapInternal(localId, mapNum, mapGroup);
     else
-        return GetFieldObjectIdByLocalId(localId);
+        return GetEventObjectIdByLocalId(localId);
 }
 
-bool8 TryGetFieldObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *mapObjectId)
+bool8 TryGetEventObjectIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId)
 {
-    *mapObjectId = GetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup);
-    if (*mapObjectId == 16)
+    *eventObjectId = GetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup);
+    if (*eventObjectId == 16)
         return TRUE;
     else
         return FALSE;
 }
 
-u8 GetFieldObjectIdByXY(s16 x, s16 y)
+u8 GetEventObjectIdByXY(s16 x, s16 y)
 {
     u8 i;
-
     for (i = 0; i < 16; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y)
+        if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y)
             break;
     }
+
     return i;
 }
 
-u8 GetFieldObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup)
+u8 GetEventObjectIdByLocalIdAndMapInternal(u8 localId, u8 mapNum, u8 mapGroup)
 {
     u8 i;
-
     for (i = 0; i < 16; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId && gMapObjects[i].mapNum == mapNum && gMapObjects[i].mapGroup == mapGroup)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
             return i;
     }
+
     return 16;
 }
 
-u8 GetFieldObjectIdByLocalId(u8 localId)
+u8 GetEventObjectIdByLocalId(u8 localId)
 {
     u8 i;
-
     for (i = 0; i < 16; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == localId)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId)
             return i;
     }
+
     return 16;
 }
 
-u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 b, u8 c)
+u8 TryInitEventObjectStateFromTemplate(struct EventObjectTemplate *template, u8 mapNum, u8 mapGroup)
 {
-    struct MapObject *mapObj;
-    u8 var;
-    s16 r3;
-    s16 r2;
+    struct EventObject *eventObj;
+    u8 eventObjectId;
+    s16 initialX;
+    s16 initialY;
 
-    if (GetAvailableFieldObjectSlot(template->localId, b, c, &var) != 0)
+    if (GetAvailableEventObjectId(template->localId, mapNum, mapGroup, &eventObjectId) != 0)
         return 16;
-    mapObj = (void *)&gMapObjects[var];
-    npc_clear_ids_and_state((struct MapObject *)mapObj);
-    r3 = template->x + 7;
-    r2 = template->y + 7;
-    mapObj->active = TRUE;
-    mapObj->triggerGroundEffectsOnMove = TRUE;
-    mapObj->graphicsId = template->graphicsId;
-    mapObj->animPattern = template->movementType;
-    mapObj->localId = template->localId;
-    mapObj->mapNum = b;
-	asm("":::"r6");
-    mapObj->mapGroup = c;
-    mapObj->initialCoords.x = r3;
-    mapObj->initialCoords.y = r2;
-    mapObj->currentCoords.x = r3;
-    mapObj->currentCoords.y = r2;
-    mapObj->previousCoords.x = r3;
-    mapObj->previousCoords.y = r2;
-    mapObj->currentElevation = template->elevation;
-    mapObj->previousElevation = template->elevation;
-    mapObj->range.as_nybbles.x = template->unkA_0;
-    mapObj->range.as_nybbles.y = template->unkA_4;
-    mapObj->trainerType = template->unkC;
-    mapObj->trainerRange_berryTreeId = template->unkE;
-    mapObj->previousMovementDirection = gUnknown_0836DC09[template->movementType];
-    FieldObjectSetDirection((struct MapObject *)mapObj, mapObj->previousMovementDirection);
+
+    eventObj = (void *)&gEventObjects[eventObjectId];
+    ClearEventObject((struct EventObject *)eventObj);
+    initialX = template->x + 7;
+    initialY = template->y + 7;
+    eventObj->active = TRUE;
+    eventObj->triggerGroundEffectsOnMove = TRUE;
+    eventObj->graphicsId = template->graphicsId;
+    eventObj->movementType = template->movementType;
+    eventObj->localId = template->localId;
+    eventObj->mapNum = mapNum;
+    asm("":::"r6");
+    eventObj->mapGroup = mapGroup;
+    eventObj->initialCoords.x = initialX;
+    eventObj->initialCoords.y = initialY;
+    eventObj->currentCoords.x = initialX;
+    eventObj->currentCoords.y = initialY;
+    eventObj->previousCoords.x = initialX;
+    eventObj->previousCoords.y = initialY;
+    eventObj->currentElevation = template->elevation;
+    eventObj->previousElevation = template->elevation;
+    eventObj->range.as_nybbles.x = template->movementRangeX;
+    eventObj->range.as_nybbles.y = template->movementRangeY;
+    eventObj->trainerType = template->trainerType;
+    eventObj->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
+    eventObj->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
+    SetEventObjectDirection((struct EventObject *)eventObj, eventObj->previousMovementDirection);
     asm("":::"r5","r6");
-	FieldObjectHandleDynamicGraphicsId((struct MapObject *)mapObj);
-    if (gUnknown_0836DBBC[mapObj->animPattern] != 0)
+    SetEventObjectDynamicGraphicsId((struct EventObject *)eventObj);
+
+    if (gRangedMovementTypes[eventObj->movementType])
     {
-        if (mapObj->range.as_nybbles.x == 0)
-            mapObj->range.as_nybbles.x++;
-        if (mapObj->range.as_nybbles.y == 0)
-            mapObj->range.as_nybbles.y++;
+        // Ensure a ranged movement type has at least 1 tile of room to move.
+        if (eventObj->range.as_nybbles.x == 0)
+            eventObj->range.as_nybbles.x++;
+        if (eventObj->range.as_nybbles.y == 0)
+            eventObj->range.as_nybbles.y++;
     }
+
 #if DEBUG
-	gUnknown_Debug_03004BC0++;
+    gUnknown_Debug_03004BC0++;
 #endif
-    return var;
+    return eventObjectId;
 }
 
-u8 sub_805ADDC(u8 localId)
+u8 TryInitLocalEventObject(u8 localId)
 {
-    u8 objectCount;
+    u8 eventObjectCount;
     u8 i;
 
     if (gMapHeader.events == NULL)
         return 16;
-    objectCount = gMapHeader.events->mapObjectCount;
-    for (i = 0; i < objectCount; i++)
-    {
-        struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i];
 
+    eventObjectCount = gMapHeader.events->eventObjectCount;
+    for (i = 0; i < eventObjectCount; i++)
+    {
+        struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i];
         if (template->localId == localId && !FlagGet(template->flagId))
-            return InitFieldObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+            return TryInitEventObjectStateFromTemplate(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
+
     return 16;
 }
 
-u8 GetAvailableFieldObjectSlot(u16 a, u8 b, u8 c, u8 *d)
+u8 GetAvailableEventObjectId(u16 localId, u8 mapNum, u8 mapGroup, u8 *eventObjectId)
 {
     u8 i = 0;
 
-    for (i = 0; i < 16 && gMapObjects[i].active; i++)
+    for (i = 0; i < 16 && gEventObjects[i].active; i++)
     {
-        if (gMapObjects[i].localId == a && gMapObjects[i].mapNum == b && gMapObjects[i].mapGroup == c)
+        if (gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
             return 1;
     }
     if (i >= 16)
         return 1;
-    *d = i;
+    *eventObjectId = i;
     for (; i < 16; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].localId == a && gMapObjects[i].mapNum == b && gMapObjects[i].mapGroup == c)
+        if (gEventObjects[i].active && gEventObjects[i].localId == localId && gEventObjects[i].mapNum == mapNum && gEventObjects[i].mapGroup == mapGroup)
             return 1;
     }
     return 0;
 }
 
-void RemoveFieldObject(struct MapObject *mapObject)
+void RemoveEventObject(struct EventObject *eventObject)
 {
-    mapObject->active = FALSE;
-    RemoveFieldObjectInternal(mapObject);
+    eventObject->active = FALSE;
+    RemoveEventObjectInternal(eventObject);
 #if DEBUG
-	gUnknown_Debug_03004BC0--;
+    gUnknown_Debug_03004BC0--;
 #endif
 }
 
-void RemoveFieldObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+void RemoveEventObjectByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
         return;
-    FlagSet(GetFieldObjectFlagIdByFieldObjectId(mapObjectId));
-    RemoveFieldObject(&gMapObjects[mapObjectId]);
+    FlagSet(GetEventObjectFlagIdByEventObjectId(eventObjectId));
+    RemoveEventObject(&gEventObjects[eventObjectId]);
 }
 
-void RemoveFieldObjectInternal(struct MapObject *mapObject)
+void RemoveEventObjectInternal(struct EventObject *eventObject)
 {
     struct SpriteFrameImage image;
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
 
     image.size = gfxInfo->size;
-    gSprites[mapObject->spriteId].images = &image;
-    DestroySprite(&gSprites[mapObject->spriteId]);
+    gSprites[eventObject->spriteId].images = &image;
+    DestroySprite(&gSprites[eventObject->spriteId]);
 }
 
-void npc_hide_all_but_player(void)
+void RemoveAllEventObjectsExceptPlayer(void)
 {
     u8 i;
 
     for (i = 0; i < 16; i++)
     {
-        if (i != gPlayerAvatar.mapObjectId)
-            RemoveFieldObject(&gMapObjects[i]);
+        if (i != gPlayerAvatar.eventObjectId)
+            RemoveEventObject(&gEventObjects[i]);
     }
 }
 
-u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, u8 c, u8 d, s16 e, s16 f)
+static u8 TrySetupEventObjectSprite(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     u8 spriteId;
-    const struct MapObjectGraphicsInfo *gfxInfo;
-    struct MapObject *mapObject;
+    const struct EventObjectGraphicsInfo *gfxInfo;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
 
-    mapObjectId = InitFieldObjectStateFromTemplate(mapObjTemplate, c, d);
-    if (mapObjectId == 16)
+    eventObjectId = TryInitEventObjectStateFromTemplate(eventObjTemplate, mapNum, mapGroup);
+    if (eventObjectId == 16)
         return 16;
 
-    mapObject = &gMapObjects[mapObjectId];
-    gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    eventObject = &gEventObjects[eventObjectId];
+    gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     if (gfxInfo->paletteSlot == 0)
         npc_load_two_palettes__no_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot);
     else if (gfxInfo->paletteSlot == 10)
         npc_load_two_palettes__and_record(gfxInfo->paletteTag1, gfxInfo->paletteSlot);
-    if (mapObject->animPattern == 0x4C)
-        mapObject->invisible = TRUE;
+
+    if (eventObject->movementType == MOVEMENT_TYPE_INVISIBLE)
+        eventObject->invisible = TRUE;
 
 #ifdef NONMATCHING
     sprTemplate->paletteTag = 0xFFFF;
@@ -2179,98 +1238,98 @@ u8 sub_805AFCC(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *
     *(u16 *)&sprTemplate->paletteTag = 0xFFFF;
 #endif
     spriteId = CreateSprite(sprTemplate, 0, 0, 0);
-    if (spriteId == 64)
+    if (spriteId == MAX_SPRITES)
     {
 #if DEBUG
         gUnknown_Debug_03004BC0--;
 #endif
-        gMapObjects[mapObjectId].active = FALSE;
+        gEventObjects[eventObjectId].active = FALSE;
         return 16;
     }
     sprite = &gSprites[spriteId];
-    sub_8060388(e + mapObject->currentCoords.x, f + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    sub_8060388(cameraDeltaX + eventObject->currentCoords.x, cameraDeltaY + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(gfxInfo->width >> 1);
     sprite->centerToCornerVecY = -(gfxInfo->height >> 1);
     sprite->pos1.x += 8;
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
     sprite->oam.paletteNum = gfxInfo->paletteSlot;
     sprite->coordOffsetEnabled = TRUE;
-    sprite->data[0] = mapObjectId;
-    mapObject->spriteId = spriteId;
-    mapObject->inanimate = gfxInfo->inanimate;
-    if (!mapObject->inanimate)
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
-    SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
-    sub_80634D0(mapObject, sprite);
-    return mapObjectId;
+    sprite->data[0] = eventObjectId;
+    eventObject->spriteId = spriteId;
+    eventObject->inanimate = gfxInfo->inanimate;
+    if (!eventObject->inanimate)
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
+    SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
+    UpdateEventObjectVisibility(eventObject, sprite);
+    return eventObjectId;
 }
 
-u8 SpawnFieldObject(struct MapObjectTemplate *mapObjTemplate, u8 b, u8 c, s16 d, s16 e)
+u8 TrySpawnEventObject(struct EventObjectTemplate *eventObjTemplate, u8 mapNum, u8 mapGroup, s16 cameraDeltaX, s16 cameraDeltaY)
 {
     struct SpriteTemplate spriteTemplate;
     const struct SubspriteTable *subspriteTables = NULL;
     struct SpriteFrameImage spriteFrameImage;
-    const struct MapObjectGraphicsInfo *gfxInfo;
-    u8 mapObjectId;
+    const struct EventObjectGraphicsInfo *gfxInfo;
+    u8 eventObjectId;
 
-    gfxInfo = GetFieldObjectGraphicsInfo(mapObjTemplate->graphicsId);
-    MakeObjectTemplateFromFieldObjectTemplate(mapObjTemplate, &spriteTemplate, &subspriteTables);
+    gfxInfo = GetEventObjectGraphicsInfo(eventObjTemplate->graphicsId);
+    MakeObjectTemplateFromEventObjectTemplate(eventObjTemplate, &spriteTemplate, &subspriteTables);
     spriteFrameImage.size = gfxInfo->size;
     spriteTemplate.images = &spriteFrameImage;
-    mapObjectId = sub_805AFCC(mapObjTemplate, &spriteTemplate, b, c, d, e);
-    if (mapObjectId == 16)
+    eventObjectId = TrySetupEventObjectSprite(eventObjTemplate, &spriteTemplate, mapNum, mapGroup, cameraDeltaX, cameraDeltaY);
+    if (eventObjectId == 16)
         return 16;
-    gSprites[gMapObjects[mapObjectId].spriteId].images = gfxInfo->images;
+    gSprites[gEventObjects[eventObjectId].spriteId].images = gfxInfo->images;
     if (subspriteTables != NULL)
-        SetSubspriteTables(&gSprites[gMapObjects[mapObjectId].spriteId], subspriteTables);
-    return mapObjectId;
+        SetSubspriteTables(&gSprites[gEventObjects[eventObjectId].spriteId], subspriteTables);
+    return eventObjectId;
 }
 
-u8 SpawnSpecialFieldObject(struct MapObjectTemplate *mapObjTemplate)
+u8 SpawnSpecialEventObject(struct EventObjectTemplate *eventObjTemplate)
 {
     s16 x;
     s16 y;
 
-    GetFieldObjectMovingCameraOffset(&x, &y);
-    return SpawnFieldObject(mapObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y);
+    GetEventObjectMovingCameraOffset(&x, &y);
+    return TrySpawnEventObject(eventObjTemplate, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, x, y);
 }
 
-u8 SpawnSpecialFieldObjectParametrized(u8 a, u8 b, u8 c, s16 d, s16 e, u8 f)
+u8 SpawnSpecialEventObjectParametrized(u8 graphicsId, u8 movementType, u8 localId, s16 x, s16 y, u8 elevation)
 {
-    struct MapObjectTemplate mapObjTemplate;
+    struct EventObjectTemplate eventObjTemplate;
 
-    d -= 7;
-    e -= 7;
-    mapObjTemplate.localId = c;
-    mapObjTemplate.graphicsId = a;
-    mapObjTemplate.unk2 = 0;
-    mapObjTemplate.x = d;
-    mapObjTemplate.y = e;
-    mapObjTemplate.elevation = f;
-    mapObjTemplate.movementType = b;
-    mapObjTemplate.unkA_0 = 0;
-    mapObjTemplate.unkA_4 = 0;
-    mapObjTemplate.unkC = 0;
-    mapObjTemplate.unkE = 0;
-    return SpawnSpecialFieldObject(&mapObjTemplate);
+    x -= 7;
+    y -= 7;
+    eventObjTemplate.localId = localId;
+    eventObjTemplate.graphicsId = graphicsId;
+    eventObjTemplate.unk2 = 0;
+    eventObjTemplate.x = x;
+    eventObjTemplate.y = y;
+    eventObjTemplate.elevation = elevation;
+    eventObjTemplate.movementType = movementType;
+    eventObjTemplate.movementRangeX = 0;
+    eventObjTemplate.movementRangeY = 0;
+    eventObjTemplate.trainerType = 0;
+    eventObjTemplate.trainerRange_berryTreeId = 0;
+    return SpawnSpecialEventObject(&eventObjTemplate);
 }
 
 u8 show_sprite(u8 a, u8 b, u8 c)
 {
-    struct MapObjectTemplate *r5;
+    struct EventObjectTemplate *r5;
     s16 x;
     s16 y;
 
-    r5 = GetFieldObjectTemplateByLocalIdAndMap(a, b, c);
+    r5 = GetEventObjectTemplateByLocalIdAndMap(a, b, c);
     if (r5 == NULL)
         return 16;
-    GetFieldObjectMovingCameraOffset(&x, &y);
-    return SpawnFieldObject(r5, b, c, x, y);
+    GetEventObjectMovingCameraOffset(&x, &y);
+    return TrySpawnEventObject(r5, b, c, x, y);
 }
 
-void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+void MakeObjectTemplateFromEventObjectGraphicsInfo(u16 graphicsId, void (*callback)(struct Sprite *), struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(graphicsId);
 
     sprTemplate->tileTag = gfxInfo->tileTag;
     sprTemplate->paletteTag = gfxInfo->paletteTag1;
@@ -2282,23 +1341,23 @@ void MakeObjectTemplateFromFieldObjectGraphicsInfo(u16 graphicsId, void (*callba
     *subspriteTables = gfxInfo->subspriteTables;
 }
 
-void MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 callbackIndex, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+void MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(u16 graphicsId, u16 movementType, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
 {
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, gUnknown_0836DA88[callbackIndex], sprTemplate, subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, sMovementTypeCallbacks[movementType], sprTemplate, subspriteTables);
 }
 
-void MakeObjectTemplateFromFieldObjectTemplate(struct MapObjectTemplate *mapObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
+void MakeObjectTemplateFromEventObjectTemplate(struct EventObjectTemplate *eventObjTemplate, struct SpriteTemplate *sprTemplate, const struct SubspriteTable **subspriteTables)
 {
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObjTemplate->graphicsId, mapObjTemplate->movementType, sprTemplate, subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObjTemplate->graphicsId, eventObjTemplate->movementType, sprTemplate, subspriteTables);
 }
 
-u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
+u8 AddPseudoEventObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority)
 {
     struct SpriteTemplate spriteTemplate;
     const struct SubspriteTable *subspriteTables;
     u8 spriteId;
 
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, callback, &spriteTemplate, &subspriteTables);
     if (spriteTemplate.paletteTag != 0xFFFF)
         sub_805BDF8(spriteTemplate.paletteTag);
     spriteId = CreateSprite(&spriteTemplate, x, y, subpriority);
@@ -2310,19 +1369,15 @@ u8 AddPseudoFieldObject(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
     return spriteId;
 }
 
-extern void sub_8064970(struct Sprite *);
-extern void sub_8060470(s16 *, s16 *, s16, s16);
-void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z);
-
 u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo;
+    const struct EventObjectGraphicsInfo *gfxInfo;
     struct SpriteTemplate spriteTemplate;
     const struct SubspriteTable *subspriteTables;
     u8 spriteId;
 
-    gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    MakeObjectTemplateFromFieldObjectGraphicsInfo(graphicsId, sub_8064970, &spriteTemplate, &subspriteTables);
+    gfxInfo = GetEventObjectGraphicsInfo(graphicsId);
+    MakeObjectTemplateFromEventObjectGraphicsInfo(graphicsId, UpdateEventObjectSpriteSubpriorityAndVisibility, &spriteTemplate, &subspriteTables);
 #ifdef NONMATCHING
     spriteTemplate.paletteTag = 0xFFFF;
 #else
@@ -2352,12 +1407,12 @@ u8 sub_805B410(u8 graphicsId, u8 b, s16 x, s16 y, u8 elevation, u8 direction)
         }
         InitObjectPriorityByZCoord(sprite, elevation);
         SetObjectSubpriorityByZCoord(elevation, sprite, 1);
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(direction));
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(direction));
     }
     return spriteId;
 }
 
-void sub_805B55C(s16 a, s16 b)
+void TrySpawnEventObjects(s16 cameraDeltaX, s16 cameraDeltaY)
 {
     u8 i;
 
@@ -2367,24 +1422,24 @@ void sub_805B55C(s16 a, s16 b)
         s16 sp8 = gSaveBlock1.pos.x + 17;
         s16 r10 = gSaveBlock1.pos.y;
         s16 spC = gSaveBlock1.pos.y + 16;
-        u8 objectCount = gMapHeader.events->mapObjectCount;
+        u8 objectCount = gMapHeader.events->eventObjectCount;
 
         for (i = 0; i < objectCount; i++)
         {
-            struct MapObjectTemplate *template = &gSaveBlock1.mapObjectTemplates[i];
+            struct EventObjectTemplate *template = &gSaveBlock1.eventObjectTemplates[i];
             s16 foo = template->x + 7;
             s16 bar = template->y + 7;
 
             if (r10 <= bar && spC >= bar && r9 <= foo && sp8 >= foo
              && !FlagGet(template->flagId))
-                SpawnFieldObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, a, b);
+                TrySpawnEventObject(template, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, cameraDeltaX, cameraDeltaY);
         }
     }
 }
 
-void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject);
+void RemoveEventObjectIfOutsideView(struct EventObject *eventObject);
 
-void RemoveFieldObjectsOutsideView(void)
+void RemoveEventObjectsOutsideView(void)
 {
     u8 i;
     u8 j;
@@ -2395,33 +1450,33 @@ void RemoveFieldObjectsOutsideView(void)
 
         for (j = 0, isActiveLinkPlayer = 0; j < 4; j++)
         {
-            if (gLinkPlayerMapObjects[j].active && i == gLinkPlayerMapObjects[j].mapObjId)
+            if (gLinkPlayerEventObjects[j].active && i == gLinkPlayerEventObjects[j].eventObjId)
                 isActiveLinkPlayer = TRUE;
         }
         if (!isActiveLinkPlayer)
         {
-            struct MapObject *mapObject = &gMapObjects[i];
+            struct EventObject *eventObject = &gEventObjects[i];
 
-            if (mapObject->active && !mapObject->isPlayer)
-                RemoveFieldObjectIfOutsideView(mapObject);
+            if (eventObject->active && !eventObject->isPlayer)
+                RemoveEventObjectIfOutsideView(eventObject);
         }
     }
 }
 
-void RemoveFieldObjectIfOutsideView(struct MapObject *mapObject)
+void RemoveEventObjectIfOutsideView(struct EventObject *eventObject)
 {
     s16 r7 = gSaveBlock1.pos.x - 2;
     s16 r5 = gSaveBlock1.pos.x + 17;
     s16 r4 = gSaveBlock1.pos.y;
     s16 r6 = gSaveBlock1.pos.y + 16;
 
-    if (mapObject->currentCoords.x >= r7 && mapObject->currentCoords.x <= r5
-     && mapObject->currentCoords.y >= r4 && mapObject->currentCoords.y <= r6)
+    if (eventObject->currentCoords.x >= r7 && eventObject->currentCoords.x <= r5
+     && eventObject->currentCoords.y >= r4 && eventObject->currentCoords.y <= r6)
         return;
-    if (mapObject->initialCoords.x >= r7 && mapObject->initialCoords.x <= r5
-     && mapObject->initialCoords.y >= r4 && mapObject->initialCoords.y <= r6)
+    if (eventObject->initialCoords.x >= r7 && eventObject->initialCoords.x <= r5
+     && eventObject->initialCoords.y >= r4 && eventObject->initialCoords.y <= r6)
         return;
-    RemoveFieldObject(mapObject);
+    RemoveEventObject(eventObject);
 }
 
 void sub_805B75C(u8, s16, s16);
@@ -2436,7 +1491,7 @@ void sub_805B710(u16 a, u16 b)
     ClearPlayerAvatarInfo();
     for (i = 0; i < 16; i++)
     {
-        if (gMapObjects[i].active)
+        if (gEventObjects[i].active)
         {
             sub_805B75C(i, a, b);
 #if DEBUG
@@ -2447,32 +1502,32 @@ void sub_805B710(u16 a, u16 b)
     sub_805AAB0();
 }
 
-extern void SetPlayerAvatarFieldObjectIdAndObjectId(u8, u8);
-extern void sub_805B914(struct MapObject *);
+extern void SetPlayerAvatarEventObjectIdAndObjectId(u8, u8);
+extern void sub_805B914(struct EventObject *);
 
-void sub_805B75C(u8 a, s16 b, s16 c)
+void sub_805B75C(u8 eventObjectId, s16 b, s16 c)
 {
     struct SpriteTemplate sp0;
     struct SpriteFrameImage sp18;
     const struct SubspriteTable *subspriteTables;
-    const struct MapObjectGraphicsInfo *gfxInfo;
-    struct MapObject *mapObject;
+    const struct EventObjectGraphicsInfo *gfxInfo;
+    struct EventObject *eventObject;
     u8 spriteId;
 
     #define i spriteId
     for (i = 0; i < 4; i++)
     {
-        if (gLinkPlayerMapObjects[i].active && a == gLinkPlayerMapObjects[i].mapObjId)
+        if (gLinkPlayerEventObjects[i].active && eventObjectId == gLinkPlayerEventObjects[i].eventObjId)
             return;
     }
     #undef i
 
-    mapObject = &gMapObjects[a];
+    eventObject = &gEventObjects[eventObjectId];
     asm("":::"r5");
     subspriteTables = NULL;
-    gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     sp18.size = gfxInfo->size;
-    MakeObjectTemplateFromFieldObjectGraphicsInfoWithCallbackIndex(mapObject->graphicsId, mapObject->animPattern, &sp0, &subspriteTables);
+    MakeObjectTemplateFromEventObjectGraphicsInfoWithCallbackIndex(eventObject->graphicsId, eventObject->movementType, &sp0, &subspriteTables);
     sp0.images = &sp18;
     *(u16 *)&sp0.paletteTag = 0xFFFF;
     if (gfxInfo->paletteSlot == 0)
@@ -2485,58 +1540,58 @@ void sub_805B75C(u8 a, s16 b, s16 c)
     {
         struct Sprite *sprite = &gSprites[spriteId];
 
-        sub_8060388(b + mapObject->currentCoords.x, c + mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+        sub_8060388(b + eventObject->currentCoords.x, c + eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
         sprite->centerToCornerVecX = -(gfxInfo->width >> 1);
         sprite->centerToCornerVecY = -(gfxInfo->height >> 1);
         sprite->pos1.x += 8;
         sprite->pos1.y += 16 + sprite->centerToCornerVecY;
         sprite->images = gfxInfo->images;
-        if (mapObject->animPattern == 11)
+        if (eventObject->movementType == MOVEMENT_TYPE_PLAYER)
         {
-            SetPlayerAvatarFieldObjectIdAndObjectId(a, spriteId);
-            mapObject->warpArrowSpriteId = sub_8126B54();
+            SetPlayerAvatarEventObjectIdAndObjectId(eventObjectId, spriteId);
+            eventObject->warpArrowSpriteId = sub_8126B54();
         }
         if (subspriteTables != NULL)
             SetSubspriteTables(sprite, subspriteTables);
         sprite->oam.paletteNum = gfxInfo->paletteSlot;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->data[0] = a;
-        mapObject->spriteId = spriteId;
-        if (!mapObject->inanimate && mapObject->animPattern != 11)
-            StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
-        sub_805B914(mapObject);
-        SetObjectSubpriorityByZCoord(mapObject->previousElevation, sprite, 1);
+        sprite->data[0] = eventObjectId;
+        eventObject->spriteId = spriteId;
+        if (!eventObject->inanimate && eventObject->movementType != MOVEMENT_TYPE_PLAYER)
+            StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObject->facingDirection));
+        sub_805B914(eventObject);
+        SetObjectSubpriorityByZCoord(eventObject->previousElevation, sprite, 1);
     }
 }
 
-void sub_805B914(struct MapObject *mapObject)
+void sub_805B914(struct EventObject *eventObject)
 {
-    mapObject->regularAnimActive = FALSE;
-    mapObject->triggerGroundEffectsOnMove = TRUE;
-    mapObject->hasShadow = FALSE;
-    mapObject->hasReflection = FALSE;
-    mapObject->inShortGrass = FALSE;
-    mapObject->inShallowFlowingWater = FALSE;
-    mapObject->inSandPile = FALSE;
-    mapObject->inHotSprings = FALSE;
-    FieldObjectClearAnim(mapObject);
+    eventObject->singleMovementActive = FALSE;
+    eventObject->triggerGroundEffectsOnMove = TRUE;
+    eventObject->hasShadow = FALSE;
+    eventObject->hasReflection = FALSE;
+    eventObject->inShortGrass = FALSE;
+    eventObject->inShallowFlowingWater = FALSE;
+    eventObject->inSandPile = FALSE;
+    eventObject->inHotSprings = FALSE;
+    EventObjectClearHeldMovement(eventObject);
 }
 
-void SetPlayerAvatarFieldObjectIdAndObjectId(u8 mapObjectId, u8 spriteId)
+void SetPlayerAvatarEventObjectIdAndObjectId(u8 eventObjectId, u8 spriteId)
 {
-    gPlayerAvatar.mapObjectId = mapObjectId;
+    gPlayerAvatar.eventObjectId = eventObjectId;
     gPlayerAvatar.spriteId = spriteId;
-    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gMapObjects[mapObjectId].graphicsId);
-    SetPlayerAvatarExtraStateTransition(gMapObjects[mapObjectId].graphicsId, 0x20);
+    gPlayerAvatar.gender = GetPlayerAvatarGenderByGraphicsId(gEventObjects[eventObjectId].graphicsId);
+    SetPlayerAvatarExtraStateTransition(gEventObjects[eventObjectId].graphicsId, 0x20);
 }
 
-void sub_805B980(struct MapObject *mapObject, u8 graphicsId)
+void sub_805B980(struct EventObject *eventObject, u8 graphicsId)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo;
+    const struct EventObjectGraphicsInfo *gfxInfo;
     struct Sprite *sprite;
 
-    gfxInfo = GetFieldObjectGraphicsInfo(graphicsId);
-    sprite = &gSprites[mapObject->spriteId];
+    gfxInfo = GetEventObjectGraphicsInfo(graphicsId);
+    sprite = &gSprites[eventObject->spriteId];
     if (gfxInfo->paletteSlot == 0)
         pal_patch_for_npc(gfxInfo->paletteTag1, gfxInfo->paletteSlot);
     if (gfxInfo->paletteSlot == 10)
@@ -2547,150 +1602,150 @@ void sub_805B980(struct MapObject *mapObject, u8 graphicsId)
     sprite->anims = gfxInfo->anims;
     sprite->subspriteTables = gfxInfo->subspriteTables;
     sprite->oam.paletteNum = gfxInfo->paletteSlot;
-    mapObject->inanimate = gfxInfo->inanimate;
-    mapObject->graphicsId = graphicsId;
-    sub_80603CC(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    eventObject->inanimate = gfxInfo->inanimate;
+    eventObject->graphicsId = graphicsId;
+    sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(gfxInfo->width >> 1);
     sprite->centerToCornerVecY = -(gfxInfo->height >> 1);
     sprite->pos1.x += 8;
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-    if (mapObject->trackedByCamera)
+    if (eventObject->trackedByCamera)
         CameraObjectReset1();
 }
 
 void unref_sub_805BA80(u8 localId, u8 mapNum, u8 mapGroup, u8 graphicsId)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        sub_805B980(&gMapObjects[mapObjectId], graphicsId);
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+        sub_805B980(&gEventObjects[eventObjectId], graphicsId);
 }
 
-void FieldObjectTurn(struct MapObject *mapObject, u8 direction)
+void EventObjectTurn(struct EventObject *eventObject, u8 direction)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    if (!mapObject->inanimate)
+    SetEventObjectDirection(eventObject, direction);
+    if (!eventObject->inanimate)
     {
-        StartSpriteAnim(&gSprites[mapObject->spriteId], FieldObjectDirectionToImageAnimId(mapObject->facingDirection));
-        SeekSpriteAnim(&gSprites[mapObject->spriteId], 0);
+        StartSpriteAnim(&gSprites[eventObject->spriteId], GetFaceDirectionAnimNum(eventObject->facingDirection));
+        SeekSpriteAnim(&gSprites[eventObject->spriteId], 0);
     }
 }
 
-void FieldObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
+void EventObjectTurnByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup, u8 direction)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        FieldObjectTurn(&gMapObjects[mapObjectId], direction);
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+        EventObjectTurn(&gEventObjects[eventObjectId], direction);
 }
 
 void unref_TurnPlayer(struct PlayerAvatar *player, u8 direction)
 {
-    FieldObjectTurn(&gMapObjects[player->mapObjectId], direction);
+    EventObjectTurn(&gEventObjects[player->eventObjectId], direction);
 }
 
-void get_berry_tree_graphics(struct MapObject *mapObject, struct Sprite *sprite)
+void get_berry_tree_graphics(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 treeStage;
     u8 treeId;
 
-    mapObject->invisible = TRUE;
+    eventObject->invisible = TRUE;
     sprite->invisible = TRUE;
-    treeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
+    treeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
     if (treeStage != 0)
     {
-        mapObject->invisible = FALSE;
+        eventObject->invisible = FALSE;
         sprite->invisible = FALSE;
-        treeId = GetBerryTypeByBerryTreeId(mapObject->trainerRange_berryTreeId) - 1;
+        treeId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1;
         treeStage--;
         if (treeId > 0x2B)
             treeId = 0;
-        sub_805B980(mapObject, gBerryTreeGraphicsIdTablePointers[treeId][treeStage]);
+        sub_805B980(eventObject, gBerryTreeGraphicsIdTablePointers[treeId][treeStage]);
         sprite->images = gBerryTreePicTablePointers[treeId];
         sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[treeId][treeStage];
         StartSpriteAnim(sprite, treeStage);
     }
 }
 
-const struct MapObjectGraphicsInfo *GetFieldObjectGraphicsInfo(u8 graphicsId)
+const struct EventObjectGraphicsInfo *GetEventObjectGraphicsInfo(u8 graphicsId)
 {
     if (graphicsId > 0xEF)
-        graphicsId = VarGetFieldObjectGraphicsId(graphicsId + 16);
+        graphicsId = VarGetEventObjectGraphicsId(graphicsId + 16);
     if (graphicsId > 0xD9)
         graphicsId = 5;
-    return gMapObjectGraphicsInfoPointers[graphicsId];
+    return gEventObjectGraphicsInfoPointers[graphicsId];
 }
 
-void FieldObjectHandleDynamicGraphicsId(struct MapObject *mapObject)
+void SetEventObjectDynamicGraphicsId(struct EventObject *eventObject)
 {
-    if (mapObject->graphicsId > 0xEF)
-        mapObject->graphicsId = VarGetFieldObjectGraphicsId(mapObject->graphicsId + 16);
+    if (eventObject->graphicsId > 0xEF)
+        eventObject->graphicsId = VarGetEventObjectGraphicsId(eventObject->graphicsId + 16);
 }
 
 void npc_by_local_id_and_map_set_field_1_bit_x20(u8 localId, u8 mapNum, u8 mapGroup, u8 d)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        gMapObjects[mapObjectId].invisible = d;
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+        gEventObjects[eventObjectId].invisible = d;
 }
 
-void FieldObjectGetLocalIdAndMap(struct MapObject *mapObject, void *localId, void *mapNum, void *mapGroup)
+void EventObjectGetLocalIdAndMap(struct EventObject *eventObject, void *localId, void *mapNum, void *mapGroup)
 {
-    *(u8 *)localId = mapObject->localId;
-    *(u8 *)mapNum = mapObject->mapNum;
-    *(u8 *)mapGroup = mapObject->mapGroup;
+    *(u8 *)localId = eventObject->localId;
+    *(u8 *)mapNum = eventObject->mapNum;
+    *(u8 *)mapGroup = eventObject->mapGroup;
 }
 
 void sub_805BCC0(s16 x, s16 y)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
-    mapObjectId = GetFieldObjectIdByXY(x, y);
-    if (mapObjectId != 16)
+    eventObjectId = GetEventObjectIdByXY(x, y);
+    if (eventObjectId != 16)
     {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->triggerGroundEffectsOnMove = TRUE;
     }
 }
 
 void sub_805BCF0(u8 localId, u8 mapNum, u8 mapGroup, u8 subpriority)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        mapObject = &gMapObjects[mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
-        mapObject->fixedPriority = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
+        eventObject->fixedPriority = TRUE;
         sprite->subpriority = subpriority;
     }
 }
 
 void sub_805BD48(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        mapObject = &gMapObjects[mapObjectId];
-        mapObject->fixedPriority = FALSE;
-        mapObject->triggerGroundEffectsOnMove = TRUE;
+        eventObject = &gEventObjects[eventObjectId];
+        eventObject->fixedPriority = FALSE;
+        eventObject->triggerGroundEffectsOnMove = TRUE;
     }
 }
 
 void sub_805BD90(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     struct Sprite *sprite;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        sprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+        sprite = &gSprites[gEventObjects[eventObjectId].spriteId];
         sprite->pos2.x = x;
         sprite->pos2.y = y;
     }
@@ -2704,9 +1759,9 @@ void gpu_pal_allocator_reset__manage_upper_four(void)
 
 void sub_805BDF8(u16 tag)
 {
-    u16 paletteIndex = FindFieldObjectPaletteIndexByTag(tag);
+    u16 paletteIndex = FindEventObjectPaletteIndexByTag(tag);
 
-    if (paletteIndex != 0x11FF)  //always happens. FindFieldObjectPaletteIndexByTag returns u8
+    if (paletteIndex != 0x11FF)  //always happens. FindEventObjectPaletteIndexByTag returns u8
         sub_805BE58(&gUnknown_0837377C[paletteIndex]);
 }
 
@@ -2726,12 +1781,12 @@ u8 sub_805BE58(const struct SpritePalette *palette)
         return LoadSpritePalette(palette);
 }
 
-void pal_patch_for_npc(u16 a, u16 b)
+void pal_patch_for_npc(u16 paletteTag, u16 paletteIndex)
 {
-    u8 var = b;
-    u8 paletteIndex = FindFieldObjectPaletteIndexByTag(a);
+    u8 index = paletteIndex;
+    u8 tagPaletteIndex = FindEventObjectPaletteIndexByTag(paletteTag);
 
-    LoadPalette(gUnknown_0837377C[paletteIndex].data, var * 16 + 0x100, 0x20);
+    LoadPalette(gUnknown_0837377C[tagPaletteIndex].data, index * 16 + 0x100, 0x20);
 }
 
 void pal_patch_for_npc_range(const u16 *arr, u8 b, u8 c)
@@ -2740,7 +1795,7 @@ void pal_patch_for_npc_range(const u16 *arr, u8 b, u8 c)
         pal_patch_for_npc(*arr, b);
 }
 
-u8 FindFieldObjectPaletteIndexByTag(u16 tag)
+u8 FindEventObjectPaletteIndexByTag(u16 tag)
 {
     u8 i;
 
@@ -2752,95 +1807,95 @@ u8 FindFieldObjectPaletteIndexByTag(u16 tag)
     return 0xFF;
 }
 
-void npc_load_two_palettes__no_record(u16 a, u8 b)
+void npc_load_two_palettes__no_record(u16 paletteTag, u8 paletteIndex)
 {
     u8 i;
 
-    pal_patch_for_npc(a, b);
+    pal_patch_for_npc(paletteTag, paletteIndex);
     for (i = 0; gUnknown_08373874[i].tag != 0x11FF; i++)
     {
-        if (gUnknown_08373874[i].tag == a)
+        if (gUnknown_08373874[i].tag == paletteTag)
         {
-            pal_patch_for_npc(gUnknown_08373874[i].data[gUnknown_030005A4], gUnknown_0830FD14[b]);
+            pal_patch_for_npc(gUnknown_08373874[i].data[gUnknown_030005A4], gUnknown_0830FD14[paletteIndex]);
             break;
         }
     }
 }
 
-void npc_load_two_palettes__and_record(u16 a, u8 b)
+void npc_load_two_palettes__and_record(u16 paletteTag, u8 paletteIndex)
 {
     u8 i;
 
-    gUnknown_030005A6 = a;
-    pal_patch_for_npc(a, b);
+    gUnknown_030005A6 = paletteTag;
+    pal_patch_for_npc(paletteTag, paletteIndex);
     for (i = 0; gUnknown_083738E4[i].tag != 0x11FF; i++)
     {
-        if (gUnknown_083738E4[i].tag == a)
+        if (gUnknown_083738E4[i].tag == paletteTag)
         {
-            pal_patch_for_npc(gUnknown_083738E4[i].data[gUnknown_030005A4], gUnknown_0830FD14[b]);
+            pal_patch_for_npc(gUnknown_083738E4[i].data[gUnknown_030005A4], gUnknown_0830FD14[paletteIndex]);
             break;
         }
     }
 }
 
-void unref_sub_805C014(struct MapObject *mapObject, s16 x, s16 y)
+void unref_sub_805C014(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = mapObject->currentCoords.x;
-    mapObject->previousCoords.y = mapObject->currentCoords.y;
-    mapObject->currentCoords.x += x;
-    mapObject->currentCoords.y += y;
+    eventObject->previousCoords.x = eventObject->currentCoords.x;
+    eventObject->previousCoords.y = eventObject->currentCoords.y;
+    eventObject->currentCoords.x += x;
+    eventObject->currentCoords.y += y;
 }
 
-void npc_coords_shift(struct MapObject *mapObject, s16 x, s16 y)
+void ShiftEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = mapObject->currentCoords.x;
-    mapObject->previousCoords.y = mapObject->currentCoords.y;
-    mapObject->currentCoords.x = x;
-    mapObject->currentCoords.y = y;
+    eventObject->previousCoords.x = eventObject->currentCoords.x;
+    eventObject->previousCoords.y = eventObject->currentCoords.y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
 }
 
-void npc_coords_set(struct MapObject *mapObject, s16 x, s16 y)
+void SetEventObjectCoords(struct EventObject *eventObject, s16 x, s16 y)
 {
-    mapObject->previousCoords.x = x;
-    mapObject->previousCoords.y = y;
-    mapObject->currentCoords.x = x;
-    mapObject->currentCoords.y = y;
+    eventObject->previousCoords.x = x;
+    eventObject->previousCoords.y = y;
+    eventObject->currentCoords.x = x;
+    eventObject->currentCoords.y = y;
 }
 
-void sub_805C058(struct MapObject *mapObject, s16 x, s16 y)
+void sub_805C058(struct EventObject *eventObject, s16 x, s16 y)
 {
-    struct Sprite *sprite = &gSprites[mapObject->spriteId];
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    struct Sprite *sprite = &gSprites[eventObject->spriteId];
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
 
-    npc_coords_set(mapObject, x, y);
-    sub_80603CC(mapObject->currentCoords.x, mapObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    SetEventObjectCoords(eventObject, x, y);
+    sub_80603CC(eventObject->currentCoords.x, eventObject->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
     sprite->centerToCornerVecX = -(gfxInfo->width >> 1);
     sprite->centerToCornerVecY = -(gfxInfo->height >> 1);
     sprite->pos1.x += 8;
     sprite->pos1.y += 16 + sprite->centerToCornerVecY;
-    sub_805B914(mapObject);
-    if (mapObject->trackedByCamera)
+    sub_805B914(eventObject);
+    if (eventObject->trackedByCamera)
         CameraObjectReset1();
 }
 
 void sub_805C0F8(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s16 y)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
         x += 7;
         y += 7;
-        sub_805C058(&gMapObjects[mapObjectId], x, y);
+        sub_805C058(&gEventObjects[eventObjectId], x, y);
     }
 }
 
-void npc_coords_shift_still(struct MapObject *mapObject)
+void ShiftStillEventObjectCoords(struct EventObject *eventObject)
 {
-    npc_coords_shift(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y);
+    ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
 }
 
-void UpdateFieldObjectCoordsForCameraUpdate(void)
+void UpdateEventObjectCoordsForCameraUpdate(void)
 {
     u8 i;
     s16 deltaX;
@@ -2852,68 +1907,65 @@ void UpdateFieldObjectCoordsForCameraUpdate(void)
         deltaY = gCamera.y;
         for (i = 0; i < 16; i++)
         {
-
-            if (gMapObjects[i].active)
+            if (gEventObjects[i].active)
             {
-                gMapObjects[i].initialCoords.x -= deltaX;
-                gMapObjects[i].initialCoords.y -= deltaY;
-                gMapObjects[i].currentCoords.x -= deltaX;
-                gMapObjects[i].currentCoords.y -= deltaY;
-                gMapObjects[i].previousCoords.x -= deltaX;
-                gMapObjects[i].previousCoords.y -= deltaY;
+                gEventObjects[i].initialCoords.x -= deltaX;
+                gEventObjects[i].initialCoords.y -= deltaY;
+                gEventObjects[i].currentCoords.x -= deltaX;
+                gEventObjects[i].currentCoords.y -= deltaY;
+                gEventObjects[i].previousCoords.x -= deltaX;
+                gEventObjects[i].previousCoords.y -= deltaY;
             }
         }
     }
 }
 
-bool8 FieldObjectDoesZCoordMatch(struct MapObject *, u8);
-
-u8 GetFieldObjectIdByXYZ(u16 x, u16 y, u8 z)
+u8 GetEventObjectIdByXYZ(u16 x, u16 y, u8 z)
 {
     u8 i;
 
     for (i = 0; i < 16; i++)
     {
-        if (gMapObjects[i].active && gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y
-         && FieldObjectDoesZCoordMatch(&gMapObjects[i], z))
+        if (gEventObjects[i].active && gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y
+         && EventObjectZCoordIsCompatible(&gEventObjects[i], z))
             return i;
     }
     return 16;
 }
 
-bool8 FieldObjectDoesZCoordMatch(struct MapObject *mapObject, u8 z)
+static bool8 EventObjectZCoordIsCompatible(struct EventObject *eventObject, u8 z)
 {
-    if (mapObject->currentElevation != 0 && z != 0
-     && mapObject->currentElevation != z)
+    if (eventObject->currentElevation != 0 && z != 0
+     && eventObject->currentElevation != z)
         return FALSE;
     else
         return TRUE;
 }
 
-void UpdateFieldObjectsForCameraUpdate(s16 x, s16 y)
+void UpdateEventObjectsForCameraUpdate(s16 cameraDeltaX, s16 cameraDeltaY)
 {
-    UpdateFieldObjectCoordsForCameraUpdate();
-    sub_805B55C(x, y);
-    RemoveFieldObjectsOutsideView();
+    UpdateEventObjectCoordsForCameraUpdate();
+    TrySpawnEventObjects(cameraDeltaX, cameraDeltaY);
+    RemoveEventObjectsOutsideView();
 }
 
 u8 AddCameraObject(u8 a)
 {
-    u8 spriteId = CreateSprite(&gSpriteTemplate_830FD24, 0, 0, 4);
+    u8 spriteId = CreateSprite(&gCameraSpriteTemplate, 0, 0, 4);
 
     gSprites[spriteId].invisible = TRUE;
     gSprites[spriteId].data[0] = a;
     return spriteId;
 }
 
-void ObjectCB_CameraObject(struct Sprite *sprite)
+static void ObjectCB_CameraObject(struct Sprite *sprite)
 {
     void (*cameraObjectFuncs[3])(struct Sprite *);
-    memcpy(cameraObjectFuncs, gCameraObjectFuncs, sizeof gCameraObjectFuncs);
+    memcpy(cameraObjectFuncs, gCameraObjectFuncs, sizeof(gCameraObjectFuncs));
     cameraObjectFuncs[sprite->data[1]](sprite);
 }
 
-void CameraObject_0(struct Sprite *sprite)
+static void CameraObject_0(struct Sprite *sprite)
 {
     sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
     sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
@@ -2922,7 +1974,7 @@ void CameraObject_0(struct Sprite *sprite)
     CameraObject_1(sprite);
 }
 
-void CameraObject_1(struct Sprite *sprite)
+static void CameraObject_1(struct Sprite *sprite)
 {
     s16 x = gSprites[sprite->data[0]].pos1.x;
     s16 y = gSprites[sprite->data[0]].pos1.y;
@@ -2933,7 +1985,7 @@ void CameraObject_1(struct Sprite *sprite)
     sprite->pos1.y = y;
 }
 
-void CameraObject_2(struct Sprite *sprite)
+static void CameraObject_2(struct Sprite *sprite)
 {
     sprite->pos1.x = gSprites[sprite->data[0]].pos1.x;
     sprite->pos1.y = gSprites[sprite->data[0]].pos1.y;
@@ -2945,7 +1997,7 @@ struct Sprite *FindCameraObject(void)
 {
     u8 i;
 
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < MAX_SPRITES; i++)
     {
         if (gSprites[i].inUse && gSprites[i].callback == ObjectCB_CameraObject)
             return &gSprites[i];
@@ -3028,86 +2080,84 @@ u8 obj_unfreeze(struct Sprite *src, s16 x, s16 y, u8 subpriority)
     return 64;
 }
 
-void FieldObjectSetDirection(struct MapObject *mapObject, u8 direction)
+void SetEventObjectDirection(struct EventObject *eventObject, u8 direction)
 {
-    mapObject->previousMovementDirection = mapObject->facingDirection;
-    if (!mapObject->facingDirectionLocked)
+    eventObject->previousMovementDirection = eventObject->facingDirection;
+    if (!eventObject->facingDirectionLocked)
     {
         s8 _direction = direction;  //needed for the asm to match
-        mapObject->facingDirection = _direction;
+        eventObject->facingDirection = _direction;
     }
-    mapObject->movementDirection = direction;
+    eventObject->movementDirection = direction;
 }
 
-u8 *GetFieldObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+u8 *GetEventObjectScriptPointerByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
+    struct EventObjectTemplate *template = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
 
     return template->script;
 }
 
-u8 *GetFieldObjectScriptPointerByFieldObjectId(u8 mapObjectId)
+u8 *GetEventObjectScriptPointerByEventObjectId(u8 eventObjectId)
 {
-    return GetFieldObjectScriptPointerByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
+    return GetEventObjectScriptPointerByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
 }
 
-u16 GetFieldObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+u16 GetEventObjectFlagIdByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    struct MapObjectTemplate *template = GetFieldObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
+    struct EventObjectTemplate *template = GetEventObjectTemplateByLocalIdAndMap(localId, mapNum, mapGroup);
 
     return template->flagId;
 }
 
-u16 GetFieldObjectFlagIdByFieldObjectId(u8 mapObjectId)
+u16 GetEventObjectFlagIdByEventObjectId(u8 eventObjectId)
 {
-    return GetFieldObjectFlagIdByLocalIdAndMap(gMapObjects[mapObjectId].localId, gMapObjects[mapObjectId].mapNum, gMapObjects[mapObjectId].mapGroup);
+    return GetEventObjectFlagIdByLocalIdAndMap(gEventObjects[eventObjectId].localId, gEventObjects[eventObjectId].mapNum, gEventObjects[eventObjectId].mapGroup);
 }
 
 u8 unref_sub_805C5D0(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
         return 0xFF;
     else
-        return gMapObjects[mapObjectId].trainerType;
+        return gEventObjects[eventObjectId].trainerType;
 }
 
-u8 unref_sub_805C60C(u8 mapObjectId)
+u8 unref_sub_805C60C(u8 eventObjectId)
 {
-    return gMapObjects[mapObjectId].trainerType;
+    return gEventObjects[eventObjectId].trainerType;
 }
 
 u8 unref_sub_805C624(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
         return 0xFF;
     else
-        return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+        return gEventObjects[eventObjectId].trainerRange_berryTreeId;
 }
 
-u8 FieldObjectGetBerryTreeId(u8 mapObjectId)
+u8 EventObjectGetBerryTreeId(u8 eventObjectId)
 {
-    return gMapObjects[mapObjectId].trainerRange_berryTreeId;
+    return gEventObjects[eventObjectId].trainerRange_berryTreeId;
 }
 
-struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8, struct MapObjectTemplate *, u8);
-
-struct MapObjectTemplate *GetFieldObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
+struct EventObjectTemplate *GetEventObjectTemplateByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup)
 {
     if (gSaveBlock1.location.mapNum == mapNum && gSaveBlock1.location.mapGroup == mapGroup)
-        return FindFieldObjectTemplateInArrayByLocalId(localId, gSaveBlock1.mapObjectTemplates, gMapHeader.events->mapObjectCount);
+        return FindEventObjectTemplateByLocalId(localId, gSaveBlock1.eventObjectTemplates, gMapHeader.events->eventObjectCount);
     else
     {
         struct MapHeader *mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum);
 
-        return FindFieldObjectTemplateInArrayByLocalId(localId, mapHeader->events->mapObjects, mapHeader->events->mapObjectCount);
+        return FindEventObjectTemplateByLocalId(localId, mapHeader->events->eventObjects, mapHeader->events->eventObjectCount);
     }
 }
 
-struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, struct MapObjectTemplate *templates, u8 count)
+static struct EventObjectTemplate *FindEventObjectTemplateByLocalId(u8 localId, struct EventObjectTemplate *templates, u8 count)
 {
     u8 i;
 
@@ -3119,47 +2169,47 @@ struct MapObjectTemplate *FindFieldObjectTemplateInArrayByLocalId(u8 localId, st
     return NULL;
 }
 
-struct MapObjectTemplate *sub_805C700(struct MapObject *mapObject)
+static struct EventObjectTemplate *GetBaseTemplateForEventObject(struct EventObject *eventObject)
 {
     s32 i;
 
-    if (mapObject->mapNum != gSaveBlock1.location.mapNum
-     || mapObject->mapGroup != gSaveBlock1.location.mapGroup)
+    if (eventObject->mapNum != gSaveBlock1.location.mapNum
+     || eventObject->mapGroup != gSaveBlock1.location.mapGroup)
         return NULL;
 
     for (i = 0; i < 64; i++)
     {
-        if (mapObject->localId == gSaveBlock1.mapObjectTemplates[i].localId)
-            return &gSaveBlock1.mapObjectTemplates[i];
+        if (eventObject->localId == gSaveBlock1.eventObjectTemplates[i].localId)
+            return &gSaveBlock1.eventObjectTemplates[i];
     }
     return NULL;
 }
 
-void sub_805C754(struct MapObject *mapObject)
+void OverrideTemplateCoordsForEventObject(struct EventObject *eventObject)
 {
-    struct MapObjectTemplate *template = sub_805C700(mapObject);
+    struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject);
 
     if (template != NULL)
     {
-        template->x = mapObject->currentCoords.x - 7;
-        template->y = mapObject->currentCoords.y - 7;
+        template->x = eventObject->currentCoords.x - 7;
+        template->y = eventObject->currentCoords.y - 7;
     }
 }
 
-void sub_805C774(struct MapObject *mapObject, u8 movementType)
+void OverrideMovementTypeForEventObject(struct EventObject *eventObject, u8 movementType)
 {
-    struct MapObjectTemplate *template = sub_805C700(mapObject);
+    struct EventObjectTemplate *template = GetBaseTemplateForEventObject(eventObject);
 
     if (template != NULL)
         template->movementType = movementType;
 }
 
-void sub_805C78C(u8 localId, u8 mapNum, u8 mapGroup)
+void TryOverrideTemplateCoordsForEventObject(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        sub_805C754(&gMapObjects[mapObjectId]);
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+        OverrideTemplateCoordsForEventObject(&gEventObjects[eventObjectId]);
 }
 
 void sub_805C7C4(u8 a)
@@ -3187,44 +2237,37 @@ u16 npc_paltag_by_palslot(u8 a)
     return 0x11FF;
 }
 
-fieldmap_object_null_cb(sub_805C884, sub_805C8A8);
-fieldmap_object_cb(sub_805C8AC, sub_805C8D0, gUnknown_08375224);
+movement_type_empty_callback(MovementType_None);
+movement_type_def(MovementType_WanderAround, gMovementTypeFuncs_WanderAround);
 
-u8 sub_805C8F0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-extern void FieldObjectSetRegularAnim(struct MapObject *, struct Sprite *, u8);
-
-u8 sub_805C904(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-extern u8 FieldObjectExecRegularAnim(struct MapObject *, struct Sprite *);
-void sub_8064820(struct Sprite *, s16);
-
-u8 sub_805C930(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) == 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0)
     {
         return 0;
     }
-    sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
     sprite->data[1] = 3;
     return 1;
 }
 
-extern u8 sub_8064824(struct Sprite *);
-
-u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) != 0)
+    if (WaitForMovementDelay(sprite))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3232,42 +2275,40 @@ u8 sub_805C96C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-extern u8 sub_805FF20(struct MapObject *, u8);
-
-u8 sub_805C98C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_08375240, 4);
+    memcpy(directions, gStandardDirections, 4);
     direction = directions[Random() & 3];
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 5;
-    if (sub_805FF20(mapObject, direction) != 0)
+    if (GetCollisionInDirection(eventObject, direction) != 0)
     {
         sprite->data[1] = 1;
     }
     return 1;
 }
 
-u8 sub_805C9D8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step5(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
 }
 
-u8 sub_805CA08(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderAround_Step6(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0)
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-u8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
+u8 EventObjectIsTrainerAndCloseToPlayer(struct EventObject *eventObject)
 {
     s16 x;
     s16 y;
@@ -3281,17 +2322,17 @@ u8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
     {
         return 0;
     }
-    if (mapObject->trainerType != 1 && mapObject->trainerType != 3)
+    if (eventObject->trainerType != 1 && eventObject->trainerType != 3)
     {
         return 0;
     }
     PlayerGetDestCoords(&x, &y);
-    objx = mapObject->currentCoords.x;
-    objy = mapObject->currentCoords.y;
-    minx = objx - mapObject->trainerRange_berryTreeId;
-    miny = objy - mapObject->trainerRange_berryTreeId;
-    maxx = objx + mapObject->trainerRange_berryTreeId;
-    maxy = objy + mapObject->trainerRange_berryTreeId;
+    objx = eventObject->currentCoords.x;
+    objy = eventObject->currentCoords.y;
+    minx = objx - eventObject->trainerRange_berryTreeId;
+    miny = objy - eventObject->trainerRange_berryTreeId;
+    maxx = objx + eventObject->trainerRange_berryTreeId;
+    maxy = objy + eventObject->trainerRange_berryTreeId;
     if (minx > x || maxx < x || miny > y || maxy < y)
     {
         return 0;
@@ -3299,241 +2340,236 @@ u8 FieldObjectIsTrainerAndCloseToPlayer(struct MapObject *mapObject)
     return 1;
 }
 
-u8 sub_805CAAC(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetVectorDirection(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    if (a2 > a3)
+    u8 direction;
+    if (xAbs > yAbs)
     {
-        dirn = DIR_EAST;
-        if (a0 < 0)
+        direction = DIR_EAST;
+        if (x < 0)
         {
-            dirn = DIR_WEST;
+            direction = DIR_WEST;
         }
     }
     else
     {
-        dirn = DIR_SOUTH;
-        if (a1 < 0)
+        direction = DIR_SOUTH;
+        if (y < 0)
         {
-            dirn = DIR_NORTH;
+            direction = DIR_NORTH;
         }
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CADC(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_SouthNorth(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = DIR_SOUTH;
-    if (a1 < 0)
+    u8 direction;
+    direction = DIR_SOUTH;
+    if (y < 0)
     {
-        dirn = DIR_NORTH;
+        direction = DIR_NORTH;
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CAEC(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_WestEast(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = DIR_EAST;
-    if (a0 < 0)
+    u8 direction;
+    direction = DIR_EAST;
+    if (x < 0)
     {
-        dirn = DIR_WEST;
+        direction = DIR_WEST;
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CB00(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_WestNorth(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_SOUTH)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_SOUTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
-        if (dirn == DIR_EAST)
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
+        if (direction == DIR_EAST)
         {
-            dirn = DIR_NORTH;
+            direction = DIR_NORTH;
         }
     }
-    else if (dirn == DIR_EAST)
+    else if (direction == DIR_EAST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
-        if (dirn == DIR_SOUTH)
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
+        if (direction == DIR_SOUTH)
         {
-            dirn = DIR_NORTH;
+            direction = DIR_NORTH;
         }
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CB5C(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_EastNorth(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_SOUTH)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_SOUTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
-        if (dirn == DIR_WEST)
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
+        if (direction == DIR_WEST)
         {
-            dirn = DIR_NORTH;
+            direction = DIR_NORTH;
         }
     }
-    else if (dirn == DIR_WEST)
+    else if (direction == DIR_WEST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
-        if (dirn == DIR_SOUTH)
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
+        if (direction == DIR_SOUTH)
         {
-            dirn = DIR_NORTH;
+            direction = DIR_NORTH;
         }
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CBB8(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_WestSouth(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_NORTH)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_NORTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
-        if (dirn == DIR_EAST)
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
+        if (direction == DIR_EAST)
         {
-            dirn = DIR_SOUTH;
+            direction = DIR_SOUTH;
         }
     }
-    else if (dirn == DIR_EAST)
+    else if (direction == DIR_EAST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
-        if (dirn == DIR_NORTH)
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
+        if (direction == DIR_NORTH)
         {
-            dirn = DIR_SOUTH;
+            direction = DIR_SOUTH;
         }
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CC14(s16 a0, s16 a1, s16 a2, s16 a3) {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_NORTH)
+u8 GetLimitedVectorDirection_EastSouth(s16 x, s16 y, s16 xAbs, s16 yAbs) {
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_NORTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
-        if (dirn == DIR_WEST)
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
+        if (direction == DIR_WEST)
         {
-            dirn = DIR_SOUTH;
+            direction = DIR_SOUTH;
         }
     }
-    else if (dirn == DIR_WEST)
+    else if (direction == DIR_WEST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
-        if (dirn == DIR_NORTH)
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
+        if (direction == DIR_NORTH)
         {
-            dirn = DIR_SOUTH;
+            direction = DIR_SOUTH;
         }
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CC70(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_SouthNorthWest(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_EAST)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_EAST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CCAC(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_SouthNorthEast(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_WEST)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_WEST)
     {
-        dirn = sub_805CADC(a0, a1, a2, a3);
+        direction = GetLimitedVectorDirection_SouthNorth(x, y, xAbs, yAbs);
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CCE8(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_NorthWestEast(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_SOUTH)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_SOUTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CD24(s16 a0, s16 a1, s16 a2, s16 a3)
+u8 GetLimitedVectorDirection_SouthWestEast(s16 x, s16 y, s16 xAbs, s16 yAbs)
 {
-    u8 dirn;
-    dirn = sub_805CAAC(a0, a1, a2, a3);
-    if (dirn == DIR_NORTH)
+    u8 direction;
+    direction = GetVectorDirection(x, y, xAbs, yAbs);
+    if (direction == DIR_NORTH)
     {
-        dirn = sub_805CAEC(a0, a1, a2, a3);
+        direction = GetLimitedVectorDirection_WestEast(x, y, xAbs, yAbs);
     }
-    return dirn;
+    return direction;
 }
 
-u8 sub_805CD60(struct MapObject *mapObject, u8 a1)
+u8 TryGetTrainerEncounterDirection(struct EventObject *eventObject, u8 directionFuncIndex)
 {
-    s16 x;
-    s16 y;
-    s16 x2;
-    s16 y2;
-    if (!FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    s16 x, y;
+    s16 xAbs, yAbs;
+    if (!EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         return 0;
     }
     PlayerGetDestCoords(&x, &y);
-    x -= mapObject->currentCoords.x;
-    y -= mapObject->currentCoords.y;
-    x2 = x;
-    y2 = y;
-    if (x2 < 0)
-    {
-        x2 = -x2;
-    }
-    if (y2 < 0)
-    {
-        y2 = -y2;
-    }
-    return gUnknown_08375244[a1](x, y, x2, y2);
+    x -= eventObject->currentCoords.x;
+    y -= eventObject->currentCoords.y;
+    xAbs = x;
+    yAbs = y;
+    if (xAbs < 0)
+        xAbs = -xAbs;
+    if (yAbs < 0)
+        yAbs = -yAbs;
+
+    return gGetVectorDirectionFuncs[directionFuncIndex](x, y, xAbs, yAbs);
 }
 
-fieldmap_object_cb(sub_805CDE8, sub_805CE0c, gUnknown_08375270);
+movement_type_def(MovementType_LookAround, gMovementTypeFuncs_LookAround);
 
-u8 sub_805CE2C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_LookAround_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805CE40(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_LookAround_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805CE6C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_LookAround_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805CEB0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_LookAround_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3541,51 +2577,50 @@ u8 sub_805CEB0(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805CEE0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_LookAround_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_08375240, 4);
-    direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
-    {
+    memcpy(directions, gStandardDirections, 4);
+    direction = TryGetTrainerEncounterDirection(eventObject, 0);
+    if (direction == DIR_NONE)
         direction = directions[Random() & 3];
-    }
-    FieldObjectSetDirection(mapObject, direction);
+
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805CF28, sub_805CF4C, gUnknown_08375284);
+movement_type_def(MovementType_WanderUpAndDown, gMovementTypeFuncs_WanderUpAndDown);
 
-u8 sub_805CF6C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805CF80(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805CFAC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) == 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0)
     {
         return 0;
     }
-    sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
     sprite->data[1] = 3;
     return 1;
 }
 
-u8 sub_805CFE8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) != 0)
+    if (WaitForMovementDelay(sprite))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3593,69 +2628,69 @@ u8 sub_805CFE8(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D008(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_083752A0, 2);
+    memcpy(directions, gUpAndDownDirections, 2);
     direction = directions[Random() & 1];
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 5;
-    if (sub_805FF20(mapObject, direction) != 0)
+    if (GetCollisionInDirection(eventObject, direction) != 0)
     {
         sprite->data[1] = 1;
     }
     return 1;
 }
 
-u8 sub_805D054(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step5(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
 }
 
-u8 sub_805D084(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderUpAndDown_Step6(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0)
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-fieldmap_object_cb(sub_805D0AC, sub_805D0D0, gUnknown_083752A4);
+movement_type_def(MovementType_WanderLeftAndRight, gMovementTypeFuncs_WanderLeftAndRight);
 
-u8 sub_805D0F0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D104(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805D130(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) == 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) == 0)
     {
         return 0;
     }
-    sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
+    SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
     sprite->data[1] = 3;
     return 1;
 }
 
-u8 sub_805D16C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) != 0)
+    if (WaitForMovementDelay(sprite))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3663,52 +2698,52 @@ u8 sub_805D16C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D18C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_083752C0, 2);
+    memcpy(directions, gLeftAndRightDirections, 2);
     direction = directions[Random() & 1];
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 5;
-    if (sub_805FF20(mapObject, direction) != 0)
+    if (GetCollisionInDirection(eventObject, direction) != 0)
     {
         sprite->data[1] = 1;
     }
     return 1;
 }
 
-u8 sub_805D1D8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step5(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(mapObject->movementDirection));
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(eventObject->movementDirection));
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 6;
     return 1;
 }
 
-u8 sub_805D208(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WanderLeftAndRight_Step6(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0)
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-fieldmap_object_cb(sub_805D230, sub_805D254, gUnknown_083752C4);
+movement_type_def(MovementType_FaceDirection, gMovementTypeFuncs_FaceDirection);
 
-u8 sub_805D274(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDirection_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite) != 0)
+    if (EventObjectExecSingleMovementAction(eventObject, sprite) != 0)
     {
         sprite->data[1] = 2;
         return 1;
@@ -3716,44 +2751,42 @@ u8 sub_805D2A0(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D2C0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDirection_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->regularAnimActive = 0;
+    eventObject->singleMovementActive = 0;
     return 0;
 }
 
-u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite);
-
-void FieldObjectCB_BerryTree(struct Sprite *sprite)
+void MovementType_BerryTreeGrowth(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data[0]];
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[sprite->data[0]];
     if (!(sprite->data[7] & 1))
     {
-        get_berry_tree_graphics(mapObject, sprite);
+        get_berry_tree_graphics(eventObject, sprite);
         sprite->data[7] |= 1;
     }
-    meta_step(mapObject, sprite, sub_805D314);
+    UpdateEventObjectCurrentMovement(eventObject, sprite, MovementType_BerryTreeGrowth_Callback);
 }
 
-u8 sub_805D314(struct MapObject *mapObject, struct Sprite *sprite)
+static u8 MovementType_BerryTreeGrowth_Callback(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return gUnknown_083752D0[sprite->data[1]](mapObject, sprite);
+    return gMovementTypeFuncs_BerryTreeGrowth[sprite->data[1]](eventObject, sprite);
 }
 
-u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_BerryTreeGrowth_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 berryTreeStage;
-    npc_reset(mapObject, sprite);
-    mapObject->invisible = 1;
+    ClearEventObjectMovement(eventObject, sprite);
+    eventObject->invisible = 1;
     sprite->invisible = 1;
-    berryTreeStage = GetStageByBerryTreeId(mapObject->trainerRange_berryTreeId);
+    berryTreeStage = GetStageByBerryTreeId(eventObject->trainerRange_berryTreeId);
     if (!berryTreeStage)
     {
         if (!(sprite->data[7] & 4) && sprite->animNum == 4)
         {
-            gFieldEffectArguments[0] = mapObject->currentCoords.x;
-            gFieldEffectArguments[1] = mapObject->currentCoords.y;
+            gFieldEffectArguments[0] = eventObject->currentCoords.x;
+            gFieldEffectArguments[1] = eventObject->currentCoords.y;
             gFieldEffectArguments[2] = sprite->subpriority - 1;
             gFieldEffectArguments[3] = sprite->oam.priority;
             FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
@@ -3761,7 +2794,7 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
         }
         return 0;
     }
-    mapObject->invisible = 0;
+    eventObject->invisible = 0;
     sprite->invisible = 0;
     berryTreeStage--;
     if (sprite->animNum != berryTreeStage)
@@ -3769,15 +2802,15 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
         sprite->data[1] = 2;
         return 1;
     }
-    get_berry_tree_graphics(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, 0x39);
+    get_berry_tree_graphics(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_BerryTreeGrowth_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
         sprite->data[1] = 0;
         return 1;
@@ -3785,28 +2818,28 @@ u8 sub_805D3EC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_BerryTreeGrowth_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->regularAnimActive = 1;
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 3;
     sprite->data[2] = 0;
     sprite->data[7] |= 2;
-    gFieldEffectArguments[0] = mapObject->currentCoords.x;
-    gFieldEffectArguments[1] = mapObject->currentCoords.y;
+    gFieldEffectArguments[0] = eventObject->currentCoords.x;
+    gFieldEffectArguments[1] = eventObject->currentCoords.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_BERRY_TREE_GROWTH_SPARKLE);
     return 1;
 }
 
-u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_BerryTreeGrowth_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[2]++;
-    mapObject->invisible = ((sprite->data[2] & 0x2) >> 1);
+    eventObject->invisible = ((sprite->data[2] & 0x2) >> 1);
     sprite->animPaused = 1;
     if (sprite->data[2] > 64)
     {
-        get_berry_tree_graphics(mapObject, sprite);
+        get_berry_tree_graphics(eventObject, sprite);
         sprite->data[1] = 4;
         sprite->data[2] = 0;
         return 1;
@@ -3814,10 +2847,10 @@ u8 sub_805D458(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_BerryTreeGrowth_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[2]++;
-    mapObject->invisible = ((sprite->data[2] & 0x2) >> 1);
+    eventObject->invisible = ((sprite->data[2] & 0x2) >> 1);
     sprite->animPaused = 1;
     if (sprite->data[2] > 64)
     {
@@ -3828,36 +2861,36 @@ u8 sub_805D4A8(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-fieldmap_object_cb(sub_805D4F4, sub_805D518, gUnknown_083752E4);
+movement_type_def(MovementType_FaceDownAndUp, gMovementTypeFuncs_FaceDownAndUp);
 
-u8 sub_805D538(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D54C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805D578(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndUp_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805D5BC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndUp_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3865,51 +2898,51 @@ u8 sub_805D5BC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D5EC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndUp_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_083752A0, 2);
-    direction = sub_805CD60(mapObject, 1);
-    if (direction == 0)
+    memcpy(directions, gUpAndDownDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 1);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805D634, sub_805D658, gUnknown_083752F8);
+movement_type_def(MovementType_FaceLeftAndRight, gMovementTypeFuncs_FaceLeftAndRight);
 
-u8 sub_805D678(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D68C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805D6B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837520C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysMedium[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805D6FC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3917,51 +2950,51 @@ u8 sub_805D6FC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D72C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_083752C0, 2);
-    direction = sub_805CD60(mapObject, 2);
-    if (direction == 0)
+    memcpy(directions, gLeftAndRightDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 2);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805D774, sub_805D798, gUnknown_0837530C);
+movement_type_def(MovementType_FaceUpAndLeft, gMovementTypeFuncs_FaceUpAndLeft);
 
-u8 sub_805D7B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D7CC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805D7F8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805D83C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -3969,51 +3002,51 @@ u8 sub_805D83C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D86C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_08375320, 2);
-    direction = sub_805CD60(mapObject, 3);
-    if (direction == 0)
+    memcpy(directions, gUpAndLeftDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 3);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805D8B4, sub_805D8D8, gUnknown_08375324);
+movement_type_def(MovementType_FaceUpAndRight, gMovementTypeFuncs_FaceUpAndRight);
 
-u8 sub_805D8F8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805D90C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805D938(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805D97C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4021,51 +3054,51 @@ u8 sub_805D97C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805D9AC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_08375338, 2);
-    direction = sub_805CD60(mapObject, 4);
-    if (direction == 0)
+    memcpy(directions, gUpAndRightDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 4);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805D9F4, sub_805DA18, gUnknown_0837533C);
+movement_type_def(MovementType_FaceDownAndLeft, gMovementTypeFuncs_FaceDownAndLeft);
 
-u8 sub_805DA38(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805DA4C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805DA78(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805DABC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4073,51 +3106,51 @@ u8 sub_805DABC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805DAEC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_08375350, 2);
-    direction = sub_805CD60(mapObject, 5);
-    if (direction == 0)
+    memcpy(directions, gDownAndLeftDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 5);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805DB34, sub_805DB58, gUnknown_08375354);
+movement_type_def(MovementType_FaceDownAndRight, gMovementTypeFuncs_FaceDownAndRight);
 
-u8 sub_805DB78(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805DB8C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805DBB8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805DBFC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4125,51 +3158,51 @@ u8 sub_805DBFC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805DC2C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[2];
-    memcpy(directions, gUnknown_08375368, 2);
-    direction = sub_805CD60(mapObject, 6);
-    if (direction == 0)
+    memcpy(directions, gDownAndRightDirections, 2);
+    direction = TryGetTrainerEncounterDirection(eventObject, 6);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 1];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805DC74, sub_805DC98, gUnknown_0837536C);
+movement_type_def(MovementType_FaceDownUpAndLeft, gMovementTypeFuncs_FaceDownUpAndLeft);
 
-u8 sub_805DCB8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805DCCC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805DCF8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndLeft_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805DD3C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndLeft_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4177,51 +3210,51 @@ u8 sub_805DD3C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805DD6C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndLeft_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_08375380, 4);
-    direction = sub_805CD60(mapObject, 7);
-    if (direction == 0)
+    memcpy(directions, gDownUpAndLeftDirections, 4);
+    direction = TryGetTrainerEncounterDirection(eventObject, 7);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805DDB4, sub_805DDD8, gUnknown_08375384);
+movement_type_def(MovementType_FaceDownUpAndRight, gMovementTypeFuncs_FaceDownUpAndRight);
 
-u8 sub_805DDF8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805DE0C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805DE38(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805DE7C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4229,51 +3262,51 @@ u8 sub_805DE7C(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805DEAC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownUpAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_08375398, 4);
-    direction = sub_805CD60(mapObject, 8);
-    if (direction == 0)
+    memcpy(directions, gDownUpAndRightDirections, 4);
+    direction = TryGetTrainerEncounterDirection(eventObject, 8);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805DEF4, sub_805DF18, gUnknown_0837539C);
+movement_type_def(MovementType_FaceUpLeftAndRight, gMovementTypeFuncs_FaceUpLeftAndRight);
 
-u8 sub_805DF38(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805DF4C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805DF78(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805DFBC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4281,51 +3314,51 @@ u8 sub_805DFBC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805DFEC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceUpLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_083753B0, 4);
-    direction = sub_805CD60(mapObject, 9);
-    if (direction == 0)
+    memcpy(directions, gUpLeftAndRightDirections, 4);
+    direction = TryGetTrainerEncounterDirection(eventObject, 9);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805E034, sub_805E058, gUnknown_083753B4);
+movement_type_def(MovementType_FaceDownLeftAndRight, gMovementTypeFuncs_FaceDownLeftAndRight);
 
-u8 sub_805E078(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownLeftAndRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805E08C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownLeftAndRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805E0B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownLeftAndRight_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, gUnknown_0837521C[Random() & 3]);
-        mapObject->regularAnimActive = 0;
+        SetMovementDelay(sprite, gMovementDelaysShort[Random() & 3]);
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805E0FC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownLeftAndRight_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 4;
         return 1;
@@ -4333,826 +3366,820 @@ u8 sub_805E0FC(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805E12C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_FaceDownLeftAndRight_Step4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[4];
-    memcpy(directions, gUnknown_083753C8, 4);
-    direction = sub_805CD60(mapObject, 10);
-    if (direction == 0)
+    memcpy(directions, gDownLeftAndRightDirections, 4);
+    direction = TryGetTrainerEncounterDirection(eventObject, 10);
+    if (direction == DIR_NONE)
     {
         direction = directions[Random() & 3];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805E174, sub_805E198, gUnknown_083753CC);
+movement_type_def(MovementType_RotateCounterclockwise, gMovementTypeFuncs_RotateCounterclockwise);
 
-u8 sub_805E1B8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateCounterclockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805E1E4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateCounterclockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, 0x30);
+        SetMovementDelay(sprite, 48);
         sprite->data[1] = 2;
     }
     return 0;
 }
 
-u8 sub_805E208(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateCounterclockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805E234(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateCounterclockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[5];
-    memcpy(directions, gUnknown_083753DC, 5);
-    direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
+    memcpy(directions, gCounterclockwiseDirections, 5);
+    direction = TryGetTrainerEncounterDirection(eventObject, 0);
+    if (direction == DIR_NONE)
     {
-        direction = directions[mapObject->facingDirection];
+        direction = directions[eventObject->facingDirection];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 0;
     return 1;
 }
 
-fieldmap_object_cb(sub_805E278, sub_803E29C, gUnknown_083753E4);
+movement_type_def(MovementType_RotateClockwise, gMovementTypeFuncs_RotateClockwise);
 
-u8 sub_805E2BC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateClockwise_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805E2E8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateClockwise_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        sub_8064820(sprite, 0x30);
+        SetMovementDelay(sprite, 0x30);
         sprite->data[1] = 2;
     }
     return 0;
 }
 
-u8 sub_805E30C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateClockwise_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064824(sprite) || FieldObjectIsTrainerAndCloseToPlayer(mapObject))
+    if (WaitForMovementDelay(sprite) || EventObjectIsTrainerAndCloseToPlayer(eventObject))
     {
         sprite->data[1] = 3;
     }
     return 0;
 }
 
-u8 sub_805E338(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RotateClockwise_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
     u8 directions[5];
-    memcpy(directions, gUnknown_083753F4, 5);
-    direction = sub_805CD60(mapObject, 0);
-    if (direction == 0)
+    memcpy(directions, gClockwiseDirections, 5);
+    direction = TryGetTrainerEncounterDirection(eventObject, 0);
+    if (direction == DIR_NONE)
     {
-        direction = directions[mapObject->facingDirection];
+        direction = directions[eventObject->facingDirection];
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 0;
     return 1;
 }
 
-fieldmap_object_cb(sub_805E37C, sub_805E3A0, gUnknown_083753FC);
+movement_type_def(MovementType_WalkBackAndForth, gMovementTypeFuncs_WalkBackAndForth);
 
-u8 sub_805E3C0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkBackAndForth_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805E3D4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkBackAndForth_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 direction;
-    direction = gUnknown_0836DC09[mapObject->animPattern];
-    if (mapObject->directionSequenceIndex != 0)
+    direction = gInitialMovementTypeFacingDirections[eventObject->movementType];
+    if (eventObject->directionSequenceIndex != 0)
     {
         direction = GetOppositeDirection(direction);
     }
-    FieldObjectSetDirection(mapObject, direction);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805E40C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkBackAndForth_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    u8 v0;
-    u8 goSpeed0AnimId;
-    if (mapObject->directionSequenceIndex && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    u8 collisionState;
+    u8 movementActionId;
+    if (eventObject->directionSequenceIndex && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 0;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
+        eventObject->directionSequenceIndex = 0;
+        SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
     }
-    v0 = sub_805FF20(mapObject, mapObject->movementDirection);
-    goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection);
-    if (v0 == 1)
+    collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+    if (collisionState == 1)
     {
-        mapObject->directionSequenceIndex ++;
-        FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-        goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection);
-        v0 = sub_805FF20(mapObject, mapObject->movementDirection);
+        eventObject->directionSequenceIndex++;
+        SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+        movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+        collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
     }
-    if (v0 != 0)
+    if (collisionState != 0)
     {
-        goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection);
+        movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection);
     }
-    FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId);
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, movementActionId);
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 3;
     return 1;
 }
 
-u8 sub_805E4C4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkBackAndForth_Step3(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-u8 sub_805E4EC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequence_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 MoveFieldObjectInNextDirectionInSequence(struct MapObject *mapObject, struct Sprite *sprite, u8 *directionSequence)
+u8 MoveNextDirectionInSequence(struct EventObject *eventObject, struct Sprite *sprite, u8 *directionSequence)
 {
-    u8 v0;
-    u8 goSpeed0AnimId;
-    if (mapObject->directionSequenceIndex == 3 && mapObject->initialCoords.x == mapObject->currentCoords.x && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    u8 collisionState;
+    u8 movementActionId;
+    if (eventObject->directionSequenceIndex == 3 && eventObject->initialCoords.x == eventObject->currentCoords.x && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 0;
+        eventObject->directionSequenceIndex = 0;
     }
-    FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]);
-    goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection);
-    v0 = sub_805FF20(mapObject, mapObject->movementDirection);
-    if (v0 == 1)
+    SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]);
+    movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+    collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
+    if (collisionState == 1)
     {
-        mapObject->directionSequenceIndex++;
-        FieldObjectSetDirection(mapObject, directionSequence[mapObject->directionSequenceIndex]);
-        goSpeed0AnimId = GetGoSpeed0AnimId(mapObject->movementDirection);
-        v0 = sub_805FF20(mapObject, mapObject->movementDirection);
+        eventObject->directionSequenceIndex++;
+        SetEventObjectDirection(eventObject, directionSequence[eventObject->directionSequenceIndex]);
+        movementActionId = GetWalkNormalMovementAction(eventObject->movementDirection);
+        collisionState = GetCollisionInDirection(eventObject, eventObject->movementDirection);
     }
-    if (v0 != 0)
+    if (collisionState != 0)
     {
-        goSpeed0AnimId = GetStepInPlaceDelay16AnimId(mapObject->facingDirection);
+        movementActionId = GetWalkInPlaceNormalMovementAction(eventObject->facingDirection);
     }
-    FieldObjectSetRegularAnim(mapObject, sprite, goSpeed0AnimId);
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, movementActionId);
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 2;
     return 1;
 }
 
-u8 sub_805E5B4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequence_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-fieldmap_object_cb(sub_805E5DC, sub_805E600, gUnknown_0837540C);
+movement_type_def(MovementType_WalkSequenceUpRightLeftDown, gMovementTypeFuncs_WalkSequenceUpRightLeftDown);
 
-u8 sub_805E620(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpRightLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375418, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gUpRightLeftDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E668, sub_805E68C, gUnknown_0837541C);
+movement_type_def(MovementType_WalkSequenceRightLeftDownUp, gMovementTypeFuncs_WalkSequenceRightLeftDownUp);
 
-u8 sub_805E6AC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightLeftDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375428, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gRightLeftDownUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E6F4, sub_805E718, gUnknown_0837542C);
+movement_type_def(MovementType_WalkSequenceDownUpRightLeft, gMovementTypeFuncs_WalkSequenceDownUpRightLeft);
 
-u8 sub_805E738(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownUpRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375438, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gDownUpRightLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E780, sub_805E7A4, gUnknown_0837543C);
+movement_type_def(MovementType_WalkSequenceLeftDownUpRight, gMovementTypeFuncs_WalkSequenceLeftDownUpRight);
 
-u8 sub_805E7C4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftDownUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375448, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gLeftDownUpRightDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
+movement_type_def(MovementType_WalkSequenceUpLeftRightDown, gMovementTypeFuncs_WalkSequenceUpLeftRightDown);
 
-
-fieldmap_object_cb(sub_805E80C, sub_805E830, gUnknown_0837544C);
-
-u8 sub_805E850(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpLeftRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375458, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gUpLeftRightDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E898, sub_805E8BC, gUnknown_0837545C);
+movement_type_def(MovementType_WalkSequenceLeftRightDownUp, gMovementTypeFuncs_WalkSequenceLeftRightDownUp);
 
-u8 sub_805E8DC(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftRightDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375468, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gLeftRightDownUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E924, sub_805E948, gUnknown_0837546C);
+movement_type_def(MovementType_WalkSequenceDownUpLeftRight, gMovementTypeFuncs_WalkSequenceDownUpLeftRight);
 
-u8 sub_805E968(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownUpLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375240, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gStandardDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805E9B0, sub_805E9D4, gUnknown_08375478);
+movement_type_def(MovementType_WalkSequenceRightDownUpLeft, gMovementTypeFuncs_WalkSequenceRightDownUpLeft);
 
-u8 sub_805E9F4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightDownUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375484, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gRightDownUpLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EA3C, sub_805EA60, gUnknown_08375488);
+movement_type_def(MovementType_WalkSequenceLeftUpDownRight, gMovementTypeFuncs_WalkSequenceLeftUpDownRight);
 
-u8 sub_805EA80(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftUpDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375494, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gLeftUpDownRightDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EAC8, sub_805EAEC, gUnknown_08375498);
+movement_type_def(MovementType_WalkSequenceUpDownRightLeft, gMovementTypeFuncs_WalkSequenceUpDownRightLeft);
 
-u8 sub_805EB0C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpDownRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754A4, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gUpDownRightLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EB54, sub_805EB78, gUnknown_083754A8);
+movement_type_def(MovementType_WalkSequenceRightLeftUpDown, gMovementTypeFuncs_WalkSequenceRightLeftUpDown);
 
-u8 sub_805EB98(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightLeftUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754B4, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gRightLeftUpDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EBE0, sub_805EC04, gUnknown_083754B8);
+movement_type_def(MovementType_WalkSequenceDownRightLeftUp, gMovementTypeFuncs_WalkSequenceDownRightLeftUp);
 
-u8 sub_805EC24(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownRightLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754C4, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gDownRightLeftUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EC6C, sub_805EC90, gUnknown_083754C8);
+movement_type_def(MovementType_WalkSequenceRightUpDownLeft, gMovementTypeFuncs_WalkSequenceRightUpDownLeft);
 
-u8 sub_805ECB0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightUpDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754D4, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gRightUpDownLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805ECF8, sub_805ED1C, gUnknown_083754D8);
+movement_type_def(MovementType_WalkSequenceUpDownLeftRight, gMovementTypeFuncs_WalkSequenceUpDownLeftRight);
 
-u8 sub_805ED3C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpDownLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754E4, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gUpDownLeftRightDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805ED84, sub_805EDA8, gUnknown_083754E8);
+movement_type_def(MovementType_WalkSequenceLeftRightUpDown, gMovementTypeFuncs_WalkSequenceLeftRightUpDown);
 
-u8 sub_805EDC8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftRightUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_083754F4, 4);
-    if (mapObject->directionSequenceIndex == 1 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gLeftRightUpDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 1 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 2;
+        eventObject->directionSequenceIndex = 2;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EE10, sub_805EE34, gUnknown_083754F8);
+movement_type_def(MovementType_WalkSequenceDownLeftRightUp, gMovementTypeFuncs_WalkSequenceDownLeftRightUp);
 
-u8 sub_805EE54(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownLeftRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375504, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gDownLeftRightUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EE9C, sub_805EEC0, gUnknown_08375508);
+movement_type_def(MovementType_WalkSequenceUpLeftDownRight, gMovementTypeFuncs_WalkSequenceUpLeftDownRight);
 
-u8 sub_805EEE0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpLeftDownRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375514, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gUpLeftDownRightDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EF28, sub_805EF4C, gUnknown_08375518);
+movement_type_def(MovementType_WalkSequenceDownRightUpLeft, gMovementTypeFuncs_WalkSequenceDownRightUpLeft);
 
-u8 sub_805EF6C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownRightUpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375524, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gDownRightUpLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805EFB4, sub_805EFD8, gUnknown_08375528);
+movement_type_def(MovementType_WalkSequenceLeftDownRightUp, gMovementTypeFuncs_WalkSequenceLeftDownRightUp);
 
-u8 sub_805EFF8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftDownRightUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375534, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gLeftDownRightUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805F040, sub_805F064, gUnknown_08375538);
+movement_type_def(MovementType_WalkSequenceRightUpLeftDown, gMovementTypeFuncs_WalkSequenceRightUpLeftDown);
 
-u8 sub_805F084(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightUpLeftDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375544, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gRightUpLeftDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805F0CC, sub_805F0F0, gUnknown_08375548);
+movement_type_def(MovementType_WalkSequenceUpRightDownLeft, gMovementTypeFuncs_WalkSequenceUpRightDownLeft);
 
-u8 sub_805F110(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceUpRightDownLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375554, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gUpRightDownLeftDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805F158, sub_805F17C, gUnknown_08375558);
+movement_type_def(MovementType_WalkSequenceDownLeftUpRight, gMovementTypeFuncs_WalkSequenceDownLeftUpRight);
 
-u8 sub_805F19C(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceDownLeftUpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375564, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.y == mapObject->currentCoords.y)
+    memcpy(directions, gDownLeftUpRightDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.y == eventObject->currentCoords.y)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805F1E4, sub_805F208, gUnknown_08375568);
+movement_type_def(MovementType_WalkSequenceLeftUpRightDown, gMovementTypeFuncs_WalkSequenceLeftUpRightDown);
 
-u8 sub_805F228(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceLeftUpRightDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375574, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gLeftUpRightDownDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 }
 
-fieldmap_object_cb(sub_805F270, sub_805F294, gUnknown_08375578);
+movement_type_def(MovementType_WalkSequenceRightDownLeftUp, gMovementTypeFuncs_WalkSequenceRightDownLeftUp);
 
-u8 sub_805F2B4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkSequenceRightDownLeftUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 directions[4];
-    memcpy(directions, gUnknown_08375584, 4);
-    if (mapObject->directionSequenceIndex == 2 && mapObject->initialCoords.x == mapObject->currentCoords.x)
+    memcpy(directions, gRightDownLeftUpDirections, 4);
+    if (eventObject->directionSequenceIndex == 2 && eventObject->initialCoords.x == eventObject->currentCoords.x)
     {
-        mapObject->directionSequenceIndex = 3;
+        eventObject->directionSequenceIndex = 3;
     }
-    return MoveFieldObjectInNextDirectionInSequence(mapObject, sprite, directions);
+    return MoveNextDirectionInSequence(eventObject, sprite, directions);
 };
 
-fieldmap_object_cb(sub_805F2FC, sub_805F320, gUnknown_08375588);
+movement_type_def(MovementType_CopyPlayer, gMovementTypeFuncs_CopyPlayer);
 
-u8 mss_npc_reset_oampriv3_1_unk2_unk3(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_CopyPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    if (mapObject->directionSequenceIndex == 0)
+    ClearEventObjectMovement(eventObject, sprite);
+    if (eventObject->directionSequenceIndex == 0)
     {
-        mapObject->directionSequenceIndex = player_get_direction_lower_nybble();
+        eventObject->directionSequenceIndex = GetPlayerFacingDirection();
     }
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805F364(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_CopyPlayer_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
     {
         return 0;
     }
-    return gUnknown_08375594[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), NULL);
+    return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), NULL);
 }
 
-u8 sub_805F3C4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_CopyPlayer_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
-        mapObject->regularAnimActive = 0;
+        eventObject->singleMovementActive = 0;
         sprite->data[1] = 1;
     }
     return 0;
 }
 
-bool8 sub_805F3EC(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8))
+bool8 CopyablePlayerMovement_None(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     return 0;
 }
 
-bool8 sub_805F3F0(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8))
+bool8 CopyablePlayerMovement_FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, a2)));
-    mapObject->regularAnimActive = 1;
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, playerDirection)));
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 2;
     return 1;
 }
 
-bool8 sub_805F438(struct MapObject *mapObject, struct Sprite *sprite, u8 a2, bool8 a3(u8))
+bool8 CopyablePlayerMovement_GoSpeed0(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
-    direction = a2;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetGoSpeed0AnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (a3 != NULL && !a3(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = playerDirection;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkNormalMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = 1;
+    eventObject->singleMovementActive = 1;
     sprite->data[1] = 2;
     return 1;
 }
 
-bool8 sub_805F4F0(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 CopyablePlayerMovement_GoSpeed1(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_8060744(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_805F5A8(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 CopyablePlayerMovement_GoSpeed2(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_806079C(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkFastestMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_805F660(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 CopyablePlayerMovement_Slide(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_80607C8(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, GetSlideMovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 cph_IM_DIFFERENT(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 cph_IM_DIFFERENT(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_806084C(direction));
-    mapObject->regularAnimActive = TRUE;
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectSetSingleMovement(eventObject, sprite, GetJumpInPlaceMovementAction(direction));
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 sub_805F760(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 CopyablePlayerMovement_GoSpeed4(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    FieldObjectMoveDestCoords(mapObject, direction, &x, &y);
-    FieldObjectSetRegularAnim(mapObject, sprite, sub_80608A4(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    EventObjectMoveDestCoords(eventObject, direction, &x, &y);
+    EventObjectSetSingleMovement(eventObject, sprite, sub_80608A4(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-bool8 oac_hopping(struct MapObject *mapObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCB(u8))
+bool8 CopyablePlayerMovement_Jump(struct EventObject *eventObject, struct Sprite *sprite, u8 playerDirection, bool8 tileCallback(u8))
 {
     u32 direction;
     s16 x;
     s16 y;
 
     direction = playerDirection;
-    direction = state_to_direction(gUnknown_0836DC09[mapObject->animPattern], mapObject->directionSequenceIndex, direction);
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
-    sub_8060320(direction, &x, &y, 2, 2);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetJumpLedgeAnimId(direction));
-    if (npc_block_way(mapObject, x, y, direction) || (tileCB != NULL && !tileCB(MapGridGetMetatileBehaviorAt(x, y))))
+    direction = state_to_direction(gInitialMovementTypeFacingDirections[eventObject->movementType], eventObject->directionSequenceIndex, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    MoveCoordsInDirection(direction, &x, &y, 2, 2);
+    EventObjectSetSingleMovement(eventObject, sprite, GetJump2MovementAction(direction));
+    if (GetCollisionAtCoords(eventObject, x, y, direction) || (tileCallback != NULL && !tileCallback(MapGridGetMetatileBehaviorAt(x, y))))
     {
-        FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(direction));
+        EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(direction));
     }
-    mapObject->regularAnimActive = TRUE;
+    eventObject->singleMovementActive = TRUE;
     sprite->data[1] = 2;
     return TRUE;
 }
 
-fieldmap_object_cb(sub_805F8E0, sub_805F904, gUnknown_083755C0);
+movement_type_def(MovementType_CopyPlayerInGrass, gMovementTypeFuncs_CopyPlayerInGrass);
 
-u8 mss_08062EA4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_CopyPlayerInGrass_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gMapObjects[gPlayerAvatar.mapObjectId].animId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
+    if (gEventObjects[gPlayerAvatar.eventObjectId].movementActionId == 0xFF || gPlayerAvatar.tileTransitionState == T_TILE_CENTER)
     {
         return 0;
     }
-    return gUnknown_08375594[player_get_x22()](mapObject, sprite, player_get_direction_upper_nybble(), MetatileBehavior_IsPokeGrass);
+    return gCopyPlayerMovementFuncs[PlayerGetCopyableMovement()](eventObject, sprite, GetPlayerMovementDirection(), MetatileBehavior_IsPokeGrass);
 }
 
-u8 sub_805F9F8(struct MapObject *, struct Sprite *);
-
-void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
+void MovementType_TreeDisguise(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && sprite->data[7] == 0))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && sprite->data[7] == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
-        mapObject->directionSequenceIndex = 1;
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_TREE_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
         sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8);
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
 }
 
-u8 sub_805F9F8(struct MapObject *mapObject, struct Sprite *sprite)
+static u8 MovementType_Disguise_Callback(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     return 0;
 }
 
-void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
+void MovementType_MountainDisguise(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[sprite->data[0]];
-    if (mapObject->directionSequenceIndex == 0 || (mapObject->directionSequenceIndex == 1 && sprite->data[7] == 0))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[sprite->data[0]];
+    if (eventObject->directionSequenceIndex == 0 || (eventObject->directionSequenceIndex == 1 && sprite->data[7] == 0))
     {
-        FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-        mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
-        mapObject->directionSequenceIndex = 1;
+        EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_MOUNTAIN_DISGUISE);
+        eventObject->directionSequenceIndex = 1;
         sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805F9F8);
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Disguise_Callback);
 }
 
-u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite);
-
-void FieldObjectCB_Hidden1(struct Sprite *sprite)
+void MovementType_Hidden(struct Sprite *sprite)
 {
     if (sprite->data[7] == 0)
     {
-        gMapObjects[sprite->data[0]].fixedPriority = 1;
+        gEventObjects[sprite->data[0]].fixedPriority = 1;
         sprite->subspriteMode = 2;
         sprite->oam.priority = 3;
         sprite->data[7] ++;
     }
-    meta_step(&gMapObjects[sprite->data[0]], sprite, sub_805FAD8);
+    UpdateEventObjectCurrentMovement(&gEventObjects[sprite->data[0]], sprite, MovementType_Hidden_Callback);
 }
 
-u8 sub_805FAD8(struct MapObject *mapObject, struct Sprite *sprite)
+static u8 MovementType_Hidden_Callback(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return gUnknown_083755CC[sprite->data[1]](mapObject, sprite);
+    return gMovementTypeFuncs_Hidden[sprite->data[1]](eventObject, sprite);
 }
 
-u8 sub_805FAF8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_Hidden_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
+    ClearEventObjectMovement(eventObject, sprite);
     return 0;
 }
 
-u8 sub_805FB04(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
         sprite->data[1] = 0;
     }
     return 0;
 }
 
-fieldmap_object_cb(sub_805FB20, sub_805FB44, gUnknown_083755D0);
+movement_type_def(MovementType_WalkInPlace, gMovementTypeFuncs_WalkInPlace);
 
-u8 sub_805FB64(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_WalkInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay16AnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceNormalMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805FB90, sub_805FBB4, gUnknown_083755D8);
+movement_type_def(MovementType_JogInPlace, gMovementTypeFuncs_JogInPlace);
 
-u8 sub_805FBD4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_JogInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay8AnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805FC00, sub_805FC24, gUnknown_083755E0);
+movement_type_def(MovementType_RunInPlace, gMovementTypeFuncs_RunInPlace);
 
-u8 sub_805FC44(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_RunInPlace_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection));
     sprite->data[1] = 1;
     return 1;
 }
 
-fieldmap_object_cb(sub_805FC70, sub_805FC94, gUnknown_083755E8);
+movement_type_def(MovementType_Invisible, gMovementTypeFuncs_Invisible);
 
-u8 sub_805FCB4(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_Invisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_reset(mapObject, sprite);
-    FieldObjectSetRegularAnim(mapObject, sprite, GetFaceDirectionAnimId(mapObject->facingDirection));
-    mapObject->invisible = 1;
+    ClearEventObjectMovement(eventObject, sprite);
+    EventObjectSetSingleMovement(eventObject, sprite, GetFaceDirectionMovementAction(eventObject->facingDirection));
+    eventObject->invisible = 1;
     sprite->data[1] = 1;
     return 1;
 }
 
-u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_Invisible_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectExecRegularAnim(mapObject, sprite))
+    if (EventObjectExecSingleMovementAction(eventObject, sprite))
     {
         sprite->data[1] = 2;
         return 1;
@@ -5160,101 +4187,99 @@ u8 sub_805FCE8(struct MapObject *mapObject, struct Sprite *sprite)
     return 0;
 }
 
-u8 sub_805FD08(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementType_Invisible_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->regularAnimActive = 0;
+    eventObject->singleMovementActive = 0;
     return 0;
 }
 
-void sub_805FC70(struct Sprite *sprite);
-
-void npc_reset(struct MapObject *mapObject, struct Sprite *sprite)
+static void ClearEventObjectMovement(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->regularAnimActive = 0;
-    mapObject->specialAnimActive = 0;
-    mapObject->specialAnimFinished = 0;
-    mapObject->animId = 0xff;
+    eventObject->singleMovementActive = 0;
+    eventObject->heldMovementActive = 0;
+    eventObject->heldMovementFinished = 0;
+    eventObject->movementActionId = 0xff;
     sprite->data[1] = 0;
 }
 
-u8 FieldObjectDirectionToImageAnimId(u8 direction)
+u8 GetFaceDirectionAnimNum(u8 direction)
 {
-    return gUnknown_083755F4[direction];
+    return gFaceDirectionAnimNums[direction];
 }
 
-u8 get_go_image_anim_num(u8 direction)
+u8 GetMoveDirectionAnimNum(u8 direction)
 {
-    return gUnknown_083755FD[direction];
+    return gMoveDirectionAnimNums[direction];
 }
 
-u8 get_go_fast_image_anim_num(u8 direction)
+u8 GetMoveDirectionFastAnimNum(u8 direction)
 {
-    return gUnknown_08375606[direction];
+    return gMoveDirectionFastAnimNums[direction];
 }
 
-u8 get_go_faster_image_anim_num(u8 direction)
+u8 GetMoveDirectionFasterAnimNum(u8 direction)
 {
-    return gUnknown_0837560F[direction];
+    return gMoveDirectionFasterAnimNums[direction];
 }
 
-u8 sub_805FD78(u8 direction)
+u8 GetMoveDirectionFastestAnimNum(u8 direction)
 {
-    return gUnknown_08375618[direction];
+    return gMoveDirectionFastestAnimNums[direction];
 }
 
-u8 sub_805FD88(u8 direction)
+u8 GetJumpSpecialDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375621[direction];
+    return gJumpSpecialDirectionAnimNums[direction];
 }
 
-u8 sub_805FD98(u8 direction)
+u8 GetAcroWheelieDirectionAnimNum(u8 direction)
 {
-    return gUnknown_0837562A[direction];
+    return gAcroWheelieDirectionAnimNums[direction];
 }
 
-u8 unref_sub_805FDA8(u8 direction)
+u8 Unref_GetAnimNums_08375633(u8 direction)
 {
-    return gUnknown_08375633[direction];
+    return gUnrefAnimNums_08375633[direction];
 }
 
-u8 sub_805FDB8(u8 direction)
+u8 GetAcroEndWheelieDirectionAnimNum(u8 direction)
 {
-    return gUnknown_0837563C[direction];
+    return gAcroEndWheelieDirectionAnimNums[direction];
 }
 
-u8 sub_805FDC8(u8 direction)
+u8 GetAcroUnusedActionDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375645[direction];
+    return gAcroUnusedActionDirectionAnimNums[direction];
 }
 
-u8 sub_805FDD8(u8 direction)
+u8 GetAcroWheeliePedalDirectionAnimNum(u8 direction)
 {
-    return gUnknown_0837564E[direction];
+    return gAcroWheeliePedalDirectionAnimNums[direction];
 }
 
-u8 sub_805FDE8(u8 direction)
+u8 GetFishingDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375657[direction];
+    return gFishingDirectionAnimNums[direction];
 }
 
-u8 sub_805FDF8(u8 direction)
+u8 GetFishingNoCatchDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375660[direction];
+    return gFishingNoCatchDirectionAnimNums[direction];
 }
 
-u8 sub_805FE08(u8 direction)
+u8 GetFishingBiteDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375669[direction];
+    return gFishingBiteDirectionAnimNums[direction];
 }
 
-u8 get_run_image_anim_num(u8 direction)
+u8 GetRunningDirectionAnimNum(u8 direction)
 {
-    return gUnknown_08375672[direction];
+    return gRunningDirectionAnimNums[direction];
 }
 
-void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void sub_805FE28(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
 {
-    if (!mapObject->inanimate)
+    if (!eventObject->inanimate)
     {
         sprite->animNum = animNum;
         if (sprite->animCmdIndex == 1)
@@ -5268,10 +4293,10 @@ void sub_805FE28(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
     }
 }
 
-void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
+void sub_805FE64(struct EventObject *eventObject, struct Sprite *sprite, u8 animNum)
 {
     u8 animCmdIndex;
-    if (!mapObject->inanimate)
+    if (!eventObject->inanimate)
     {
         sprite->animNum = animNum;
         animCmdIndex = 3;
@@ -5283,139 +4308,129 @@ void sub_805FE64(struct MapObject *mapObject, struct Sprite *sprite, u8 animNum)
     }
 }
 
-u8 sub_805FE90(s16 a0, s16 a1, s16 a2, s16 a3)
+static u8 GetDirectionToFace(s16 x1, s16 y1, s16 x2, s16 y2)
 {
-    if (a0 > a2)
-    {
+    if (x1 > x2)
         return DIR_WEST;
-    } else if (a0 < a2)
-    {
+    if (x1 < x2)
         return DIR_EAST;
-    } else if (a1 > a3)
-    {
+    if (y1 > y2)
         return DIR_NORTH;
-    } else
-    {
-        return DIR_SOUTH;
-    }
+    return DIR_SOUTH;
 }
 
-void npc_set_running_behaviour_etc(struct MapObject *mapObject, u8 animPattern)
+void SetTrainerMovementType(struct EventObject *eventObject, u8 movementType)
 {
-    mapObject->animPattern = animPattern;
-    mapObject->directionSequenceIndex = 0;
-    mapObject->playerAnimId = 0;
-    gSprites[mapObject->spriteId].callback = gUnknown_0836DA88[animPattern];
-    gSprites[mapObject->spriteId].data[1] = 0;
+    eventObject->movementType = movementType;
+    eventObject->directionSequenceIndex = 0;
+    eventObject->playerCopyableMovement = 0;
+    gSprites[eventObject->spriteId].callback = sMovementTypeCallbacks[movementType];
+    gSprites[eventObject->spriteId].data[1] = 0;
 }
 
-u8 npc_running_behaviour_by_direction(u8 direction)
+u8 GetTrainerFacingDirectionMovementType(u8 direction)
 {
-    return gUnknown_0837567B[direction];
+    return gTrainerFacingDirectionMovementTypes[direction];
 }
 
-u8 sub_805FF20(struct MapObject *mapObject, u8 direction)
+static u8 GetCollisionInDirection(struct EventObject *eventObject, u8 direction)
 {
     s16 x;
     s16 y;
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
     MoveCoords(direction, &x, &y);
-    return npc_block_way(mapObject, x, y, direction);
+    return GetCollisionAtCoords(eventObject, x, y, direction);
 }
 
-bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y);
-static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y);
-bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction);
-
-u8 npc_block_way(struct MapObject *mapObject, s16 x, s16 y, u32 dirn)
+u8 GetCollisionAtCoords(struct EventObject *eventObject, s16 x, s16 y, u32 dirn)
 {
     u8 direction;
     direction = dirn;
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
+    if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y))
         return 1;
-    else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction))
+    else if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction))
         return 2;
-    else if (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction))
+    else if (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction))
         return 2;
-    else if (IsZCoordMismatchAt(mapObject->currentElevation, x, y))
+    else if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
         return 3;
-    else if (DoesObjectCollideWithObjectAt(mapObject, x, y))
+    else if (DoesObjectCollideWithObjectAt(eventObject, x, y))
         return 4;
     return 0;
 }
 
-u8 sub_8060024(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
+u8 GetCollisionFlagsAtCoords(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
 {
     u8 flags = 0;
 
-    if (IsCoordOutsideFieldObjectMovementRect(mapObject, x, y))
+    if (IsCoordOutsideEventObjectMovementRange(eventObject, x, y))
         flags |= 1;
-    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(mapObject, x, y, direction) || (mapObject->trackedByCamera && !CanCameraMoveInDirection(direction)))
+    if (MapGridIsImpassableAt(x, y) || GetMapBorderIdAt(x, y) == -1 || IsMetatileDirectionallyImpassable(eventObject, x, y, direction) || (eventObject->trackedByCamera && !CanCameraMoveInDirection(direction)))
         flags |= 2;
-    if (IsZCoordMismatchAt(mapObject->currentElevation, x, y))
+    if (IsZCoordMismatchAt(eventObject->currentElevation, x, y))
         flags |= 4;
-    if (DoesObjectCollideWithObjectAt(mapObject, x, y))
+    if (DoesObjectCollideWithObjectAt(eventObject, x, y))
         flags |= 8;
     return flags;
 }
 
-bool8 IsCoordOutsideFieldObjectMovementRect(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 IsCoordOutsideEventObjectMovementRange(struct EventObject *eventObject, s16 x, s16 y)
 {
     s16 minv;
     s16 maxv;
 
-    if (mapObject->range.as_nybbles.x != 0)
+    if (eventObject->range.as_nybbles.x != 0)
     {
-        minv = mapObject->initialCoords.x - (mapObject->range.as_nybbles.x);
-        maxv = mapObject->initialCoords.x + (mapObject->range.as_nybbles.x);
+        minv = eventObject->initialCoords.x - (eventObject->range.as_nybbles.x);
+        maxv = eventObject->initialCoords.x + (eventObject->range.as_nybbles.x);
         if (minv > x || maxv < x)
             return TRUE;
     }
-    if (mapObject->range.as_nybbles.y != 0)
+    if (eventObject->range.as_nybbles.y != 0)
     {
-        minv = mapObject->initialCoords.y - (mapObject->range.as_nybbles.y);
-        maxv = mapObject->initialCoords.y + (mapObject->range.as_nybbles.y);
+        minv = eventObject->initialCoords.y - (eventObject->range.as_nybbles.y);
+        maxv = eventObject->initialCoords.y + (eventObject->range.as_nybbles.y);
         if (minv > y || maxv < y)
             return TRUE;
     }
     return FALSE;
 }
 
-bool8 IsMetatileDirectionallyImpassable(struct MapObject *mapObject, s16 x, s16 y, u8 direction)
+static bool8 IsMetatileDirectionallyImpassable(struct EventObject *eventObject, s16 x, s16 y, u8 direction)
 {
-    if (gUnknown_08375684[direction - 1](mapObject->currentMetatileBehavior) || gUnknown_08375694[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
+    if (gOppositeDirectionBlockedMetatileFuncs[direction - 1](eventObject->currentMetatileBehavior)
+        || gDirectionBlockedMetatileFuncs[direction - 1](MapGridGetMetatileBehaviorAt(x, y)))
     {
         return 1;
     }
     return 0;
 }
 
-static bool8 DoesObjectCollideWithObjectAt(struct MapObject *mapObject, s16 x, s16 y)
+static bool8 DoesObjectCollideWithObjectAt(struct EventObject *eventObject, s16 x, s16 y)
 {
     u8 i;
 
     for (i = 0; i < 16; i++)
     {
-        struct MapObject *mapObject2 = &gMapObjects[i];
+        struct EventObject *eventObject2 = &gEventObjects[i];
 
-        if (mapObject2->active && mapObject2 != mapObject)
+        if (eventObject2->active && eventObject2 != eventObject)
         {
-            if (((mapObject2->currentCoords.x == x && mapObject2->currentCoords.y == y) || (mapObject2->previousCoords.x == x && mapObject2->previousCoords.y == y))
-             && AreZCoordsCompatible(mapObject->currentElevation, mapObject2->currentElevation))
+            if (((eventObject2->currentCoords.x == x && eventObject2->currentCoords.y == y) || (eventObject2->previousCoords.x == x && eventObject2->previousCoords.y == y))
+             && AreZCoordsCompatible(eventObject->currentElevation, eventObject2->currentElevation))
                 return TRUE;
         }
     }
     return 0;
 }
 
-// this function is only used in berry.c, but its unknown whether its intended context is the berry tree check or if its checking for the flickering.
 bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
-        if (gSprites[gMapObjects[mapObjectId].spriteId].data[7] & 2)
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
+        if (gSprites[gEventObjects[eventObjectId].spriteId].data[7] & 2)
             return TRUE;
 
     return FALSE;
@@ -5423,46 +4438,38 @@ bool8 IsBerryTreeSparkling(u8 localId, u8 mapNum, u8 mapGroup)
 
 void sub_8060288(u8 localId, u8 mapNum, u8 mapGroup)
 {
-    u8 mapObjectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId))
+    u8 eventObjectId;
+    if (!TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId))
     {
-        gSprites[gMapObjects[mapObjectId].spriteId].data[7] |= 4;
+        gSprites[gEventObjects[eventObjectId].spriteId].data[7] |= 4;
     }
 }
 
 void MoveCoords(u8 direction, s16 *x, s16 *y)
 {
-    *x += gDirectionToVector[direction].x;
-    *y += gDirectionToVector[direction].y;
+    *x += gDirectionToVectors[direction].x;
+    *y += gDirectionToVectors[direction].y;
 }
 
-void unref_sub_80602F8(u8 direction, s16 *x, s16 *y)
+void Unref_MovePixelCoords(u8 direction, s16 *x, s16 *y)
 {
-    *x += gDirectionToVector[direction].x << 4;
-    *y += gDirectionToVector[direction].y << 4;
+    *x += gDirectionToVectors[direction].x << 4;
+    *y += gDirectionToVectors[direction].y << 4;
 }
 
-void sub_8060320(u32 dirn, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
+static void MoveCoordsInDirection(u32 dir, s16 *x, s16 *y, s16 deltaX, s16 deltaY)
 {
-    u8 direction = dirn;
-    s16 dx2 = deltaX;
-    s16 dy2 = deltaY;
-    if (gDirectionToVector[direction].x > 0)
-    {
+    u8 direction = dir;
+    s16 dx2 = (u16)deltaX;
+    s16 dy2 = (u16)deltaY;
+    if (gDirectionToVectors[direction].x > 0)
         *x += dx2;
-    }
-    if (gDirectionToVector[direction].x < 0)
-    {
+    if (gDirectionToVectors[direction].x < 0)
         *x -= dx2;
-    }
-    if (gDirectionToVector[direction].y > 0)
-    {
+    if (gDirectionToVectors[direction].y > 0)
         *y += dy2;
-    }
-    if (gDirectionToVector[direction].y < 0)
-    {
+    if (gDirectionToVectors[direction].y < 0)
         *y -= dy2;
-    }
 }
 
 void sub_8060388(s16 x1, s16 y1, s16 *x2, s16 *y2)
@@ -5506,7 +4513,7 @@ void sub_8060470(s16 *x, s16 *y, s16 dx, s16 dy)
     *y += dy;
 }
 
-void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
+void GetEventObjectMovingCameraOffset(s16 *x, s16 *y)
 {
     *x = 0;
     *y = 0;
@@ -5528,122 +4535,108 @@ void GetFieldObjectMovingCameraOffset(s16 *x, s16 *y)
     }
 }
 
-void FieldObjectMoveDestCoords(struct MapObject *mapObject, u32 direction, s16 *x, s16 *y)
+void EventObjectMoveDestCoords(struct EventObject *eventObject, u32 direction, s16 *x, s16 *y)
 {
     u8 newDirn = direction;
-    *x = mapObject->currentCoords.x;
-    *y = mapObject->currentCoords.y;
+    *x = eventObject->currentCoords.x;
+    *y = eventObject->currentCoords.y;
     MoveCoords(newDirn, x, y);
 }
 
-bool8 FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(struct MapObject *mapObject)
+bool8 EventObjectIsMovementOverridden(struct EventObject *eventObject)
 {
-    if (mapObject->regularAnimActive || mapObject->specialAnimActive)
-    {
+    if (eventObject->singleMovementActive || eventObject->heldMovementActive)
         return TRUE;
-    }
+
     return FALSE;
 }
 
-bool8 FieldObjectIsSpecialAnimActive(struct MapObject *mapObject)
+bool8 EventObjectIsHeldMovementActive(struct EventObject *eventObject)
 {
-    if (mapObject->specialAnimActive && mapObject->animId != 0xff)
-    {
+    if (eventObject->heldMovementActive && eventObject->movementActionId != 0xff)
         return TRUE;
-    }
+
     return FALSE;
 }
 
-bool8 FieldObjectSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
+bool8 EventObjectSetHeldMovement(struct EventObject *eventObject, u8 movementActionId)
 {
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
-    {
+    if (EventObjectIsMovementOverridden(eventObject))
         return TRUE;
-    }
-    UnfreezeMapObject(mapObject);
-    mapObject->animId = specialAnimId;
-    mapObject->specialAnimActive = 1;
-    mapObject->specialAnimFinished = 0;
-    gSprites[mapObject->spriteId].data[2] = 0;
+
+    UnfreezeEventObject(eventObject);
+    eventObject->movementActionId = movementActionId;
+    eventObject->heldMovementActive = 1;
+    eventObject->heldMovementFinished = 0;
+    gSprites[eventObject->spriteId].data[2] = 0;
     return FALSE;
 }
 
-void FieldObjectForceSetSpecialAnim(struct MapObject *mapObject, u8 specialAnimId)
+void EventObjectForceSetHeldMovement(struct EventObject *eventObject, u8 movementActionId)
 {
-    FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-    FieldObjectSetSpecialAnim(mapObject, specialAnimId);
+    EventObjectClearHeldMovementIfActive(eventObject);
+    EventObjectSetHeldMovement(eventObject, movementActionId);
 }
 
-void FieldObjectClearAnimIfSpecialAnimActive(struct MapObject *mapObject)
+void EventObjectClearHeldMovementIfActive(struct EventObject *eventObject)
 {
-    if (mapObject->specialAnimActive)
-    {
-        FieldObjectClearAnim(mapObject);
-    }
+    if (eventObject->heldMovementActive)
+        EventObjectClearHeldMovement(eventObject);
 }
 
-void FieldObjectClearAnim(struct MapObject *mapObject)
+void EventObjectClearHeldMovement(struct EventObject *eventObject)
 {
-    mapObject->animId = 0xFF;
-    mapObject->specialAnimActive = 0;
-    mapObject->specialAnimFinished = 0;
-    gSprites[mapObject->spriteId].data[1] = 0;
-    gSprites[mapObject->spriteId].data[2] = 0;
+    eventObject->movementActionId = 0xFF;
+    eventObject->heldMovementActive = 0;
+    eventObject->heldMovementFinished = 0;
+    gSprites[eventObject->spriteId].data[1] = 0;
+    gSprites[eventObject->spriteId].data[2] = 0;
 }
 
-bool8 FieldObjectCheckIfSpecialAnimFinishedOrInactive(struct MapObject *mapObject)
+bool8 EventObjectCheckHeldMovementStatus(struct EventObject *eventObject)
 {
-    if (mapObject->specialAnimActive)
-        return mapObject->specialAnimFinished;
-    return 0x10;
+    if (eventObject->heldMovementActive)
+        return eventObject->heldMovementFinished;
+
+    return 16;
 }
 
-bool8 FieldObjectClearAnimIfSpecialAnimFinished(struct MapObject *mapObject)
+bool8 EventObjectClearHeldMovementIfFinished(struct EventObject *eventObject)
 {
-    u8 specialAnimStatus;
-    specialAnimStatus = FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject);
-    if (specialAnimStatus != 0 && specialAnimStatus != 0x10)
-    {
-        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-    }
-    return specialAnimStatus;
+    u8 heldMovementStatus;
+    heldMovementStatus = EventObjectCheckHeldMovementStatus(eventObject);
+    if (heldMovementStatus != 0 && heldMovementStatus != 16)
+        EventObjectClearHeldMovementIfActive(eventObject);
+
+    return heldMovementStatus;
 }
 
-u8 FieldObjectGetSpecialAnim(struct MapObject *mapObject)
+u8 EventObjectGetHeldMovementActionId(struct EventObject *eventObject)
 {
-    if (mapObject->specialAnimActive)
-    {
-        return mapObject->animId;
-    }
+    if (eventObject->heldMovementActive)
+        return eventObject->movementActionId;
+
     return 0xFF;
 }
 
-extern void DoGroundEffects_OnSpawn(struct MapObject *mapObject, struct Sprite *sprite);
-extern void DoGroundEffects_OnBeginStep(struct MapObject *mapObject, struct Sprite *sprite);
-extern void DoGroundEffects_OnFinishStep(struct MapObject *mapObject, struct Sprite *sprite);
-void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite);
-void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite);
-void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite);
-void FieldObjectUpdateSubpriority(struct MapObject *mapObject, struct Sprite *sprite);
-
-void meta_step(struct MapObject *mapObject, struct Sprite *sprite, u8 (*callback)(struct MapObject *, struct Sprite *))
+void UpdateEventObjectCurrentMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 (*callback)(struct EventObject *, struct Sprite *))
 {
-    DoGroundEffects_OnSpawn(mapObject, sprite);
-    sub_80634A0(mapObject, sprite);
-    if (FieldObjectIsSpecialAnimActive(mapObject))
+    DoGroundEffects_OnSpawn(eventObject, sprite);
+    TryEnableEventObjectAnim(eventObject, sprite);
+    if (EventObjectIsHeldMovementActive(eventObject))
     {
-        FieldObjectExecSpecialAnim(mapObject, sprite);
+        EventObjectExecHeldMovementAction(eventObject, sprite);
     }
-    else if (!mapObject->frozen)
+    else if (!eventObject->frozen)
     {
-        while (callback(mapObject, sprite));
+        while (callback(eventObject, sprite));
     }
 
-    DoGroundEffects_OnBeginStep(mapObject, sprite);
-    DoGroundEffects_OnFinishStep(mapObject, sprite);
-    npc_obj_transfer_image_anim_pause_flag(mapObject, sprite);
-    sub_80634D0(mapObject, sprite);
-    FieldObjectUpdateSubpriority(mapObject, sprite);
+    DoGroundEffects_OnBeginStep(eventObject, sprite);
+    DoGroundEffects_OnFinishStep(eventObject, sprite);
+    UpdateEventObjectSpriteAnimPause(eventObject, sprite);
+    UpdateEventObjectVisibility(eventObject, sprite);
+    EventObjectUpdateSubpriority(eventObject, sprite);
 }
 
 #define dirn_to_anim(name, table)\
@@ -5657,148 +4650,148 @@ u8 name(u32 idx)\
     return animIds[direction];\
 }
 
-dirn_to_anim(GetFaceDirectionAnimId, gUnknown_083756C8)
-dirn_to_anim(GetSimpleGoAnimId, gUnknown_083756CD)
-dirn_to_anim(GetGoSpeed0AnimId, gUnknown_083756D2)
-dirn_to_anim(sub_8060744, gUnknown_083756D7)
-dirn_to_anim(d2s_08064034, gUnknown_083756DC)
-dirn_to_anim(sub_806079C, gUnknown_083756E1)
-dirn_to_anim(sub_80607C8, gUnknown_083756E6)
-dirn_to_anim(sub_80607F4, gUnknown_083756EB)
-dirn_to_anim(GetJumpLedgeAnimId, gUnknown_083756F0)
-dirn_to_anim(sub_806084C, gUnknown_083756F5)
-dirn_to_anim(sub_8060878, gUnknown_083756FA)
-dirn_to_anim(sub_80608A4, gUnknown_083756FF)
-dirn_to_anim(sub_80608D0, gUnknown_08375704)
-dirn_to_anim(GetStepInPlaceDelay32AnimId, gUnknown_08375709)
-dirn_to_anim(GetStepInPlaceDelay16AnimId, gUnknown_0837570E)
-dirn_to_anim(GetStepInPlaceDelay8AnimId, gUnknown_08375713)
-dirn_to_anim(GetStepInPlaceDelay4AnimId, gUnknown_08375718)
+dirn_to_anim(GetFaceDirectionMovementAction, gFaceDirectionMovementActions)
+dirn_to_anim(GetWalkSlowMovementAction, gWalkSlowMovementActions)
+dirn_to_anim(GetWalkNormalMovementAction, gWalkNormalMovementActions)
+dirn_to_anim(GetWalkFastMovementAction, gWalkFastMovementActions)
+dirn_to_anim(GetRideWaterCurrentMovementAction, gRideWaterCurrentMovementActions)
+dirn_to_anim(GetWalkFastestMovementAction, gWalkFastestMovementActions)
+dirn_to_anim(GetSlideMovementAction, gSlideMovementActions)
+dirn_to_anim(GetPlayerRunMovementAction, gPlayerRunMovementActions)
+dirn_to_anim(GetJump2MovementAction, gJump2MovementActions)
+dirn_to_anim(GetJumpInPlaceMovementAction, gJumpInPlaceMovementActions)
+dirn_to_anim(GetJumpInPlaceTurnAroundMovementAction, gJumpInPlaceTurnAroundMovementActions)
+dirn_to_anim(sub_80608A4, gJumpMovementActions)
+dirn_to_anim(GetJumpSpecialMovementAction, gJumpSpecialMovementActions)
+dirn_to_anim(GetWalkInPlaceSlowMovementAction, gWalkInPlaceSlowMovementActions)
+dirn_to_anim(GetWalkInPlaceNormalMovementAction, gWalkInPlaceNormalMovementActions)
+dirn_to_anim(GetWalkInPlaceFastMovementAction, gWalkInPlaceFastMovementActions)
+dirn_to_anim(GetWalkInPlaceFastestMovementAction, gWalkInPlaceFastestMovementActions)
 
-u8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction)
+u8 EventObjectFaceOppositeDirection(struct EventObject *eventObject, u8 direction)
 {
-    return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
+    return EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetOppositeDirection(direction)));
 }
 
-u8 sub_80609D8(u8 index)
+u8 GetAcroWheelieFaceDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_0837571D, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieFaceDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060A04(u8 index)
+u8 GetAcroPopWheelieFaceDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375722, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroPopWheelieFaceDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060A30(u8 index)
+u8 GetAcroEndWheelieFaceDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375727, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroEndWheelieFaceDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060A5C(u8 index)
+u8 GetAcroWheelieHopFaceDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_0837572C, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieHopFaceDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060A88(u8 index)
+u8 GetAcroWheelieHopDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375731, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieHopDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060AB4(u8 index)
+u8 GetAcroWheelieJumpDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375736, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieJumpDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060AE0(u8 index)
+u8 GetAcroWheelieInPlaceDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_0837573B, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieInPlaceDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060B0C(u8 index)
+u8 GetAcroPopWheelieMoveDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375740, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroPopWheelieMoveDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060B38(u8 index)
+u8 GetAcroWheelieMoveDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_08375745, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroWheelieMoveDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
-u8 sub_8060B64(u8 index)
+u8 GetAcroEndWheelieMoveDirectionMovementAction(u8 direction)
 {
-    u8 directions[5];
-    memcpy(directions, gUnknown_0837574A, 5);
-    if (index >= 5)
+    u8 movementActions[5];
+    memcpy(movementActions, gAcroEndWheelieMoveDirectionMovementActions, 5);
+    if (direction >= 5)
     {
-        index = 0;
+        direction = 0;
     }
-    return directions[index];
+    return movementActions[direction];
 }
 
 u8 GetOppositeDirection(u8 direction)
 {
-    u8 directions[8];
-    memcpy(directions, gUnknown_0837574F, 8);
-    if (direction == 0 || direction > 8)
+    u8 oppositeDirections[8];
+    memcpy(oppositeDirections, gOppositeDirections, 8);
+    if (direction == DIR_NONE || direction > 8)
     {
         return direction;
     }
-    return directions[direction - 1];
+    return oppositeDirections[direction - 1];
 }
 
 u32 zffu_offset_calc(u8 a0, u8 a1)
@@ -5819,153 +4812,154 @@ u32 state_to_direction(u8 a0, u32 a1, u32 a2)
     return gUnknown_08375767[a0 - 1][zffuOffset - 1];
 }
 
-void FieldObjectExecSpecialAnim(struct MapObject *mapObject, struct Sprite *sprite)
+static void EventObjectExecHeldMovementAction(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite))
+    if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
     {
-        mapObject->specialAnimFinished = 1;
+        eventObject->heldMovementFinished = 1;
     }
 }
 
-bool8 FieldObjectExecRegularAnim(struct MapObject *mapObject, struct Sprite *sprite)
+static bool8 EventObjectExecSingleMovementAction(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (gUnknown_08375778[mapObject->animId][sprite->data[2]](mapObject, sprite))
+    if (gMovementActionFuncs[eventObject->movementActionId][sprite->data[2]](eventObject, sprite))
     {
-        mapObject->animId = 0xFF;
+        eventObject->movementActionId = 0xFF;
         sprite->data[2] = 0;
         return 1;
     }
+
     return 0;
 }
 
-void FieldObjectSetRegularAnim(struct MapObject *mapObject, struct Sprite *sprite, u8 animId)
+static void EventObjectSetSingleMovement(struct EventObject *eventObject, struct Sprite *sprite, u8 movementActionId)
 {
-    mapObject->animId = animId;
+    eventObject->movementActionId = movementActionId;
     sprite->data[2] = 0;
 }
 
-void an_look_any(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void FaceDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    npc_coords_shift_still(mapObject);
-    sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    SetEventObjectDirection(eventObject, direction);
+    ShiftStillEventObjectCoords(eventObject);
+    sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
     sprite->animPaused = 1;
     sprite->data[2] = 1;
 }
 
-u8 sub_8060CE0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_SOUTH);
+    FaceDirection(eventObject, sprite, DIR_SOUTH);
     return 1;
 }
 
-u8 sub_8060CF0(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_NORTH);
+    FaceDirection(eventObject, sprite, DIR_NORTH);
     return 1;
 }
 
-u8 sub_8060D00(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_WEST);
+    FaceDirection(eventObject, sprite, DIR_WEST);
     return 1;
 }
 
-u8 sub_8060D10(struct MapObject *mapObject, struct Sprite *sprite)
+u8 MovementAction_FaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, DIR_EAST);
+    FaceDirection(eventObject, sprite, DIR_EAST);
     return 1;
 }
 
-void sub_8060D20(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
+void sub_8060D20(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
     s16 x;
     s16 y;
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
-    FieldObjectSetDirection(mapObject, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    SetEventObjectDirection(eventObject, direction);
     MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
+    ShiftEventObjectCoords(eventObject, x, y);
     oamt_npc_ministep_reset(sprite, direction, a3);
     sprite->animPaused = 0;
-    mapObject->triggerGroundEffectsOnMove = 1;
+    eventObject->triggerGroundEffectsOnMove = 1;
     sprite->data[2] = 1;
 }
 
 extern u8 (*const gUnknown_083759C0[5])(u8);
 
-void do_go_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
+void do_go_anim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
     u8 (*const functions[5])(u8);
     memcpy((void *)functions, gUnknown_083759C0, sizeof(gUnknown_083759C0));
-    sub_8060D20(mapObject, sprite, direction, a3);
-    sub_805FE28(mapObject, sprite, functions[a3](mapObject->facingDirection));
+    sub_8060D20(eventObject, sprite, direction, a3);
+    sub_805FE28(eventObject, sprite, functions[a3](eventObject->facingDirection));
 }
 
-void do_run_anim(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void StartRunningAnim(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    sub_8060D20(mapObject, sprite, direction, 1);
-    sub_805FE28(mapObject, sprite, get_run_image_anim_num(mapObject->facingDirection));
+    sub_8060D20(eventObject, sprite, direction, 1);
+    sub_805FE28(eventObject, sprite, GetRunningDirectionAnimNum(eventObject->facingDirection));
 }
 
 bool8 obj_npc_ministep(struct Sprite *);
 
-bool8 npc_obj_ministep_stop_on_arrival(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 npc_obj_ministep_stop_on_arrival(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (obj_npc_ministep(sprite))
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = 1;
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = 1;
         sprite->animPaused = 1;
         return 1;
     }
     return 0;
 }
 
-void sub_8060E68(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8060E68(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
     s16 x;
     s16 y;
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
-    FieldObjectSetDirection(mapObject, direction);
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
+    SetEventObjectDirection(eventObject, direction);
     MoveCoords(direction, &x, &y);
-    npc_coords_shift(mapObject, x, y);
+    ShiftEventObjectCoords(eventObject, x, y);
     sub_806467C(sprite, direction);
     sprite->animPaused = 0;
-    mapObject->triggerGroundEffectsOnMove = 1;
+    eventObject->triggerGroundEffectsOnMove = 1;
     sprite->data[2] = 1;
 }
 
-void sub_8060ED8(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8060ED8(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    sub_8060E68(mapObject, sprite, direction);
-    sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    sub_8060E68(eventObject, sprite, direction);
+    sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
 }
 
-bool8 an_walk_any_2(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 an_walk_any_2(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sub_806468C(sprite))
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = 1;
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = 1;
         sprite->animPaused = 1;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8060F5C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8060F3C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_SOUTH);
-    return sub_8060F5C(mapObject, sprite);
+    sub_8060ED8(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_WalkSlowDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -5973,17 +4967,17 @@ bool8 sub_8060F5C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8060F9C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8060F7C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_NORTH);
-    return sub_8060F9C(mapObject, sprite);
+    sub_8060ED8(eventObject, sprite, DIR_NORTH);
+    return MovementAction_WalkSlowUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -5991,17 +4985,17 @@ bool8 sub_8060F9C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8060FDC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8060FBC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_WEST);
-    return sub_8060FDC(mapObject, sprite);
+    sub_8060ED8(eventObject, sprite, DIR_WEST);
+    return MovementAction_WalkSlowLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6009,17 +5003,17 @@ bool8 sub_8060FDC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806101C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8060FFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_EAST);
-    return sub_806101C(mapObject, sprite);
+    sub_8060ED8(eventObject, sprite, DIR_EAST);
+    return MovementAction_WalkSlowRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkSlowRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6027,17 +5021,17 @@ bool8 sub_806101C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806105C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_806103C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_SOUTH, 0);
-    return sub_806105C(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 0);
+    return MovementAction_WalkNormalDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6045,17 +5039,17 @@ bool8 sub_806105C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806109C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_806107C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_NORTH, 0);
-    return sub_806109C(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_NORTH, 0);
+    return MovementAction_WalkNormalUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6063,17 +5057,17 @@ bool8 sub_806109C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80610DC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80610BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_WEST, 0);
-    return sub_80610DC(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_WEST, 0);
+    return MovementAction_WalkNormalLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6081,17 +5075,17 @@ bool8 sub_80610DC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806111C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80610FC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_EAST, 0);
-    return sub_806111C(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_EAST, 0);
+    return MovementAction_WalkNormalRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkNormalRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6099,7 +5093,7 @@ bool8 sub_806111C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
+void sub_806113C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
 {
     s16 vSPp4[3];
     s16 x;
@@ -6107,24 +5101,24 @@ void sub_806113C(struct MapObject *mapObject, struct Sprite *sprite, u8 directio
     memcpy(vSPp4, gUnknown_08375A34, sizeof gUnknown_08375A34);
     x = 0;
     y = 0;
-    FieldObjectSetDirection(mapObject, direction);
-    sub_8060320(direction, &x, &y, vSPp4[a4], vSPp4[a4]);
-    npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y);
+    SetEventObjectDirection(eventObject, direction);
+    MoveCoordsInDirection(direction, &x, &y, vSPp4[a4], vSPp4[a4]);
+    ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
     sub_80646E4(sprite, direction, a4, a5);
     sprite->data[2] = 1;
     sprite->animPaused = 0;
-    mapObject->triggerGroundEffectsOnMove = 1;
-    mapObject->disableCoveringGroundEffects = 1;
+    eventObject->triggerGroundEffectsOnMove = 1;
+    eventObject->disableCoveringGroundEffects = 1;
 }
 
-void maybe_shadow_1(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
+void maybe_shadow_1(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a4, u8 a5)
 {
-    sub_806113C(mapObject, sprite, direction, a4, a5);
-    sub_805FE28(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
-    DoShadowFieldEffect(mapObject);
+    sub_806113C(eventObject, sprite, direction, a4, a5);
+    sub_805FE28(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
+    DoShadowFieldEffect(eventObject);
 }
 
-u8 sub_806123C(struct MapObject *mapObject, struct Sprite *sprite, u8 (*const callback)(struct Sprite *))
+u8 sub_806123C(struct EventObject *eventObject, struct Sprite *sprite, u8 (*const callback)(struct Sprite *))
 {
     s16 vSPp4[3];
     s16 x;
@@ -6136,53 +5130,53 @@ u8 sub_806123C(struct MapObject *mapObject, struct Sprite *sprite, u8 (*const ca
     {
         x = 0;
         y = 0;
-        sub_8060320(mapObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]);
-        npc_coords_shift(mapObject, mapObject->currentCoords.x + x, mapObject->currentCoords.y + y);
-        mapObject->triggerGroundEffectsOnMove = 1;
-        mapObject->disableCoveringGroundEffects = 1;
+        MoveCoordsInDirection(eventObject->movementDirection, &x, &y, vSPp4[sprite->data[4]], vSPp4[sprite->data[4]]);
+        ShiftEventObjectCoords(eventObject, eventObject->currentCoords.x + x, eventObject->currentCoords.y + y);
+        eventObject->triggerGroundEffectsOnMove = 1;
+        eventObject->disableCoveringGroundEffects = 1;
     } else if (retval == 0xff)
     {
-        npc_coords_shift_still(mapObject);
-        mapObject->triggerGroundEffectsOnStop = 1;
-        mapObject->landingJump = 1;
+        ShiftStillEventObjectCoords(eventObject);
+        eventObject->triggerGroundEffectsOnStop = 1;
+        eventObject->landingJump = 1;
         sprite->animPaused = 1;
     }
     return retval;
 }
 
-u8 sub_8061300(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8061300(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return sub_806123C(mapObject, sprite, sub_8064704);
+    return sub_806123C(eventObject, sprite, sub_8064704);
 }
 
-u8 sub_8061314(struct MapObject *mapObject, struct Sprite *sprite)
+u8 sub_8061314(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    return sub_806123C(mapObject, sprite, sub_806478C);
+    return sub_806123C(eventObject, sprite, sub_806478C);
 }
 
-bool8 sub_8061328(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8061328(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061300(mapObject, sprite) == 0xFF)
+    if (sub_8061300(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8061340(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8061340(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061314(mapObject, sprite) == 0xFF)
+    if (sub_8061314(eventObject, sprite) == 0xFF)
     {
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8061358(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8061358(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 retval;
 
-    retval = sub_8061300(mapObject, sprite);
+    retval = sub_8061300(eventObject, sprite);
     if (retval != 1)
     {
         if (retval == 0xFF)
@@ -6191,78 +5185,78 @@ bool8 sub_8061358(struct MapObject *mapObject, struct Sprite *sprite)
         }
         return FALSE;
     }
-    FieldObjectSetDirection(mapObject, GetOppositeDirection(mapObject->movementDirection));
-    sub_805FE64(mapObject, sprite, get_go_image_anim_num(mapObject->facingDirection));
+    SetEventObjectDirection(eventObject, GetOppositeDirection(eventObject->movementDirection));
+    sub_805FE64(eventObject, sprite, GetMoveDirectionAnimNum(eventObject->facingDirection));
     return FALSE;
 }
 
-bool8 sub_80613D4(struct MapObject *, struct Sprite *);
-bool8 sub_806142C(struct MapObject *, struct Sprite *);
-bool8 sub_8061484(struct MapObject *, struct Sprite *);
-bool8 sub_80614DC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_Jump2Down_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_Jump2Up_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_Jump2Left_Step1(struct EventObject *, struct Sprite *);
+bool8 MovementAction_Jump2Right_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80613A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Down_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 2, 0);
-    return sub_80613D4(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 2, 0);
+    return MovementAction_Jump2Down_Step1(eventObject, sprite);
 }
 
-bool8 sub_80613D4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Down_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8061400(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Up_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_NORTH, 2, 0);
-    return sub_806142C(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 2, 0);
+    return MovementAction_Jump2Up_Step1(eventObject, sprite);
 }
 
-bool8 sub_806142C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Up_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8061458(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Left_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_WEST, 2, 0);
-    return sub_8061484(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 2, 0);
+    return MovementAction_Jump2Left_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061484(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Left_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80614B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Right_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_EAST, 2, 0);
-    return sub_80614DC(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 2, 0);
+    return MovementAction_Jump2Right_Step1(eventObject, sprite);
 }
 
-bool8 sub_80614DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Jump2Right_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
@@ -6275,7 +5269,7 @@ void sub_8061508(struct Sprite *sprite, u16 duration)
     sprite->data[3] = duration;
 }
 
-bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[3]--;
     if (!sprite->data[3])
@@ -6286,95 +5280,95 @@ bool8 sub_8061510(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806152C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 1);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(eventObject, sprite);
 }
 
-bool8 sub_806154C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay2_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 2);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(eventObject, sprite);
 }
 
-bool8 sub_806156C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay4_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 4);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(eventObject, sprite);
 }
 
-bool8 sub_806158C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay8_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 8);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(eventObject, sprite);
 }
 
-bool8 sub_80615AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Delay16_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8061508(sprite, 16);
-    return sub_8061510(mapObject, sprite);
+    return MovementAction_Delay_Step1(eventObject, sprite);
 }
 
-bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite);
-bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite);
+bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80615CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_80615EC(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_WalkFastDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_80615EC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
-bool8 sub_806160C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_NORTH, 1);
-    return sub_806162C(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_WalkFastUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_806162C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
-bool8 sub_806164C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_WEST, 1);
-    return sub_806166C(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_WEST, 1);
+    return MovementAction_WalkFastLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_806166C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
-bool8 sub_806168C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_EAST, 1);
-    return sub_80616AC(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_EAST, 1);
+    return MovementAction_WalkFastRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6382,16 +5376,16 @@ bool8 sub_80616AC(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_80616CC(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animId, u16 duration)
+void sub_80616CC(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum, u16 duration)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    sub_805FE28(mapObject, sprite, animId);
+    SetEventObjectDirection(eventObject, direction);
+    sub_805FE28(eventObject, sprite, animNum);
     sprite->animPaused = 0;
     sprite->data[2] = 1;
     sprite->data[3] = duration;
 }
 
-bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlace_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->data[3]--;
     if (sprite->data[3] == 0)
@@ -6403,122 +5397,122 @@ bool8 sub_8061714(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_806173C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlow_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (sprite->data[3] & 1)
     {
         sprite->animDelayCounter++;
     }
-    return sub_8061714(mapObject, sprite);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061778(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_image_anim_num(DIR_SOUTH), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
 }
 
-bool8 sub_80617B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_image_anim_num(DIR_NORTH), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
 }
 
-bool8 sub_80617E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_image_anim_num(DIR_WEST), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061820(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceSlowRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_image_anim_num(DIR_EAST), 32);
-    return sub_806173C(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 32);
+    return MovementAction_WalkInPlaceSlow_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061858(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_image_anim_num(DIR_SOUTH), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionAnimNum(DIR_SOUTH), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061890(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_image_anim_num(DIR_NORTH), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionAnimNum(DIR_NORTH), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_80618C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_image_anim_num(DIR_WEST), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionAnimNum(DIR_WEST), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061900(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceNormalRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_image_anim_num(DIR_EAST), 16);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionAnimNum(DIR_EAST), 16);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061938(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_fast_image_anim_num(DIR_SOUTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFastAnimNum(DIR_SOUTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061970(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_fast_image_anim_num(DIR_NORTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFastAnimNum(DIR_NORTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_80619A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_fast_image_anim_num(DIR_WEST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFastAnimNum(DIR_WEST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_80619E0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_fast_image_anim_num(DIR_EAST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFastAnimNum(DIR_EAST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061A18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, get_go_faster_image_anim_num(DIR_SOUTH), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_SOUTH, GetMoveDirectionFasterAnimNum(DIR_SOUTH), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061A50(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, get_go_faster_image_anim_num(DIR_NORTH), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_NORTH, GetMoveDirectionFasterAnimNum(DIR_NORTH), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061A88(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, get_go_faster_image_anim_num(DIR_WEST), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_WEST, GetMoveDirectionFasterAnimNum(DIR_WEST), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061AC0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkInPlaceFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, get_go_faster_image_anim_num(DIR_EAST), 4);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_EAST, GetMoveDirectionFasterAnimNum(DIR_EAST), 4);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061B18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061AF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_SOUTH, 2);
-    return sub_8061B18(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 2);
+    return MovementAction_RideWaterCurrentDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6527,17 +5521,17 @@ bool8 sub_8061B18(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061B58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061B38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_NORTH, 2);
-    return sub_8061B58(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_NORTH, 2);
+    return MovementAction_RideWaterCurrentUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6546,17 +5540,17 @@ bool8 sub_8061B58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061B98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061B78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_WEST, 2);
-    return sub_8061B98(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_WEST, 2);
+    return MovementAction_RideWaterCurrentLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6565,17 +5559,17 @@ bool8 sub_8061B98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061BD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061BB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_EAST, 2);
-    return sub_8061BD8(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_EAST, 2);
+    return MovementAction_RideWaterCurrentRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RideWaterCurrentRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6583,17 +5577,17 @@ bool8 sub_8061BD8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061C18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061BF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_SOUTH, 3);
-    return sub_8061C18(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 3);
+    return MovementAction_WalkFastestDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6601,17 +5595,17 @@ bool8 sub_8061C18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061C58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061C38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_NORTH, 3);
-    return sub_8061C58(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_NORTH, 3);
+    return MovementAction_WalkFastestUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6620,17 +5614,17 @@ bool8 sub_8061C58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061C98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061C78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_WEST, 3);
-    return sub_8061C98(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_WEST, 3);
+    return MovementAction_WalkFastestLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6639,17 +5633,17 @@ bool8 sub_8061C98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061CD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061CB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_EAST, 3);
-    return sub_8061CD8(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_EAST, 3);
+    return MovementAction_WalkFastestRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061CD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkFastestRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6657,17 +5651,17 @@ bool8 sub_8061CD8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061D18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061CF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_SOUTH, 4);
-    return sub_8061D18(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_SOUTH, 4);
+    return MovementAction_SlideDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6675,17 +5669,17 @@ bool8 sub_8061D18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061D58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061D38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_NORTH, 4);
-    return sub_8061D58(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_NORTH, 4);
+    return MovementAction_SlideUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6694,17 +5688,17 @@ bool8 sub_8061D58(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061D98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061D78(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_WEST, 4);
-    return sub_8061D98(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_WEST, 4);
+    return MovementAction_SlideLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6713,17 +5707,17 @@ bool8 sub_8061D98(struct MapObject *mapObject, struct Sprite *sprite)
 }
 
 
-bool8 sub_8061DD8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_SlideRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061DB8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_go_anim(mapObject, sprite, DIR_EAST, 4);
-    return sub_8061DD8(mapObject, sprite);
+    do_go_anim(eventObject, sprite, DIR_EAST, 4);
+    return MovementAction_SlideRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SlideRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6731,17 +5725,17 @@ bool8 sub_8061DD8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E18(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 do_run_south_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_run_anim(mapObject, sprite, DIR_SOUTH);
-    return sub_8061E18(mapObject, sprite);
+    StartRunningAnim(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_PlayerRunDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6749,17 +5743,17 @@ bool8 sub_8061E18(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E58(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 do_run_north_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_run_anim(mapObject, sprite, DIR_NORTH);
-    return sub_8061E58(mapObject, sprite);
+    StartRunningAnim(eventObject, sprite, DIR_NORTH);
+    return MovementAction_PlayerRunUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6767,17 +5761,17 @@ bool8 sub_8061E58(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061E98(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 do_run_west_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_run_anim(mapObject, sprite, DIR_WEST);
-    return sub_8061E98(mapObject, sprite);
+    StartRunningAnim(eventObject, sprite, DIR_WEST);
+    return MovementAction_PlayerRunLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6785,17 +5779,17 @@ bool8 sub_8061E98(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8061ED8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 do_run_east_anim(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    do_run_anim(mapObject, sprite, DIR_EAST);
-    return sub_8061ED8(mapObject, sprite);
+    StartRunningAnim(eventObject, sprite, DIR_EAST);
+    return MovementAction_PlayerRunRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PlayerRunRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6803,24 +5797,24 @@ bool8 sub_8061ED8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void npc_set_direction_and_anim__an_proceed(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 animNum)
+void StartSpriteAnimInDirection(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 animNum)
 {
-    obj_anim_image_set_and_seek(sprite, animNum, 0);
-    FieldObjectSetDirection(mapObject, direction);
+    SetAndStartSpriteAnim(sprite, animNum, 0);
+    SetEventObjectDirection(eventObject, direction);
     sprite->data[2] = 1;
 }
 
-bool8 sub_8061F24(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_StartAnimInDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, mapObject->movementDirection, sprite->animNum);
+    StartSpriteAnimInDirection(eventObject, sprite, eventObject->movementDirection, sprite->animNum);
     return FALSE;
 }
 
-bool8 sub_8064864(struct Sprite *);
+bool8 SpriteAnimEnded(struct Sprite *);
 
-bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WaitSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -6828,455 +5822,455 @@ bool8 sub_8061F3C(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8061F5C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_8061F5C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    sub_806113C(mapObject, sprite, direction, 1, 0);
-    StartSpriteAnim(sprite, sub_805FD88(direction));
+    sub_806113C(eventObject, sprite, direction, 1, 0);
+    StartSpriteAnim(sprite, GetJumpSpecialDirectionAnimNum(direction));
 }
 
-bool8 sub_8061FB0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061F90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8061F5C(mapObject, sprite, DIR_SOUTH);
-    return sub_8061FB0(mapObject, sprite);
+    sub_8061F5C(eventObject, sprite, DIR_SOUTH);
+    return MovementAction_JumpSpecialDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061FB0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061340(mapObject, sprite))
+    if (sub_8061340(eventObject, sprite))
     {
         sprite->data[2] = 2;
-        mapObject->landingJump = 0;
+        eventObject->landingJump = 0;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8061FF8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8061FD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8061F5C(mapObject, sprite, DIR_NORTH);
-    return sub_8061FF8(mapObject, sprite);
+    sub_8061F5C(eventObject, sprite, DIR_NORTH);
+    return MovementAction_JumpSpecialUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8061FF8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061340(mapObject, sprite))
+    if (sub_8061340(eventObject, sprite))
     {
         sprite->data[2] = 2;
-        mapObject->landingJump = 0;
+        eventObject->landingJump = 0;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062040(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062020(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8061F5C(mapObject, sprite, DIR_WEST);
-    return sub_8062040(mapObject, sprite);
+    sub_8061F5C(eventObject, sprite, DIR_WEST);
+    return MovementAction_JumpSpecialLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062040(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061340(mapObject, sprite))
+    if (sub_8061340(eventObject, sprite))
     {
         sprite->data[2] = 2;
-        mapObject->landingJump = 0;
+        eventObject->landingJump = 0;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062088(struct MapObject *, struct Sprite *);
+bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062068(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8061F5C(mapObject, sprite, DIR_EAST);
-    return sub_8062088(mapObject, sprite);
+    sub_8061F5C(eventObject, sprite, DIR_EAST);
+    return MovementAction_JumpSpecialRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062088(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpSpecialRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061340(mapObject, sprite))
+    if (sub_8061340(eventObject, sprite))
     {
         sprite->data[2] = 2;
-        mapObject->landingJump = 0;
+        eventObject->landingJump = 0;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80620B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FacePlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
+    u8 playerObjectId;
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
     {
-        an_look_any(mapObject, sprite, sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y));
+        FaceDirection(eventObject, sprite, GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806210C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FaceAwayPlayer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    u8 objectId;
-    if (!TryGetFieldObjectIdByLocalIdAndMap(0xFF, MAP_GROUP(PETALBURG_CITY), MAP_NUM(PETALBURG_CITY), &objectId))
+    u8 playerObjectId;
+    if (!TryGetEventObjectIdByLocalIdAndMap(0xFF, 0, 0, &playerObjectId))
     {
-        an_look_any(mapObject, sprite, GetOppositeDirection(sub_805FE90(mapObject->currentCoords.x, mapObject->currentCoords.y, gMapObjects[objectId].currentCoords.x, gMapObjects[objectId].currentCoords.y)));
+        FaceDirection(eventObject, sprite, GetOppositeDirection(GetDirectionToFace(eventObject->currentCoords.x, eventObject->currentCoords.y, gEventObjects[playerObjectId].currentCoords.x, gEventObjects[playerObjectId].currentCoords.y)));
     }
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062170(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_LockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->facingDirectionLocked = 1;
+    eventObject->facingDirectionLocked = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062180(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnlockFacingDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->facingDirectionLocked = 0;
+    eventObject->facingDirectionLocked = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062190(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 1, 2);
-    return sub_80621BC(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 1, 2);
+    return MovementAction_JumpDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_80621BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80621E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_NORTH, 1, 2);
-    return sub_8062214(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 1, 2);
+    return MovementAction_JumpUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062214(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062240(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_WEST, 1, 2);
-    return sub_806226C(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 1, 2);
+    return MovementAction_JumpLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_806226C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062298(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_EAST, 1, 2);
-    return sub_80622C4(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 1, 2);
+    return MovementAction_JumpRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_80622C4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80622F0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 0, 0);
-    return sub_806231C(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 0);
+    return MovementAction_JumpInPlaceDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_806231C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062348(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_NORTH, 0, 0);
-    return sub_8062374(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 0);
+    return MovementAction_JumpInPlaceUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062374(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80623A0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_WEST, 0, 0);
-    return sub_80623CC(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 0);
+    return MovementAction_JumpInPlaceLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_80623CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80623F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_EAST, 0, 0);
-    return sub_8062424(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 0);
+    return MovementAction_JumpInPlaceRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062424(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062450(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDownUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_SOUTH, 0, 2);
-    return sub_806247C(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_SOUTH, 0, 2);
+    return MovementAction_JumpInPlaceDownUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_806247C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceDownUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061358(mapObject, sprite))
+    if (sub_8061358(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_80624A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_NORTH, 0, 2);
-    return sub_80624D4(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_NORTH, 0, 2);
+    return MovementAction_JumpInPlaceUpDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_80624D4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceUpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061358(mapObject, sprite))
+    if (sub_8061358(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062500(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeftRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_WEST, 0, 2);
-    return sub_806252C(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_WEST, 0, 2);
+    return MovementAction_JumpInPlaceLeftRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_806252C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceLeftRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061358(mapObject, sprite))
+    if (sub_8061358(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite);
+bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite);
 
-bool8 sub_8062558(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRightLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    maybe_shadow_1(mapObject, sprite, DIR_EAST, 0, 2);
-    return sub_8062584(mapObject, sprite);
+    maybe_shadow_1(eventObject, sprite, DIR_EAST, 0, 2);
+    return MovementAction_JumpInPlaceRightLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062584(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_JumpInPlaceRightLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061358(mapObject, sprite))
+    if (sub_8061358(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_80625B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_FaceOriginalDirection_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    an_look_any(mapObject, sprite, gUnknown_0836DC09[mapObject->animPattern]);
+    FaceDirection(eventObject, sprite, gInitialMovementTypeFacingDirections[eventObject->movementType]);
     return TRUE;
 }
 
-bool8 sub_80625C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_NurseJoyBowDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, 0x14);
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, 0x14);
     return FALSE;
 }
 
-bool8 sub_80625D8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EnableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->disableJumpLandingGroundEffect = 0;
+    eventObject->disableJumpLandingGroundEffect = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80625E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_DisableJumpLandingGroundEffect_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->disableJumpLandingGroundEffect = 1;
+    eventObject->disableJumpLandingGroundEffect = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_80625F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_DisableAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->inanimate = 1;
+    eventObject->inanimate = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062608(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RestoreAnimation_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->inanimate = GetFieldObjectGraphicsInfo(mapObject->graphicsId)->inanimate;
+    eventObject->inanimate = GetEventObjectGraphicsInfo(eventObject->graphicsId)->inanimate;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062634(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetInvisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible = 1;
+    eventObject->invisible = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetVisible_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible = 0;
+    eventObject->invisible = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteExclamationMark_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteQuestionMark_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_2);
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_QUESTION_MARK_ICON);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_EmoteHeart_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     FieldEffectStart(FLDEFF_HEART_ICON);
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_8062704(struct MapObject *, struct Sprite *);
+bool8 MovementAction_RevealTrainer_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80626C0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RevealTrainer_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->animPattern == 0x3F)
+    if (eventObject->movementType == MOVEMENT_TYPE_HIDDEN)
     {
-        sub_8084794(mapObject);
+        sub_8084794(eventObject);
         return FALSE;
     }
-    else if (mapObject->animPattern != 0x39 && mapObject->animPattern != 0x3A)
+    else if (eventObject->movementType != MOVEMENT_TYPE_TREE_DISGUISE && eventObject->movementType != MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
     {
         sprite->data[2] = 2;
         return TRUE;
     }
     else
     {
-        sub_812869C(mapObject);
+        sub_812869C(eventObject);
         sprite->data[2] = 1;
-        return sub_8062704(mapObject, sprite);
+        return MovementAction_RevealTrainer_Step1(eventObject, sprite);
     }
 }
 
-bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RevealTrainer_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_81286C4(mapObject))
+    if (sub_81286C4(eventObject))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7284,106 +6278,106 @@ bool8 sub_8062704(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062724(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    obj_anim_image_set_and_seek(sprite, 1, 0);
+    SetAndStartSpriteAnim(sprite, 1, 0);
     sprite->data[2] = 1;
     return FALSE;
 }
 
-bool8 sub_8062740(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
-        sub_8064820(sprite, 0x20);
+        SetMovementDelay(sprite, 0x20);
         sprite->data[2] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_8062764(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_RockSmashBreak_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible ^= 1;
-    if (sub_8064824(sprite))
+    eventObject->invisible ^= 1;
+    if (WaitForMovementDelay(sprite))
     {
-        mapObject->invisible = 1;
+        eventObject->invisible = 1;
         sprite->data[2] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_80627A0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    obj_anim_image_set_and_seek(sprite, 1, 0);
+    SetAndStartSpriteAnim(sprite, 1, 0);
     sprite->data[2] = 1;
     return FALSE;
 }
 
-bool8 sub_80627BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8064864(sprite))
+    if (SpriteAnimEnded(sprite))
     {
-        sub_8064820(sprite, 0x20);
+        SetMovementDelay(sprite, 0x20);
         sprite->data[2] = 2;
     }
     return FALSE;
 }
 
-bool8 sub_80627E0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_CutTree_Step2(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->invisible ^= 1;
-    if (sub_8064824(sprite))
+    eventObject->invisible ^= 1;
+    if (WaitForMovementDelay(sprite))
     {
-        mapObject->invisible = 1;
+        eventObject->invisible = 1;
         sprite->data[2] = 3;
     }
     return FALSE;
 }
 
-bool8 sub_806281C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_SetFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->fixedPriority = 1;
+    eventObject->fixedPriority = 1;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806282C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_ClearFixedPriority_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    mapObject->fixedPriority = 0;
+    eventObject->fixedPriority = 0;
     sprite->data[2] = 1;
     return TRUE;
 }
 
-bool8 sub_806283C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_InitAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sprite->oam.affineMode = 3;
+    sprite->oam.affineMode = ST_OAM_AFFINE_DOUBLE;
     InitSpriteAffineAnim(sprite);
     sprite->affineAnimPaused = 1;
     sprite->subspriteMode = 0;
     return TRUE;
 }
 
-bool8 sub_806286C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_ClearAffineAnim_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
     FreeOamMatrix(sprite->oam.matrixNum);
-    sprite->oam.affineMode = 0;
+    sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
     return TRUE;
 }
 
-bool8 sub_80628D0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_806289C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine0_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_SOUTH);
+    sub_8060ED8(eventObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     StartSpriteAffineAnimIfDifferent(sprite, 0);
-    return sub_80628D0(mapObject, sprite);
+    return MovementAction_WalkDownAffine0_Step1(eventObject, sprite);
 }
 
-bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine0_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->affineAnimPaused = 1;
         sprite->data[2] = 2;
@@ -7392,19 +6386,19 @@ bool8 sub_80628D0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8062930(struct MapObject *, struct Sprite *);
+bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80628FC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine1_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8060ED8(mapObject, sprite, DIR_SOUTH);
+    sub_8060ED8(eventObject, sprite, DIR_SOUTH);
     sprite->affineAnimPaused = 0;
     ChangeSpriteAffineAnimIfDifferent(sprite, 1);
-    return sub_8062930(mapObject, sprite);
+    return MovementAction_WalkDownAffine1_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062930(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_WalkDownAffine1_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (an_walk_any_2(mapObject, sprite))
+    if (an_walk_any_2(eventObject, sprite))
     {
         sprite->affineAnimPaused = 1;
         sprite->data[2] = 2;
@@ -7413,388 +6407,388 @@ bool8 sub_8062930(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_806295C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction)
+void sub_806295C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction)
 {
-    FieldObjectSetDirection(mapObject, direction);
-    npc_coords_shift_still(mapObject);
-    sub_805FE64(mapObject, sprite, sub_805FDD8(direction));
+    SetEventObjectDirection(eventObject, direction);
+    ShiftStillEventObjectCoords(eventObject);
+    sub_805FE64(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(direction));
     sprite->animPaused = 1;
     sprite->data[2] = 1;
 }
 
-bool8 sub_806299C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_806295C(mapObject, sprite, DIR_SOUTH);
+    sub_806295C(eventObject, sprite, DIR_SOUTH);
     return TRUE;
 }
 
-bool8 sub_80629AC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_806295C(mapObject, sprite, DIR_NORTH);
+    sub_806295C(eventObject, sprite, DIR_NORTH);
     return TRUE;
 }
 
-bool8 sub_80629BC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_806295C(mapObject, sprite, DIR_WEST);
+    sub_806295C(eventObject, sprite, DIR_WEST);
     return TRUE;
 }
 
-bool8 sub_80629CC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_806295C(mapObject, sprite, DIR_EAST);
+    sub_806295C(eventObject, sprite, DIR_EAST);
     return TRUE;
 }
 
-bool8 sub_80629DC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FD98(DIR_SOUTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroWheelieDirectionAnimNum(DIR_SOUTH));
     return FALSE;
 }
 
-bool8 sub_8062A00(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FD98(DIR_NORTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroWheelieDirectionAnimNum(DIR_NORTH));
     return FALSE;
 }
 
-bool8 sub_8062A24(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FD98(DIR_WEST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroWheelieDirectionAnimNum(DIR_WEST));
     return FALSE;
 }
 
-bool8 sub_8062A48(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FD98(DIR_EAST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroWheelieDirectionAnimNum(DIR_EAST));
     return FALSE;
 }
 
-bool8 sub_8062A6C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FDB8(DIR_SOUTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroEndWheelieDirectionAnimNum(DIR_SOUTH));
     return FALSE;
 }
 
-bool8 sub_8062A90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FDB8(DIR_NORTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroEndWheelieDirectionAnimNum(DIR_NORTH));
     return FALSE;
 }
 
-bool8 sub_8062AB4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FDB8(DIR_WEST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroEndWheelieDirectionAnimNum(DIR_WEST));
     return FALSE;
 }
 
-bool8 sub_8062AD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FDB8(DIR_EAST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroEndWheelieDirectionAnimNum(DIR_EAST));
     return FALSE;
 }
 
-bool8 sub_8062AFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnusedAcroActionDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_SOUTH, sub_805FDC8(DIR_SOUTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_SOUTH, GetAcroUnusedActionDirectionAnimNum(DIR_SOUTH));
     return FALSE;
 }
 
-bool8 sub_8062B20(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnusedAcroActionUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_NORTH, sub_805FDC8(DIR_NORTH));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_NORTH, GetAcroUnusedActionDirectionAnimNum(DIR_NORTH));
     return FALSE;
 }
 
-bool8 sub_8062B44(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnusedAcroActionLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_WEST, sub_805FDC8(DIR_WEST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_WEST, GetAcroUnusedActionDirectionAnimNum(DIR_WEST));
     return FALSE;
 }
 
-bool8 sub_8062B68(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_UnusedAcroActionRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    npc_set_direction_and_anim__an_proceed(mapObject, sprite, DIR_EAST, sub_805FDC8(DIR_EAST));
+    StartSpriteAnimInDirection(eventObject, sprite, DIR_EAST, GetAcroUnusedActionDirectionAnimNum(DIR_EAST));
     return FALSE;
 }
 
-void sub_8062B8C(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3, u8 a4)
+void sub_8062B8C(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3, u8 a4)
 {
-    sub_806113C(mapObject, sprite, direction, a3, a4);
-    StartSpriteAnimIfDifferent(sprite, sub_805FD98(direction));
-    DoShadowFieldEffect(mapObject);
+    sub_806113C(eventObject, sprite, direction, a3, a4);
+    StartSpriteAnimIfDifferent(sprite, GetAcroWheelieDirectionAnimNum(direction));
+    DoShadowFieldEffect(eventObject);
 }
 
-bool8 sub_8062BFC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062BD0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_SOUTH, 0, 1);
-    return sub_8062BFC(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_SOUTH, 0, 1);
+    return MovementAction_AcroWheelieHopFaceDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062BFC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062C54(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062C28(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_NORTH, 0, 1);
-    return sub_8062C54(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_NORTH, 0, 1);
+    return MovementAction_AcroWheelieHopFaceUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062C54(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062CAC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062C80(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_WEST, 0, 1);
-    return sub_8062CAC(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_WEST, 0, 1);
+    return MovementAction_AcroWheelieHopFaceLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062CAC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062D04(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062CD8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_EAST, 0, 1);
-    return sub_8062D04(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_EAST, 0, 1);
+    return MovementAction_AcroWheelieHopFaceRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062D04(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopFaceRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062D5C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062D30(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_SOUTH, 1, 1);
-    return sub_8062D5C(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_SOUTH, 1, 1);
+    return MovementAction_AcroWheelieHopDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062D5C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062DB4(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062D88(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_NORTH, 1, 1);
-    return sub_8062DB4(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_NORTH, 1, 1);
+    return MovementAction_AcroWheelieHopUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062DB4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062E0C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062DE0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_WEST, 1, 1);
-    return sub_8062E0C(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_WEST, 1, 1);
+    return MovementAction_AcroWheelieHopLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062E0C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062E64(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062E38(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_EAST, 1, 1);
-    return sub_8062E64(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_EAST, 1, 1);
+    return MovementAction_AcroWheelieHopRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062E64(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieHopRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062EBC(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062E90(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_SOUTH, 2, 0);
-    return sub_8062EBC(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_SOUTH, 2, 0);
+    return MovementAction_AcroWheelieJumpDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062EBC(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062F14(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062EE8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_NORTH, 2, 0);
-    return sub_8062F14(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_NORTH, 2, 0);
+    return MovementAction_AcroWheelieJumpUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062F14(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062F6C(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062F40(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_WEST, 2, 0);
-    return sub_8062F6C(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_WEST, 2, 0);
+    return MovementAction_AcroWheelieJumpLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062F6C(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062FC4(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8062F98(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8062B8C(mapObject, sprite, DIR_EAST, 2, 0);
-    return sub_8062FC4(mapObject, sprite);
+    sub_8062B8C(eventObject, sprite, DIR_EAST, 2, 0);
+    return MovementAction_AcroWheelieJumpRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8062FC4(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieJumpRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (sub_8061328(mapObject, sprite))
+    if (sub_8061328(eventObject, sprite))
     {
-        mapObject->hasShadow = 0;
+        eventObject->hasShadow = 0;
         sprite->data[2] = 2;
         return TRUE;
     }
     return FALSE;
 }
 
-bool8 sub_8062FF0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_SOUTH, sub_805FDD8(DIR_SOUTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_SOUTH, GetAcroWheeliePedalDirectionAnimNum(DIR_SOUTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063028(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_NORTH, sub_805FDD8(DIR_NORTH), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_NORTH, GetAcroWheeliePedalDirectionAnimNum(DIR_NORTH), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063060(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_WEST, sub_805FDD8(DIR_WEST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_WEST, GetAcroWheeliePedalDirectionAnimNum(DIR_WEST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063098(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieInPlaceRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80616CC(mapObject, sprite, DIR_EAST, sub_805FDD8(DIR_EAST), 8);
-    return sub_8061714(mapObject, sprite);
+    sub_80616CC(eventObject, sprite, DIR_EAST, GetAcroWheeliePedalDirectionAnimNum(DIR_EAST), 8);
+    return MovementAction_WalkInPlace_Step1(eventObject, sprite);
 }
 
-void sub_80630D0(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
+void sub_80630D0(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
-    sub_8060D20(mapObject, sprite, direction, a3);
-    StartSpriteAnim(sprite, sub_805FD98(mapObject->facingDirection));
+    sub_8060D20(eventObject, sprite, direction, a3);
+    StartSpriteAnim(sprite, GetAcroWheelieDirectionAnimNum(eventObject->facingDirection));
     SeekSpriteAnim(sprite, 0);
 }
 
-bool8 sub_8063128(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063108(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80630D0(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063128(mapObject, sprite);
+    sub_80630D0(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroPopWheelieMoveDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7802,17 +6796,17 @@ bool8 sub_8063128(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063168(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063148(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80630D0(mapObject, sprite, DIR_NORTH, 1);
-    return sub_8063168(mapObject, sprite);
+    sub_80630D0(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroPopWheelieMoveUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7820,17 +6814,17 @@ bool8 sub_8063168(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80631A8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063188(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80630D0(mapObject, sprite, DIR_WEST, 1);
-    return sub_80631A8(mapObject, sprite);
+    sub_80630D0(eventObject, sprite, DIR_WEST, 1);
+    return MovementAction_AcroPopWheelieMoveLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7838,17 +6832,17 @@ bool8 sub_80631A8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80631E8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80631C8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80630D0(mapObject, sprite, DIR_EAST, 1);
-    return sub_80631E8(mapObject, sprite);
+    sub_80630D0(eventObject, sprite, DIR_EAST, 1);
+    return MovementAction_AcroPopWheelieMoveRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroPopWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7856,23 +6850,23 @@ bool8 sub_80631E8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8063208(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
+void sub_8063208(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
-    sub_8060D20(mapObject, sprite, direction, a3);
-    sub_805FE28(mapObject, sprite, sub_805FDD8(mapObject->facingDirection));
+    sub_8060D20(eventObject, sprite, direction, a3);
+    sub_805FE28(eventObject, sprite, GetAcroWheeliePedalDirectionAnimNum(eventObject->facingDirection));
 }
 
-bool8 sub_8063258(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063238(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063208(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063258(mapObject, sprite);
+    sub_8063208(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroWheelieMoveDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7880,17 +6874,17 @@ bool8 sub_8063258(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063298(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063278(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063208(mapObject, sprite, DIR_NORTH, 1);
-    return sub_8063298(mapObject, sprite);
+    sub_8063208(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroWheelieMoveUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7898,17 +6892,17 @@ bool8 sub_8063298(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80632D8(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80632B8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063208(mapObject, sprite, DIR_WEST, 1);
-    return sub_80632D8(mapObject, sprite);
+    sub_8063208(eventObject, sprite, DIR_WEST, 1);
+    return MovementAction_AcroWheelieMoveLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7916,17 +6910,17 @@ bool8 sub_80632D8(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063318(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80632F8(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063208(mapObject, sprite, DIR_EAST, 1);
-    return sub_8063318(mapObject, sprite);
+    sub_8063208(eventObject, sprite, DIR_EAST, 1);
+    return MovementAction_AcroWheelieMoveRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7934,24 +6928,24 @@ bool8 sub_8063318(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-void sub_8063338(struct MapObject *mapObject, struct Sprite *sprite, u8 direction, u8 a3)
+void sub_8063338(struct EventObject *eventObject, struct Sprite *sprite, u8 direction, u8 a3)
 {
-    sub_8060D20(mapObject, sprite, direction, a3);
-    StartSpriteAnim(sprite, sub_805FDB8(mapObject->facingDirection));
+    sub_8060D20(eventObject, sprite, direction, a3);
+    StartSpriteAnim(sprite, GetAcroEndWheelieDirectionAnimNum(eventObject->facingDirection));
     SeekSpriteAnim(sprite, 0);
 }
 
-bool8 sub_8063390(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063370(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveDown_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063338(mapObject, sprite, DIR_SOUTH, 1);
-    return sub_8063390(mapObject, sprite);
+    sub_8063338(eventObject, sprite, DIR_SOUTH, 1);
+    return MovementAction_AcroEndWheelieMoveDown_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveDown_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7959,17 +6953,17 @@ bool8 sub_8063390(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_80633D0(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80633B0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveUp_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063338(mapObject, sprite, DIR_NORTH, 1);
-    return sub_80633D0(mapObject, sprite);
+    sub_8063338(eventObject, sprite, DIR_NORTH, 1);
+    return MovementAction_AcroEndWheelieMoveUp_Step1(eventObject, sprite);
 }
 
-bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveUp_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7977,17 +6971,17 @@ bool8 sub_80633D0(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063410(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_80633F0(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveLeft_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063338(mapObject, sprite, DIR_WEST, 1);
-    return sub_8063410(mapObject, sprite);
+    sub_8063338(eventObject, sprite, DIR_WEST, 1);
+    return MovementAction_AcroEndWheelieMoveLeft_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveLeft_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -7995,17 +6989,17 @@ bool8 sub_8063410(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063450(struct MapObject *, struct Sprite *);
+bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *, struct Sprite *);
 
-bool8 sub_8063430(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveRight_Step0(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_8063338(mapObject, sprite, DIR_EAST, 1);
-    return sub_8063450(mapObject, sprite);
+    sub_8063338(eventObject, sprite, DIR_EAST, 1);
+    return MovementAction_AcroEndWheelieMoveRight_Step1(eventObject, sprite);
 }
 
-bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_AcroEndWheelieMoveRight_Step1(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (npc_obj_ministep_stop_on_arrival(mapObject, sprite))
+    if (npc_obj_ministep_stop_on_arrival(eventObject, sprite))
     {
         sprite->data[2] = 2;
         return TRUE;
@@ -8013,430 +7007,276 @@ bool8 sub_8063450(struct MapObject *mapObject, struct Sprite *sprite)
     return FALSE;
 }
 
-bool8 sub_8063470(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_Finish(struct EventObject *eventObject, struct Sprite *sprite)
 {
     return TRUE;
 }
 
-bool8 sub_8063474(struct MapObject *mapObject, struct Sprite *sprite)
+bool8 MovementAction_PauseSpriteAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->animPaused = 1;
     return TRUE;
 }
 
-void npc_obj_transfer_image_anim_pause_flag(struct MapObject *mapObject, struct Sprite *sprite)
+static void UpdateEventObjectSpriteAnimPause(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->disableAnim)
-    {
+    if (eventObject->disableAnim)
         sprite->animPaused = 1;
-    }
 }
 
-void sub_80634A0(struct MapObject *mapObject, struct Sprite *sprite)
+static void TryEnableEventObjectAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (mapObject->enableAnim)
+    if (eventObject->enableAnim)
     {
         sprite->animPaused = 0;
-        mapObject->disableAnim = 0;
-        mapObject->enableAnim = 0;
+        eventObject->disableAnim = 0;
+        eventObject->enableAnim = 0;
     }
 }
 
-void sub_80634E8(struct MapObject *, struct Sprite *);
-static void UpdateMapObjSpriteVisibility(struct MapObject *, struct Sprite *);
-
-void sub_80634D0(struct MapObject *mapObject, struct Sprite *sprite)
+static void UpdateEventObjectVisibility(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    sub_80634E8(mapObject, sprite);
-    UpdateMapObjSpriteVisibility(mapObject, sprite);
+    UpdateEventObjectIsOffscreen(eventObject, sprite);
+    UpdateEventObjSpriteVisibility(eventObject, sprite);
 }
 
-#ifdef NONMATCHING
-void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite)
-{
-    u16 x;
-    u16 y;
-    s16 x2;
-    s16 y2;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
-    mapObject->offScreen = 0;
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+static void UpdateEventObjectIsOffscreen(struct EventObject *eventObject, struct Sprite *sprite)
+{
+    u16 x, y;
+    s16 x2, y2;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
+    eventObject->offScreen = 0;
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     if (sprite->coordOffsetEnabled)
     {
         x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
         y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
-    } else
+    }
+    else
     {
         x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
         y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
     }
-    x2 = graphicsInfo->width + x; // offending line
-    y2 = graphicsInfo->height + y; // similarly offending line
+
+    x2 = graphicsInfo->width + (s16)x;
+    y2 = graphicsInfo->height + (s16)y;
     if ((s16)x >= 0x100 || x2 < -0x10)
     {
-        mapObject->offScreen = 1;
+        eventObject->offScreen = 1;
     }
     if ((s16)y >= 0xB0 || y2 < -0x10)
     {
-        mapObject->offScreen = 1;
+        eventObject->offScreen = 1;
     }
 }
-#else
-NAKED
-void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite) {
-    asm(".syntax unified\n\
-    push {r4-r6,lr}\n\
-    adds r5, r0, 0\n\
-    adds r4, r1, 0\n\
-    ldrb r1, [r5, 0x1]\n\
-    movs r0, 0x41\n\
-    negs r0, r0\n\
-    ands r0, r1\n\
-    strb r0, [r5, 0x1]\n\
-    ldrb r0, [r5, 0x5]\n\
-    bl GetFieldObjectGraphicsInfo\n\
-    adds r6, r0, 0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0x3E\n\
-    ldrb r1, [r0]\n\
-    movs r0, 0x2\n\
-    ands r0, r1\n\
-    cmp r0, 0\n\
-    beq _0806354C\n\
-    ldrh r1, [r4, 0x24]\n\
-    ldrh r0, [r4, 0x20]\n\
-    adds r1, r0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0x28\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    ldr r2, _08063544 @ =gSpriteCoordOffsetX\n\
-    adds r0, r1\n\
-    ldrh r2, [r2]\n\
-    adds r0, r2\n\
-    lsls r0, 16\n\
-    lsrs r3, r0, 16\n\
-    ldrh r1, [r4, 0x26]\n\
-    ldrh r0, [r4, 0x22]\n\
-    adds r1, r0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0x29\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    ldr r2, _08063548 @ =gSpriteCoordOffsetY\n\
-    adds r0, r1\n\
-    ldrh r2, [r2]\n\
-    adds r0, r2\n\
-    b _08063574\n\
-    .align 2, 0\n\
-_08063544: .4byte gSpriteCoordOffsetX\n\
-_08063548: .4byte gSpriteCoordOffsetY\n\
-_0806354C:\n\
-    ldrh r1, [r4, 0x24]\n\
-    ldrh r0, [r4, 0x20]\n\
-    adds r1, r0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0x28\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    adds r0, r1\n\
-    lsls r0, 16\n\
-    lsrs r3, r0, 16\n\
-    ldrh r1, [r4, 0x26]\n\
-    ldrh r0, [r4, 0x22]\n\
-    adds r1, r0\n\
-    adds r0, r4, 0\n\
-    adds r0, 0x29\n\
-    ldrb r0, [r0]\n\
-    lsls r0, 24\n\
-    asrs r0, 24\n\
-    adds r0, r1\n\
-_08063574:\n\
-    lsls r0, 16\n\
-    lsrs r2, r0, 16\n\
-    ldrh r0, [r6, 0x8]\n\
-    adds r0, r3\n\
-    lsls r0, 16\n\
-    lsrs r1, r0, 16\n\
-    ldrh r0, [r6, 0xA]\n\
-    adds r0, r2\n\
-    lsls r0, 16\n\
-    lsrs r4, r0, 16\n\
-    lsls r0, r3, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0xFF\n\
-    bgt _0806359C\n\
-    lsls r0, r1, 16\n\
-    asrs r0, 16\n\
-    movs r1, 0x10\n\
-    negs r1, r1\n\
-    cmp r0, r1\n\
-    bge _080635A4\n\
-_0806359C:\n\
-    ldrb r0, [r5, 0x1]\n\
-    movs r1, 0x40\n\
-    orrs r0, r1\n\
-    strb r0, [r5, 0x1]\n\
-_080635A4:\n\
-    lsls r0, r2, 16\n\
-    asrs r0, 16\n\
-    cmp r0, 0xAF\n\
-    bgt _080635B8\n\
-    lsls r0, r4, 16\n\
-    asrs r0, 16\n\
-    movs r1, 0x10\n\
-    negs r1, r1\n\
-    cmp r0, r1\n\
-    bge _080635C0\n\
-_080635B8:\n\
-    ldrb r0, [r5, 0x1]\n\
-    movs r1, 0x40\n\
-    orrs r0, r1\n\
-    strb r0, [r5, 0x1]\n\
-_080635C0:\n\
-    pop {r4-r6}\n\
-    pop {r0}\n\
-    bx r0\n\
-.syntax divided\n");
-}
-#endif
 
-void UpdateMapObjSpriteVisibility(struct MapObject *mapObject, struct Sprite *sprite)
+static void UpdateEventObjSpriteVisibility(struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->invisible = 0;
-    if (mapObject->invisible || mapObject->offScreen)
+    if (eventObject->invisible || eventObject->offScreen)
     {
         sprite->invisible = 1;
     }
 }
 
-static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8);
-static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8);
-static void DoTracksGroundEffect_BikeTireTracks(
-struct MapObject *mapObj, struct Sprite *sprite, u8);
-void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_MoveOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_SpawnOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_MoveOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_SandTracks(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_DeepSandTracks(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite);
-void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite);
-u8 GetReflectionTypeByMetatileBehavior(u32 behavior);
-
-static void GetAllGroundEffectFlags_OnSpawn(struct MapObject *mapObj, u32 *flags)
-{
-    FieldObjectUpdateMetatileBehaviors(mapObj);
-    GetGroundEffectFlags_Reflection(mapObj, flags);
-    GetGroundEffectFlags_TallGrassOnSpawn(mapObj, flags);
-    GetGroundEffectFlags_LongGrassOnSpawn(mapObj, flags);
-    GetGroundEffectFlags_SandPile(mapObj, flags);
-    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
-    GetGroundEffectFlags_ShortGrass(mapObj, flags);
-    GetGroundEffectFlags_HotSprings(mapObj, flags);
-}
-
-static void GetAllGroundEffectFlags_OnBeginStep(struct MapObject *mapObj, u32 *flags)
-{
-    FieldObjectUpdateMetatileBehaviors(mapObj);
-    GetGroundEffectFlags_Reflection(mapObj, flags);
-    GetGroundEffectFlags_TallGrassOnBeginStep(mapObj, flags);
-    GetGroundEffectFlags_LongGrassOnBeginStep(mapObj, flags);
-    GetGroundEffectFlags_Tracks(mapObj, flags);
-    GetGroundEffectFlags_SandPile(mapObj, flags);
-    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
-    GetGroundEffectFlags_Puddle(mapObj, flags);
-    GetGroundEffectFlags_ShortGrass(mapObj, flags);
-    GetGroundEffectFlags_HotSprings(mapObj, flags);
-}
-
-static void GetAllGroundEffectFlags_OnFinishStep(struct MapObject *mapObj, u32 *flags)
-{
-    FieldObjectUpdateMetatileBehaviors(mapObj);
-    GetGroundEffectFlags_ShallowFlowingWater(mapObj, flags);
-    GetGroundEffectFlags_SandPile(mapObj, flags);
-    GetGroundEffectFlags_Puddle(mapObj, flags);
-    GetGroundEffectFlags_Ripple(mapObj, flags);
-    GetGroundEffectFlags_ShortGrass(mapObj, flags);
-    GetGroundEffectFlags_HotSprings(mapObj, flags);
-    GetGroundEffectFlags_Seaweed(mapObj, flags);
-    GetGroundEffectFlags_JumpLanding(mapObj, flags);
-}
-
-void FieldObjectUpdateMetatileBehaviors(struct MapObject *mapObj)
-{
-    mapObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(mapObj->previousCoords.x, mapObj->previousCoords.y);
-    mapObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(mapObj->currentCoords.x, mapObj->currentCoords.y);
-}
-
-void GetGroundEffectFlags_Reflection(struct MapObject *mapObj, u32 *flags)
+static void GetAllGroundEffectFlags_OnSpawn(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_Reflection(eventObj, flags);
+    GetGroundEffectFlags_TallGrassOnSpawn(eventObj, flags);
+    GetGroundEffectFlags_LongGrassOnSpawn(eventObj, flags);
+    GetGroundEffectFlags_SandPile(eventObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+}
+
+static void GetAllGroundEffectFlags_OnBeginStep(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_Reflection(eventObj, flags);
+    GetGroundEffectFlags_TallGrassOnBeginStep(eventObj, flags);
+    GetGroundEffectFlags_LongGrassOnBeginStep(eventObj, flags);
+    GetGroundEffectFlags_Tracks(eventObj, flags);
+    GetGroundEffectFlags_SandPile(eventObj, flags);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_Puddle(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+}
+
+static void GetAllGroundEffectFlags_OnFinishStep(struct EventObject *eventObj, u32 *flags)
+{
+    EventObjectUpdateMetatileBehaviors(eventObj);
+    GetGroundEffectFlags_ShallowFlowingWater(eventObj, flags);
+    GetGroundEffectFlags_SandPile(eventObj, flags);
+    GetGroundEffectFlags_Puddle(eventObj, flags);
+    GetGroundEffectFlags_Ripple(eventObj, flags);
+    GetGroundEffectFlags_ShortGrass(eventObj, flags);
+    GetGroundEffectFlags_HotSprings(eventObj, flags);
+    GetGroundEffectFlags_Seaweed(eventObj, flags);
+    GetGroundEffectFlags_JumpLanding(eventObj, flags);
+}
+
+void EventObjectUpdateMetatileBehaviors(struct EventObject *eventObj)
+{
+    eventObj->previousMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->previousCoords.x, eventObj->previousCoords.y);
+    eventObj->currentMetatileBehavior = MapGridGetMetatileBehaviorAt(eventObj->currentCoords.x, eventObj->currentCoords.y);
+}
+
+void GetGroundEffectFlags_Reflection(struct EventObject *eventObj, u32 *flags)
 {
     u32 reflectionFlags[2] = { GROUND_EFFECT_FLAG_REFLECTION, GROUND_EFFECT_FLAG_ICE_REFLECTION };
-    u8 type = FieldObjectCheckForReflectiveSurface(mapObj);
+    u8 type = EventObjectCheckForReflectiveSurface(eventObj);
 
     if (type)
     {
-        if (!mapObj->hasReflection)
+        if (!eventObj->hasReflection)
         {
-            mapObj->hasReflection = 0;
-            mapObj->hasReflection = 1;
+            eventObj->hasReflection = 0;
+            eventObj->hasReflection = 1;
             *flags |= reflectionFlags[type - 1];
         }
     }
     else
     {
-        mapObj->hasReflection = 0;
+        eventObj->hasReflection = 0;
     }
 }
 
-void GetGroundEffectFlags_TallGrassOnSpawn(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_TallGrassOnSpawn(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsTallGrass(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_SPAWN;
 }
 
-void GetGroundEffectFlags_TallGrassOnBeginStep(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_TallGrassOnBeginStep(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsTallGrass(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_IsTallGrass(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_TALL_GRASS_ON_MOVE;
 }
 
-void GetGroundEffectFlags_LongGrassOnSpawn(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_LongGrassOnSpawn(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_SPAWN;
 }
 
-void GetGroundEffectFlags_LongGrassOnBeginStep(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_LongGrassOnBeginStep(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_LONG_GRASS_ON_MOVE;
 }
 
-void GetGroundEffectFlags_Tracks(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_Tracks(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsDeepSand(mapObj->previousMetatileBehavior))
+    if (MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
     {
         *flags |= GROUND_EFFECT_FLAG_DEEP_SAND;
     }
-    else if (MetatileBehavior_IsSandOrDeepSand(mapObj->previousMetatileBehavior)
-             || MetatileBehavior_IsUnusedFootprintMetatile(mapObj->previousMetatileBehavior))
+    else if (MetatileBehavior_IsSandOrDeepSand(eventObj->previousMetatileBehavior)
+             || MetatileBehavior_IsUnusedFootprintMetatile(eventObj->previousMetatileBehavior))
     {
         *flags |= GROUND_EFFECT_FLAG_SAND;
     }
 }
 
-void GetGroundEffectFlags_SandPile(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_SandPile(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsDeepSand(mapObj->currentMetatileBehavior)
-        && MetatileBehavior_IsDeepSand(mapObj->previousMetatileBehavior))
+    if (MetatileBehavior_IsDeepSand(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsDeepSand(eventObj->previousMetatileBehavior))
     {
-        if (!mapObj->inSandPile)
+        if (!eventObj->inSandPile)
         {
-            mapObj->inSandPile = 0;
-            mapObj->inSandPile = 1;
+            eventObj->inSandPile = 0;
+            eventObj->inSandPile = 1;
             *flags |= GROUND_EFFECT_FLAG_SAND_PILE;
         }
     }
     else
     {
-        mapObj->inSandPile = 0;
+        eventObj->inSandPile = 0;
     }
 }
 
-void GetGroundEffectFlags_ShallowFlowingWater(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_ShallowFlowingWater(struct EventObject *eventObj, u32 *flags)
 {
-    if ((MetatileBehavior_IsShallowFlowingWater(mapObj->currentMetatileBehavior)
-         && MetatileBehavior_IsShallowFlowingWater(mapObj->previousMetatileBehavior))
-        || (MetatileBehavior_IsPacifidlogLog(mapObj->currentMetatileBehavior)
-            && MetatileBehavior_IsPacifidlogLog(mapObj->previousMetatileBehavior)))
+    if ((MetatileBehavior_IsShallowFlowingWater(eventObj->currentMetatileBehavior)
+         && MetatileBehavior_IsShallowFlowingWater(eventObj->previousMetatileBehavior))
+        || (MetatileBehavior_IsPacifidlogLog(eventObj->currentMetatileBehavior)
+            && MetatileBehavior_IsPacifidlogLog(eventObj->previousMetatileBehavior)))
     {
-        if (!mapObj->inShallowFlowingWater)
+        if (!eventObj->inShallowFlowingWater)
         {
-            mapObj->inShallowFlowingWater = 0;
-            mapObj->inShallowFlowingWater = 1;
+            eventObj->inShallowFlowingWater = 0;
+            eventObj->inShallowFlowingWater = 1;
             *flags |= GROUND_EFFECT_FLAG_SHALLOW_FLOWING_WATER;
         }
     }
     else
     {
-        mapObj->inShallowFlowingWater = 0;
+        eventObj->inShallowFlowingWater = 0;
     }
 }
 
-void GetGroundEffectFlags_Puddle(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_Puddle(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsPuddle(mapObj->currentMetatileBehavior)
-        && MetatileBehavior_IsPuddle(mapObj->previousMetatileBehavior))
+    if (MetatileBehavior_IsPuddle(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsPuddle(eventObj->previousMetatileBehavior))
     {
         *flags |= GROUND_EFFECT_FLAG_PUDDLE;
     }
 }
 
-void GetGroundEffectFlags_Ripple(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_Ripple(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_HasRipples(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_HasRipples(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_RIPPLES;
 }
 
-void GetGroundEffectFlags_ShortGrass(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_ShortGrass(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsShortGrass(mapObj->currentMetatileBehavior)
-        && MetatileBehavior_IsShortGrass(mapObj->previousMetatileBehavior))
+    if (MetatileBehavior_IsShortGrass(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsShortGrass(eventObj->previousMetatileBehavior))
     {
-        if (!mapObj->inShortGrass)
+        if (!eventObj->inShortGrass)
         {
-            mapObj->inShortGrass = 0;
-            mapObj->inShortGrass = 1;
+            eventObj->inShortGrass = 0;
+            eventObj->inShortGrass = 1;
             *flags |= GROUND_EFFECT_FLAG_SHORT_GRASS;
         }
     }
     else
     {
-        mapObj->inShortGrass = 0;
+        eventObj->inShortGrass = 0;
     }
 }
 
-void GetGroundEffectFlags_HotSprings(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_HotSprings(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsHotSprings(mapObj->currentMetatileBehavior)
-        && MetatileBehavior_IsHotSprings(mapObj->previousMetatileBehavior))
+    if (MetatileBehavior_IsHotSprings(eventObj->currentMetatileBehavior)
+        && MetatileBehavior_IsHotSprings(eventObj->previousMetatileBehavior))
     {
-        if (!mapObj->inHotSprings)
+        if (!eventObj->inHotSprings)
         {
-            mapObj->inHotSprings = 0;
-            mapObj->inHotSprings = 1;
+            eventObj->inHotSprings = 0;
+            eventObj->inHotSprings = 1;
             *flags |= GROUND_EFFECT_FLAG_HOT_SPRINGS;
         }
     }
     else
     {
-        mapObj->inHotSprings = 0;
+        eventObj->inHotSprings = 0;
     }
 }
 
-void GetGroundEffectFlags_Seaweed(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_Seaweed(struct EventObject *eventObj, u32 *flags)
 {
-    if (MetatileBehavior_IsSeaweed(mapObj->currentMetatileBehavior))
+    if (MetatileBehavior_IsSeaweed(eventObj->currentMetatileBehavior))
         *flags |= GROUND_EFFECT_FLAG_SEAWEED;
 }
 
-void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
+void GetGroundEffectFlags_JumpLanding(struct EventObject *eventObj, u32 *flags)
 {
     typedef bool8 (*MetatileFunc)(u8);
 
@@ -8458,13 +7298,13 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
         GROUND_EFFECT_FLAG_LAND_ON_NORMAL_GROUND,
     };
 
-    if (mapObj->landingJump && !mapObj->disableJumpLandingGroundEffect)
+    if (eventObj->landingJump && !eventObj->disableJumpLandingGroundEffect)
     {
         u8 i;
 
         for (i = 0; i < ARRAY_COUNT(metatileFuncs); i++)
         {
-            if (metatileFuncs[i](mapObj->currentMetatileBehavior))
+            if (metatileFuncs[i](eventObj->currentMetatileBehavior))
             {
                 *flags |= jumpLandingFlags[i];
                 return;
@@ -8473,9 +7313,9 @@ void GetGroundEffectFlags_JumpLanding(struct MapObject *mapObj, u32 *flags)
     }
 }
 
-u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj)
+u8 EventObjectCheckForReflectiveSurface(struct EventObject *eventObj)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
 
     // ceil div by tile width?
     s16 width = (info->width + 8) >> 4;
@@ -8494,14 +7334,14 @@ u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj)
 
     for (i = 0, one = 1; i < height; i++)
     {
-        RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x, mapObj->currentCoords.y + one + i)
-        RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x, mapObj->previousCoords.y + one + i)
+        RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x, eventObj->currentCoords.y + one + i)
+        RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x, eventObj->previousCoords.y + one + i)
         for (j = 1; j < width; j++)
         {
-            RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x + j, mapObj->currentCoords.y + one + i)
-            RETURN_REFLECTION_TYPE_AT(mapObj->currentCoords.x - j, mapObj->currentCoords.y + one + i)
-            RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x + j, mapObj->previousCoords.y + one + i)
-            RETURN_REFLECTION_TYPE_AT(mapObj->previousCoords.x - j, mapObj->previousCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x + j, eventObj->currentCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->currentCoords.x - j, eventObj->currentCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x + j, eventObj->previousCoords.y + one + i)
+            RETURN_REFLECTION_TYPE_AT(eventObj->previousCoords.x - j, eventObj->previousCoords.y + one + i)
         }
     }
     return 0;
@@ -8509,7 +7349,7 @@ u8 FieldObjectCheckForReflectiveSurface(struct MapObject *mapObj)
 #undef RETURN_REFLECTION_TYPE_AT
 }
 
-u8 GetReflectionTypeByMetatileBehavior(u32 behavior)
+static u8 GetReflectionTypeByMetatileBehavior(u32 behavior)
 {
     if (MetatileBehavior_IsIce(behavior))
         return 1;
@@ -8545,20 +7385,20 @@ u8 GetLedgeJumpDirection(s16 x, s16 y, u8 z)
     return 0;
 }
 
-void FieldObjectSetSpriteOamTableForLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void SetEventObjectSpriteOamTableForLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    if (mapObj->disableCoveringGroundEffects)
+    if (eventObj->disableCoveringGroundEffects)
         return;
 
-    if (!MetatileBehavior_IsLongGrass(mapObj->currentMetatileBehavior))
+    if (!MetatileBehavior_IsLongGrass(eventObj->currentMetatileBehavior))
         return;
 
-    if (!MetatileBehavior_IsLongGrass(mapObj->previousMetatileBehavior))
+    if (!MetatileBehavior_IsLongGrass(eventObj->previousMetatileBehavior))
         return;
 
     sprite->subspriteTableNum = 4;
 
-    if (ZCoordToPriority(mapObj->previousElevation) == 1)
+    if (ZCoordToPriority(eventObj->previousElevation) == 1)
         sprite->subspriteTableNum = 5;
 }
 
@@ -8584,54 +7424,54 @@ static const u8 sUnknown_08376050[] = {
     0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
 };
 
-// Each byte corresponds to a sprite priority for a field object.
-// This is directly the inverse of gFieldObjectPriorities_08376070.
-static const u8 sFieldObjectPriorities_08376060[] = {
+// Each byte corresponds to a sprite priority for an event object.
+// This is directly the inverse of gEventObjectPriorities_08376070.
+static const u8 sEventObjectPriorities_08376060[] = {
     2, 2, 2, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 0, 0, 2
 };
 
-// Each byte corresponds to a sprite priority for a field object.
-// This is the inverse of gFieldObjectPriorities_08376060.
+// Each byte corresponds to a sprite priority for an event object.
+// This is the inverse of gEventObjectPriorities_08376060.
 // 1 = Above player sprite
 // 2 = Below player sprite
-static const u8 sFieldObjectPriorities_08376070[] = {
+static const u8 sEventObjectPriorities_08376070[] = {
     1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 0, 0, 1,
 };
 
-void FieldObjectUpdateZCoordAndPriority(struct MapObject *mapObj, struct Sprite *sprite)
+void UpdateEventObjectZCoordAndPriority(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    if (mapObj->fixedPriority)
+    if (eventObj->fixedPriority)
         return;
 
-    FieldObjectUpdateZCoord(mapObj);
+    EventObjectUpdateZCoord(eventObj);
 
-    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[mapObj->previousElevation];
-    sprite->oam.priority = sFieldObjectPriorities_08376060[mapObj->previousElevation];
+    sprite->subspriteTableNum = sEventObjectPriorities_08376070[eventObj->previousElevation];
+    sprite->oam.priority = sEventObjectPriorities_08376060[eventObj->previousElevation];
 }
 
-void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z)
+static void InitObjectPriorityByZCoord(struct Sprite *sprite, u8 z)
 {
-    sprite->subspriteTableNum = sFieldObjectPriorities_08376070[z];
-    sprite->oam.priority = sFieldObjectPriorities_08376060[z];
+    sprite->subspriteTableNum = sEventObjectPriorities_08376070[z];
+    sprite->oam.priority = sEventObjectPriorities_08376060[z];
 }
 
 u8 ZCoordToPriority(u8 z)
 {
-    return sFieldObjectPriorities_08376060[z];
+    return sEventObjectPriorities_08376060[z];
 }
 
-void FieldObjectUpdateZCoord(struct MapObject *mapObj)
+void EventObjectUpdateZCoord(struct EventObject *eventObj)
 {
-    u8 z = MapGridGetZCoordAt(mapObj->currentCoords.x, mapObj->currentCoords.y);
-    u8 z2 = MapGridGetZCoordAt(mapObj->previousCoords.x, mapObj->previousCoords.y);
+    u8 z = MapGridGetZCoordAt(eventObj->currentCoords.x, eventObj->currentCoords.y);
+    u8 z2 = MapGridGetZCoordAt(eventObj->previousCoords.x, eventObj->previousCoords.y);
 
     if (z == 0xF || z2 == 0xF)
         return;
 
-    mapObj->currentElevation = z;
+    eventObj->currentElevation = z;
 
     if (z != 0 && z != 0xF)
-        mapObj->previousElevation = z;
+        eventObj->previousElevation = z;
 }
 
 void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
@@ -8644,12 +7484,12 @@ void SetObjectSubpriorityByZCoord(u8 a, struct Sprite *sprite, u8 b)
     sprite->subpriority = tmp3 + sUnknown_08376050[a] + b;
 }
 
-void FieldObjectUpdateSubpriority(struct MapObject *mapObj, struct Sprite *sprite)
+static void EventObjectUpdateSubpriority(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    if (mapObj->fixedPriority)
+    if (eventObj->fixedPriority)
         return;
 
-    SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1);
+    SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1);
 }
 
 bool8 AreZCoordsCompatible(u8 a, u8 b)
@@ -8663,111 +7503,110 @@ bool8 AreZCoordsCompatible(u8 a, u8 b)
     return TRUE;
 }
 
-void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_SpawnOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
-    gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum;
-    gFieldEffectArguments[5] = mapObj->mapGroup;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
     gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup;
     gFieldEffectArguments[7] = 1;
     FieldEffectStart(FLDEFF_TALL_GRASS);
 }
 
-void GroundEffect_MoveOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_MoveOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
-    gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum;
-    gFieldEffectArguments[5] = mapObj->mapGroup;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
     gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup;
     gFieldEffectArguments[7] = 0;
     FieldEffectStart(FLDEFF_TALL_GRASS);
 }
 
-void GroundEffect_SpawnOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_SpawnOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
-    gFieldEffectArguments[4] = mapObj->localId << 8 | mapObj->mapNum;
-    gFieldEffectArguments[5] = mapObj->mapGroup;
+    gFieldEffectArguments[4] = eventObj->localId << 8 | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
     gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup;
     gFieldEffectArguments[7] = 1;
     FieldEffectStart(FLDEFF_LONG_GRASS);
 }
 
-void GroundEffect_MoveOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_MoveOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
-    gFieldEffectArguments[4] = (mapObj->localId << 8) | mapObj->mapNum;
-    gFieldEffectArguments[5] = mapObj->mapGroup;
+    gFieldEffectArguments[4] = (eventObj->localId << 8) | eventObj->mapNum;
+    gFieldEffectArguments[5] = eventObj->mapGroup;
     gFieldEffectArguments[6] = (u8)gSaveBlock1.location.mapNum << 8 | (u8)gSaveBlock1.location.mapGroup;
     gFieldEffectArguments[7] = 0;
     FieldEffectStart(FLDEFF_LONG_GRASS);
 }
 
-void GroundEffect_WaterReflection(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_WaterReflection(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    SetUpReflection(mapObj, sprite, 0);
+    SetUpReflection(eventObj, sprite, 0);
 }
 
-void GroundEffect_IceReflection(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_IceReflection(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    SetUpReflection(mapObj, sprite, 1);
+    SetUpReflection(eventObj, sprite, 1);
 }
 
-void GroundEffect_FlowingWater(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_FlowingWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_FEET_IN_FLOWING_WATER, mapObj);
+    StartFieldEffectForEventObject(FLDEFF_FEET_IN_FLOWING_WATER, eventObj);
 }
 
-static void (*const gUnknown_08376080[])(struct MapObject *mapObj, struct Sprite *sprite, u8 a) = {
+static void (*const sGroundEffectTracksFuncs[])(struct EventObject *eventObj, struct Sprite *sprite, u8 a) = {
     nullsub, DoTracksGroundEffect_Footprints, DoTracksGroundEffect_BikeTireTracks,
 };
 
-void GroundEffect_SandTracks(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_SandTracks(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
-    gUnknown_08376080[info->tracks](mapObj, sprite, 0);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
+    sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 0);
 }
 
-void GroundEffect_DeepSandTracks(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_DeepSandTracks(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *info = GetFieldObjectGraphicsInfo(mapObj->graphicsId);
-    gUnknown_08376080[info->tracks](mapObj, sprite, 1);
+    const struct EventObjectGraphicsInfo *info = GetEventObjectGraphicsInfo(eventObj->graphicsId);
+    sGroundEffectTracksFuncs[info->tracks](eventObj, sprite, 1);
 }
 
-static void nullsub(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+static void nullsub(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
 {
 }
 
-static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+static void DoTracksGroundEffect_Footprints(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
 {
     // First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
     u16 sandFootprints_FieldEffectData[2] = {
-            FLDEFF_SAND_FOOTPRINTS,
-            FLDEFF_DEEP_SAND_FOOTPRINTS
+        FLDEFF_SAND_FOOTPRINTS,
+        FLDEFF_DEEP_SAND_FOOTPRINTS
     };
 
-    gFieldEffectArguments[0] = mapObj->previousCoords.x;
-    gFieldEffectArguments[1] = mapObj->previousCoords.y;
+    gFieldEffectArguments[0] = eventObj->previousCoords.x;
+    gFieldEffectArguments[1] = eventObj->previousCoords.y;
     gFieldEffectArguments[2] = 149;
     gFieldEffectArguments[3] = 2;
-    gFieldEffectArguments[4] = mapObj->facingDirection;
+    gFieldEffectArguments[4] = eventObj->facingDirection;
     FieldEffectStart(sandFootprints_FieldEffectData[a]);
 }
 
-static void DoTracksGroundEffect_BikeTireTracks(
-    struct MapObject *mapObj, struct Sprite *sprite, u8 a)
+static void DoTracksGroundEffect_BikeTireTracks(struct EventObject *eventObj, struct Sprite *sprite, u8 a)
 {
     //  Specifies which bike track shape to show next.
     //  For example, when the bike turns from up to right, it will show
@@ -8782,104 +7621,104 @@ static void DoTracksGroundEffect_BikeTireTracks(
         6, 7, 3, 4,
     };
 
-    if (mapObj->currentCoords.x != mapObj->previousCoords.x || mapObj->currentCoords.y != mapObj->previousCoords.y)
+    if (eventObj->currentCoords.x != eventObj->previousCoords.x || eventObj->currentCoords.y != eventObj->previousCoords.y)
     {
-        gFieldEffectArguments[0] = mapObj->previousCoords.x;
-        gFieldEffectArguments[1] = mapObj->previousCoords.y;
+        gFieldEffectArguments[0] = eventObj->previousCoords.x;
+        gFieldEffectArguments[1] = eventObj->previousCoords.y;
         gFieldEffectArguments[2] = 149;
         gFieldEffectArguments[3] = 2;
         gFieldEffectArguments[4] =
-            bikeTireTracks_Transitions[mapObj->previousMovementDirection][mapObj->facingDirection - 5];
+            bikeTireTracks_Transitions[eventObj->previousMovementDirection][eventObj->facingDirection - 5];
         FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS);
     }
 }
 
-void GroundEffect_Ripple(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_Ripple(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    DoRippleFieldEffect(mapObj, sprite);
+    DoRippleFieldEffect(eventObj, sprite);
 }
 
-void GroundEffect_StepOnPuddle(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_StepOnPuddle(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SPLASH, mapObj);
+    StartFieldEffectForEventObject(FLDEFF_SPLASH, eventObj);
 }
 
-void GroundEffect_SandPile(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_SandPile(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SAND_PILE, mapObj);
+    StartFieldEffectForEventObject(FLDEFF_SAND_PILE, eventObj);
 }
 
-void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_JumpOnTallGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u8 spriteId;
 
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
     FieldEffectStart(FLDEFF_JUMP_TALL_GRASS);
 
     spriteId = sub_8126FF0(
-        mapObj->localId, mapObj->mapNum, mapObj->mapGroup, mapObj->currentCoords.x, mapObj->currentCoords.y);
+        eventObj->localId, eventObj->mapNum, eventObj->mapGroup, eventObj->currentCoords.x, eventObj->currentCoords.y);
 
     if (spriteId == MAX_SPRITES)
-        GroundEffect_SpawnOnTallGrass(mapObj, sprite);
+        GroundEffect_SpawnOnTallGrass(eventObj, sprite);
 }
 
-void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_JumpOnLongGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = 2;
     FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
 }
 
-void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_JumpOnShallowWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
 }
 
-void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_JumpOnWater(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
 }
 
-void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_JumpLandingDust(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = mapObj->previousElevation;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = eventObj->previousElevation;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_DUST);
 }
 
-void GroundEffect_ShortGrass(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_ShortGrass(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_SHORT_GRASS, mapObj);
+    StartFieldEffectForEventObject(FLDEFF_SHORT_GRASS, eventObj);
 }
 
-void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_HotSprings(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    oe_exec_and_other_stuff(FLDEFF_HOT_SPRINGS_WATER, mapObj);
+    StartFieldEffectForEventObject(FLDEFF_HOT_SPRINGS_WATER, eventObj);
 }
 
-void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
+void GroundEffect_Seaweed(struct EventObject *eventObj, struct Sprite *sprite)
 {
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
     FieldEffectStart(FLDEFF_BUBBLES);
 }
 
-static void (*const sGroundEffectFuncs[])(struct MapObject *mapObj, struct Sprite *sprite) = {
+static void (*const sGroundEffectFuncs[])(struct EventObject *eventObj, struct Sprite *sprite) = {
     GroundEffect_SpawnOnTallGrass,
     GroundEffect_MoveOnTallGrass,
     GroundEffect_SpawnOnLongGrass,
@@ -8902,22 +7741,22 @@ static void (*const sGroundEffectFuncs[])(struct MapObject *mapObj, struct Sprit
     GroundEffect_Seaweed
 };
 
-static void StartTriggeredGroundEffects(struct MapObject *mapObj, struct Sprite *sprite, u32 flags)
+static void StartTriggeredGroundEffects(struct EventObject *eventObj, struct Sprite *sprite, u32 flags)
 {
     u8 i;
     for (i = 0; i < ARRAY_COUNT(sGroundEffectFuncs); i++, flags >>= 1)
         if (flags & 1)
-            sGroundEffectFuncs[i](mapObj, sprite);
+            sGroundEffectFuncs[i](eventObj, sprite);
 }
 
-void filters_out_some_ground_effects(struct MapObject *mapObj, u32 *flags)
+void FilterOutDisabledCoveringGroundEffects(struct EventObject *eventObj, u32 *flags)
 {
-    if (mapObj->disableCoveringGroundEffects)
+    if (eventObj->disableCoveringGroundEffects)
     {
-        mapObj->inShortGrass = 0;
-        mapObj->inSandPile = 0;
-        mapObj->inShallowFlowingWater = 0;
-        mapObj->inHotSprings = 0;
+        eventObj->inShortGrass = 0;
+        eventObj->inSandPile = 0;
+        eventObj->inShallowFlowingWater = 0;
+        eventObj->inHotSprings = 0;
         *flags &= ~(GROUND_EFFECT_FLAG_HOT_SPRINGS
                   | GROUND_EFFECT_FLAG_SHORT_GRASS
                   | GROUND_EFFECT_FLAG_SAND_PILE
@@ -8926,71 +7765,153 @@ void filters_out_some_ground_effects(struct MapObject *mapObj, u32 *flags)
     }
 }
 
-void FilterOutStepOnPuddleGroundEffectIfJumping(struct MapObject *mapObj, u32 *flags)
+void FilterOutStepOnPuddleGroundEffectIfJumping(struct EventObject *eventObj, u32 *flags)
 {
-    if (mapObj->landingJump)
+    if (eventObj->landingJump)
         *flags &= ~GROUND_EFFECT_FLAG_PUDDLE;
 }
 
-void DoGroundEffects_OnSpawn(struct MapObject *mapObj, struct Sprite *sprite)
+static void DoGroundEffects_OnSpawn(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
-    if (mapObj->triggerGroundEffectsOnMove)
+    if (eventObj->triggerGroundEffectsOnMove)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
-        GetAllGroundEffectFlags_OnSpawn(mapObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
-        StartTriggeredGroundEffects(mapObj, sprite, flags);
-        mapObj->triggerGroundEffectsOnMove = 0;
-        mapObj->disableCoveringGroundEffects = 0;
+        UpdateEventObjectZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnSpawn(eventObj, &flags);
+        SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite);
+        StartTriggeredGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnMove = 0;
+        eventObj->disableCoveringGroundEffects = 0;
     }
 }
 
-void DoGroundEffects_OnBeginStep(struct MapObject *mapObj, struct Sprite *sprite)
+static void DoGroundEffects_OnBeginStep(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
-    if (mapObj->triggerGroundEffectsOnMove)
+    if (eventObj->triggerGroundEffectsOnMove)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
-        GetAllGroundEffectFlags_OnBeginStep(mapObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
-        filters_out_some_ground_effects(mapObj, &flags);
-        StartTriggeredGroundEffects(mapObj, sprite, flags);
-        mapObj->triggerGroundEffectsOnMove = 0;
-        mapObj->disableCoveringGroundEffects = 0;
+        UpdateEventObjectZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnBeginStep(eventObj, &flags);
+        SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite);
+        FilterOutDisabledCoveringGroundEffects(eventObj, &flags);
+        StartTriggeredGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnMove = 0;
+        eventObj->disableCoveringGroundEffects = 0;
     }
 }
 
-void DoGroundEffects_OnFinishStep(struct MapObject *mapObj, struct Sprite *sprite)
+static void DoGroundEffects_OnFinishStep(struct EventObject *eventObj, struct Sprite *sprite)
 {
     u32 flags;
 
-    if (mapObj->triggerGroundEffectsOnStop)
+    if (eventObj->triggerGroundEffectsOnStop)
     {
         flags = 0;
-        FieldObjectUpdateZCoordAndPriority(mapObj, sprite);
-        GetAllGroundEffectFlags_OnFinishStep(mapObj, &flags);
-        FieldObjectSetSpriteOamTableForLongGrass(mapObj, sprite);
-        FilterOutStepOnPuddleGroundEffectIfJumping(mapObj, &flags);
-        StartTriggeredGroundEffects(mapObj, sprite, flags);
-        mapObj->triggerGroundEffectsOnStop = 0;
-        mapObj->landingJump = 0;
+        UpdateEventObjectZCoordAndPriority(eventObj, sprite);
+        GetAllGroundEffectFlags_OnFinishStep(eventObj, &flags);
+        SetEventObjectSpriteOamTableForLongGrass(eventObj, sprite);
+        FilterOutStepOnPuddleGroundEffectIfJumping(eventObj, &flags);
+        StartTriggeredGroundEffects(eventObj, sprite, flags);
+        eventObj->triggerGroundEffectsOnStop = 0;
+        eventObj->landingJump = 0;
+    }
+}
+
+bool8 FreezeEventObject(struct EventObject *eventObject)
+{
+    if (eventObject->heldMovementActive || eventObject->frozen)
+    {
+        return TRUE;
+    }
+    else
+    {
+        eventObject->frozen = 1;
+        eventObject->spriteAnimPausedBackup = gSprites[eventObject->spriteId].animPaused;
+        eventObject->spriteAffineAnimPausedBackup = gSprites[eventObject->spriteId].affineAnimPaused;
+        gSprites[eventObject->spriteId].animPaused = 1;
+        gSprites[eventObject->spriteId].affineAnimPaused = 1;
+        return FALSE;
+    }
+}
+
+void FreezeEventObjects(void)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
+}
+
+void FreezeEventObjectsExceptOne(u8 eventObjectId)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (i != eventObjectId && gEventObjects[i].active && i != gPlayerAvatar.eventObjectId)
+            FreezeEventObject(&gEventObjects[i]);
+}
+
+void UnfreezeEventObject(struct EventObject *eventObject)
+{
+    if (eventObject->active && eventObject->frozen)
+    {
+        eventObject->frozen = 0;
+        gSprites[eventObject->spriteId].animPaused = eventObject->spriteAnimPausedBackup;
+        gSprites[eventObject->spriteId].affineAnimPaused = eventObject->spriteAffineAnimPausedBackup;
     }
 }
 
-typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 dir);
+void UnfreezeEventObjects(void)
+{
+    u8 i;
+    for (i = 0; i < 16; i++)
+        if (gEventObjects[i].active)
+            UnfreezeEventObject(&gEventObjects[i]);
+}
+
+static void Step1(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += gDirectionToVectors[dir].x;
+    sprite->pos1.y += gDirectionToVectors[dir].y;
+}
+
+static void Step2(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y;
+}
+
+static void Step3(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 2 * (u16) gDirectionToVectors[dir].x + (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 2 * (u16) gDirectionToVectors[dir].y + (u16) gDirectionToVectors[dir].y;
+}
+
+static void Step4(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 4 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 4 * (u16) gDirectionToVectors[dir].y;
+}
+
+static void Step8(struct Sprite *sprite, u8 dir)
+{
+    sprite->pos1.x += 8 * (u16) gDirectionToVectors[dir].x;
+    sprite->pos1.y += 8 * (u16) gDirectionToVectors[dir].y;
+}
+
+static void oamt_npc_ministep_reset(struct Sprite *sprite, u8 direction, u8 a3)
+{
+    sprite->data[3] = direction;
+    sprite->data[4] = a3;
+    sprite->data[5] = 0;
+}
 
-void Step1(struct Sprite *sprite, u8 dir);
-void Step2(struct Sprite *sprite, u8 dir);
-void Step3(struct Sprite *sprite, u8 dir);
-void Step4(struct Sprite *sprite, u8 dir);
-void Step8(struct Sprite *sprite, u8 dir);
+typedef void (*SpriteStepFunc)(struct Sprite *sprite, u8 direction);
 
-const SpriteStepFunc Unknown_83760F0[] = {
+static const SpriteStepFunc Unknown_83760F0[] = {
     Step1,
     Step1,
     Step1,
@@ -9009,7 +7930,7 @@ const SpriteStepFunc Unknown_83760F0[] = {
     Step1
 };
 
-const SpriteStepFunc Unknown_8376130[] = {
+static const SpriteStepFunc Unknown_8376130[] = {
     Step2,
     Step2,
     Step2,
@@ -9020,7 +7941,7 @@ const SpriteStepFunc Unknown_8376130[] = {
     Step2
 };
 
-const SpriteStepFunc Unknown_8376150[] = {
+static const SpriteStepFunc Unknown_8376150[] = {
     Step2,
     Step3,
     Step3,
@@ -9029,19 +7950,19 @@ const SpriteStepFunc Unknown_8376150[] = {
     Step3
 };
 
-const SpriteStepFunc Unknown_8376168[] = {
+static const SpriteStepFunc Unknown_8376168[] = {
     Step4,
     Step4,
     Step4,
     Step4
 };
 
-const SpriteStepFunc Unknown_8376178[] = {
+static const SpriteStepFunc Unknown_8376178[] = {
     Step8,
     Step8
 };
 
-const SpriteStepFunc *const gUnknown_08376180[] = {
+static const SpriteStepFunc *const gUnknown_08376180[] = {
     Unknown_83760F0,
     Unknown_8376130,
     Unknown_8376150,
@@ -9049,116 +7970,10 @@ const SpriteStepFunc *const gUnknown_08376180[] = {
     Unknown_8376178
 };
 
-const s16 gUnknown_08376194[] = {
+static const s16 gUnknown_08376194[] = {
     16, 8, 6, 4, 2
 };
 
-const s8 Unknown_837619E[] = {
-     -4,  -6,  -8, -10, -11, -12, -12, -12, -11, -10,  -9,  -8,  -6,  -4,   0,   0
-};
-
-const s8 Unknown_83761AE[] = {
-      0,  -2,  -3,  -4,  -5,  -6,  -6,  -6,  -5,  -5,  -4,  -3,  -2,   0,   0,   0
-};
-
-const s8 Unknown_83761BE[] = {
-     -2,  -4,  -6,  -8,  -9, -10, -10, -10,  -9,  -8,  -6,  -5,  -3,  -2,   0,   0
-};
-
-const s8 *const gUnknown_083761D0[] = {
-    Unknown_837619E,
-    Unknown_83761AE,
-    Unknown_83761BE
-};
-
-bool8 FreezeMapObject(struct MapObject *mapObject)
-{
-    if (mapObject->specialAnimActive || mapObject->frozen)
-    {
-        return TRUE;
-    }
-    else
-    {
-        mapObject->frozen = 1;
-        mapObject->spriteAnimPausedBackup = gSprites[mapObject->spriteId].animPaused;
-        mapObject->spriteAffineAnimPausedBackup = gSprites[mapObject->spriteId].affineAnimPaused;
-        gSprites[mapObject->spriteId].animPaused = 1;
-        gSprites[mapObject->spriteId].affineAnimPaused = 1;
-        return FALSE;
-    }
-}
-
-void FreezeMapObjects(void)
-{
-    u8 i;
-    for (i = 0; i < 16; i++)
-        if (gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
-}
-
-void FreezeMapObjectsExceptOne(u8 a1)
-{
-    u8 i;
-    for (i = 0; i < 16; i++)
-        if (i != a1 && gMapObjects[i].active && i != gPlayerAvatar.mapObjectId)
-            FreezeMapObject(&gMapObjects[i]);
-}
-
-void UnfreezeMapObject(struct MapObject *mapObject)
-{
-    if (mapObject->active && mapObject->frozen)
-    {
-        mapObject->frozen = 0;
-        gSprites[mapObject->spriteId].animPaused = mapObject->spriteAnimPausedBackup;
-        gSprites[mapObject->spriteId].affineAnimPaused = mapObject->spriteAffineAnimPausedBackup;
-    }
-}
-
-void UnfreezeMapObjects(void)
-{
-    u8 i;
-    for (i = 0; i < 16; i++)
-        if (gMapObjects[i].active)
-            UnfreezeMapObject(&gMapObjects[i]);
-}
-
-void Step1(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += gDirectionToVector[dir].x;
-    sprite->pos1.y += gDirectionToVector[dir].y;
-}
-
-void Step2(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 2 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 2 * (u16) gDirectionToVector[dir].y;
-}
-
-void Step3(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 2 * (u16) gDirectionToVector[dir].x + (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 2 * (u16) gDirectionToVector[dir].y + (u16) gDirectionToVector[dir].y;
-}
-
-void Step4(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 4 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 4 * (u16) gDirectionToVector[dir].y;
-}
-
-void Step8(struct Sprite *sprite, u8 dir)
-{
-    sprite->pos1.x += 8 * (u16) gDirectionToVector[dir].x;
-    sprite->pos1.y += 8 * (u16) gDirectionToVector[dir].y;
-}
-
-void oamt_npc_ministep_reset(struct Sprite *sprite, u8 a2, u8 a3)
-{
-    sprite->data[3] = a2;
-    sprite->data[4] = a3;
-    sprite->data[5] = 0;
-}
-
 bool8 obj_npc_ministep(struct Sprite *sprite)
 {
     if (sprite->data[5] >= gUnknown_08376194[sprite->data[4]])
@@ -9174,9 +7989,9 @@ bool8 obj_npc_ministep(struct Sprite *sprite)
     return TRUE;
 }
 
-void sub_806467C(struct Sprite *sprite, u8 a2)
+void sub_806467C(struct Sprite *sprite, u8 direction)
 {
-    sprite->data[3] = a2;
+    sprite->data[3] = direction;
     sprite->data[4] = 0;
     sprite->data[5] = 0;
 }
@@ -9197,6 +8012,24 @@ bool8 sub_806468C(struct Sprite *sprite)
         return FALSE;
 }
 
+static const s8 Unknown_837619E[] = {
+     -4,  -6,  -8, -10, -11, -12, -12, -12, -11, -10,  -9,  -8,  -6,  -4,   0,   0
+};
+
+static const s8 Unknown_83761AE[] = {
+      0,  -2,  -3,  -4,  -5,  -6,  -6,  -6,  -5,  -5,  -4,  -3,  -2,   0,   0,   0
+};
+
+static const s8 Unknown_83761BE[] = {
+     -2,  -4,  -6,  -8,  -9, -10, -10, -10,  -9,  -8,  -6,  -5,  -3,  -2,   0,   0
+};
+
+static const s8 *const gUnknown_083761D0[] = {
+    Unknown_837619E,
+    Unknown_83761AE,
+    Unknown_83761BE
+};
+
 s16 sub_80646C8(s16 a1, u8 a2)
 {
     return gUnknown_083761D0[a2][a1];
@@ -9260,12 +8093,12 @@ u8 sub_806478C(struct Sprite *sprite)
     return v2;
 }
 
-void sub_8064820(struct Sprite *sprite, s16 a2)
+static void SetMovementDelay(struct Sprite *sprite, s16 delay)
 {
-    sprite->data[3] = a2;
+    sprite->data[3] = delay;
 }
 
-bool8 sub_8064824(struct Sprite *sprite)
+static bool8 WaitForMovementDelay(struct Sprite *sprite)
 {
     sprite->data[3]--;
 
@@ -9275,14 +8108,14 @@ bool8 sub_8064824(struct Sprite *sprite)
         return FALSE;
 }
 
-void obj_anim_image_set_and_seek(struct Sprite *sprite, u8 a2, u8 a3)
+void SetAndStartSpriteAnim(struct Sprite *sprite, u8 animNum, u8 animCmdIndex)
 {
-    sprite->animNum = a2;
-    sprite->animPaused = 0 ;
-    SeekSpriteAnim(sprite, a3);
+    sprite->animNum = animNum;
+    sprite->animPaused = 0;
+    SeekSpriteAnim(sprite, animCmdIndex);
 }
 
-bool8 sub_8064864(struct Sprite *sprite)
+bool8 SpriteAnimEnded(struct Sprite *sprite)
 {
     if (sprite->animEnded)
         return TRUE;
@@ -9290,7 +8123,7 @@ bool8 sub_8064864(struct Sprite *sprite)
         return FALSE;
 }
 
-void sub_806487C(struct Sprite *sprite, bool8 invisible)
+void UpdateEventObjectSpriteVisibility(struct Sprite *sprite, bool8 invisible)
 {
     u16 x, y;
     s16 x2, y2;
@@ -9317,45 +8150,45 @@ void sub_806487C(struct Sprite *sprite, bool8 invisible)
         sprite->invisible = 1;
 }
 
-void sub_8064970(struct Sprite *sprite)
+static void UpdateEventObjectSpriteSubpriorityAndVisibility(struct Sprite *sprite)
 {
     SetObjectSubpriorityByZCoord(sprite->data[1], sprite, 1);
-    sub_806487C(sprite, 0);
+    UpdateEventObjectSpriteVisibility(sprite, 0);
 }
 
-void sub_8064990(u8 a1, u8 dir)
+void TurnEventObject(u8 eventObjectId, u8 direction)
 {
     u8 i;
     for (i = 0; i < MAX_SPRITES; i++)
     {
         struct Sprite *sprite = &gSprites[i];
-        if (sprite->inUse && sprite->callback == sub_8064970 && (u8)sprite->data[0] == a1)
+        if (sprite->inUse && sprite->callback == UpdateEventObjectSpriteSubpriorityAndVisibility && (u8)sprite->data[0] == eventObjectId)
         {
-            u8 animNum = FieldObjectDirectionToImageAnimId(dir);
+            u8 animNum = GetFaceDirectionAnimNum(direction);
             StartSpriteAnim(sprite, animNum);
             break;
         }
     }
 }
 
-u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
+u32 StartFieldEffectForEventObject(u8 fieldEffectId, struct EventObject *eventObject)
 {
-    FieldObjectGetLocalIdAndMap(mapObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    EventObjectGetLocalIdAndMap(eventObject, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
     return FieldEffectStart(fieldEffectId);
 }
 
-void DoShadowFieldEffect(struct MapObject *mapObject)
+void DoShadowFieldEffect(struct EventObject *eventObject)
 {
-    if (!mapObject->hasShadow)
+    if (!eventObject->hasShadow)
     {
-        mapObject->hasShadow = 1;
-        oe_exec_and_other_stuff(FLDEFF_SHADOW, mapObject);
+        eventObject->hasShadow = 1;
+        StartFieldEffectForEventObject(FLDEFF_SHADOW, eventObject);
     }
 }
 
-void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
+void DoRippleFieldEffect(struct EventObject *eventObject, struct Sprite *sprite)
 {
-    const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    const struct EventObjectGraphicsInfo *gfxInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     gFieldEffectArguments[0] = sprite->pos1.x;
     gFieldEffectArguments[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
     gFieldEffectArguments[2] = 151;
diff --git a/src/field_camera.c b/src/field_camera.c
index 8384ad8d1..2d4d4eabd 100644
--- a/src/field_camera.c
+++ b/src/field_camera.c
@@ -402,7 +402,7 @@ void CameraUpdate(void)
     if (deltaX != 0 || deltaY != 0)
     {
         CameraMove(deltaX, deltaY);
-        UpdateFieldObjectsForCameraUpdate(deltaX, deltaY);
+        UpdateEventObjectsForCameraUpdate(deltaX, deltaY);
         RotatingGatePuzzleCameraUpdate(deltaX, deltaY);
         ResetBerryTreeSparkleFlags();
         tilemap_move_something(&gUnknown_03000590, deltaX * 2, deltaY * 2);
@@ -417,7 +417,7 @@ void CameraUpdate(void)
 void camera_move_and_redraw(int a, int b)
 {
     CameraMove(a, b);
-    UpdateFieldObjectsForCameraUpdate(a, b);
+    UpdateEventObjectsForCameraUpdate(a, b);
     DrawWholeMapView();
     gUnknown_0300489C -= a * 16;
     gUnknown_03004898 -= b * 16;
@@ -473,7 +473,7 @@ static void CameraPanningCB_PanAhead(void)
             gUnknown_0300059C = 0;
         }
 
-        var = player_get_direction_upper_nybble();
+        var = GetPlayerMovementDirection();
         if (var == 2)
         {
             if (gUnknown_0300059A > -8)
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 918ab0e21..1252f0296 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -33,7 +33,7 @@ struct Coords32
 
 extern u16 gSpecialVar_LastTalked;
 extern u16 gSpecialVar_Facing;
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
+extern struct LinkPlayerEventObject gLinkPlayerEventObjects[];
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
 extern u8 gUnknown_020297ED;
@@ -41,7 +41,7 @@ extern u8 gUnknown_020297ED;
 static EWRAM_DATA u8 gUnknown_0202E8C0 = 0;
 static EWRAM_DATA u16 gUnknown_0202E8C2 = 0;
 
-u8 gSelectedMapObject;
+u8 gSelectedEventObject;
 
 //scripts
 extern u8 gUnknown_081A2C51[];
@@ -88,7 +88,7 @@ static u16 cur_mapdata_block_role_at_player_pos(int);
 static bool8 sub_80681F0(struct MapPosition *position, u16 b, u8 c);
 static u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c);
 static u8 *sub_8068364(struct MapPosition *, u8, u8);
-static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *, u8, u8 c);
+static u8 *TryGetInvisibleEventObjectScript(struct MapPosition *, u8, u8 c);
 static u8 *sub_8068500(struct MapPosition *, u8, u8);
 static u8 *TryGetFieldMoveScript(struct MapPosition *, u8, u8);
 static bool32 sub_8068770(void);
@@ -105,7 +105,7 @@ static void sub_8068C30(struct MapHeader *, s8, struct MapPosition *);
 static bool8 map_warp_consider_2_to_inside(struct MapPosition *, u16, u8);
 static s8 map_warp_check(struct MapHeader *, u16, u16, u8);
 static u8 *mapheader_trigger_activate_at(struct MapHeader *, u16, u16, u8);
-static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *, u16, u16, u8);;
+static struct BgEvent *FindInvisibleEventObjectByPosition(struct MapHeader *, u16, u16, u8);;
 
 void FieldClearPlayerInput(struct FieldInput *input)
 {
@@ -197,7 +197,7 @@ int sub_8068024(struct FieldInput *input)
     u8 r6;
     u16 r4;
 
-    r6 = player_get_direction_lower_nybble();
+    r6 = GetPlayerFacingDirection();
     player_get_pos_to_and_height(&position);
     r4 = MapGridGetMetatileBehaviorAt(position.x, position.y);
 #if DEBUG
@@ -322,7 +322,7 @@ static u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c)
     script = sub_8068364(position, b, c);
     if (script != NULL)
         return script;
-    script = TryGetInvisibleMapObjectScript(position, b, c);
+    script = TryGetInvisibleEventObjectScript(position, b, c);
     if (script != NULL)
         return script;
     script = sub_8068500(position, b, c);
@@ -341,20 +341,20 @@ u8 *sub_80682A8(struct MapPosition *position, u8 unused, u8 c)
     s32 i;
 
     if (!MetatileBehavior_IsCounter(MapGridGetMetatileBehaviorAt(position->x, position->y)))
-        r3 = GetFieldObjectIdByXYZ(position->x, position->y, position->height);
+        r3 = GetEventObjectIdByXYZ(position->x, position->y, position->height);
     else
-        r3 = GetFieldObjectIdByXYZ(position->x + gUnknown_0821664C[c].x, position->y + gUnknown_0821664C[c].y, position->height);
-    if (r3 == 16 || gMapObjects[r3].localId == 0xFF)
+        r3 = GetEventObjectIdByXYZ(position->x + gUnknown_0821664C[c].x, position->y + gUnknown_0821664C[c].y, position->height);
+    if (r3 == 16 || gEventObjects[r3].localId == 0xFF)
         return NULL;
     for (i = 0; i < 4; i++)
     {
-        if (gLinkPlayerMapObjects[i].active == TRUE && gLinkPlayerMapObjects[i].mapObjId == r3)
+        if (gLinkPlayerEventObjects[i].active == TRUE && gLinkPlayerEventObjects[i].eventObjId == r3)
             return NULL;
     }
-    gSelectedMapObject = r3;
-    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSelectedEventObject = r3;
+    gSpecialVar_LastTalked = gEventObjects[r3].localId;
     gSpecialVar_Facing = c;
-    return GetFieldObjectScriptPointerByFieldObjectId(r3);
+    return GetEventObjectScriptPointerByEventObjectId(r3);
 }
 
 static u8 *sub_8068364(struct MapPosition *position, u8 b, u8 c)
@@ -362,27 +362,27 @@ static u8 *sub_8068364(struct MapPosition *position, u8 b, u8 c)
     u8 r3;
     u8 *script;
 
-    r3 = GetFieldObjectIdByXYZ(position->x, position->y, position->height);
-    if (r3 == 16 || gMapObjects[r3].localId == 0xFF)
+    r3 = GetEventObjectIdByXYZ(position->x, position->y, position->height);
+    if (r3 == 16 || gEventObjects[r3].localId == 0xFF)
     {
         if (MetatileBehavior_IsCounter(b) != TRUE)
             return NULL;
-        r3 = GetFieldObjectIdByXYZ(position->x + gUnknown_0821664C[c].x, position->y + gUnknown_0821664C[c].y, position->height);
-        if (r3 == 16 || gMapObjects[r3].localId == 0xFF)
+        r3 = GetEventObjectIdByXYZ(position->x + gUnknown_0821664C[c].x, position->y + gUnknown_0821664C[c].y, position->height);
+        if (r3 == 16 || gEventObjects[r3].localId == 0xFF)
             return NULL;
     }
     //_080683E8
-    gSelectedMapObject = r3;
-    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSelectedEventObject = r3;
+    gSpecialVar_LastTalked = gEventObjects[r3].localId;
     gSpecialVar_Facing = c;
-    script = GetFieldObjectScriptPointerByFieldObjectId(r3);
+    script = GetEventObjectScriptPointerByEventObjectId(r3);
     script = GetRamScript(gSpecialVar_LastTalked, script);
     return script;
 }
 
-static u8 *TryGetInvisibleMapObjectScript(struct MapPosition *position, u8 unused, u8 c)
+static u8 *TryGetInvisibleEventObjectScript(struct MapPosition *position, u8 unused, u8 c)
 {
-    struct BgEvent *bgEvent = FindInvisibleMapObjectByPosition(&gMapHeader, position->x - 7, position->y - 7, position->height);
+    struct BgEvent *bgEvent = FindInvisibleEventObjectByPosition(&gMapHeader, position->x - 7, position->y - 7, position->height);
 
     if (bgEvent == NULL)
         return NULL;
@@ -849,7 +849,7 @@ u8 *sub_8068E24(struct MapPosition *position)
     return mapheader_trigger_activate_at(&gMapHeader, position->x - 7, position->y - 7, position->height);
 }
 
-static struct BgEvent *FindInvisibleMapObjectByPosition(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
+static struct BgEvent *FindInvisibleEventObjectByPosition(struct MapHeader *mapHeader, u16 b, u16 c, u8 d)
 {
     u8 i;
     struct BgEvent *bgEvents = mapHeader->events->bgEvents;
@@ -911,12 +911,12 @@ u8 sub_8068F18(void)
     return 0;
 }
 
-u8 *GetFieldObjectScriptPointerPlayerFacing(void)
+u8 *GetEventObjectScriptPointerPlayerFacing(void)
 {
     u8 r4;
     struct MapPosition position;
 
-    r4 = player_get_direction_upper_nybble();
+    r4 = GetPlayerMovementDirection();
     player_get_next_pos_and_height(&position);
     return sub_8068364(&position, MapGridGetMetatileBehaviorAt(position.x, position.y), r4);
 }
@@ -925,7 +925,7 @@ int SetCableClubWarp(void)
 {
     struct MapPosition position;
 
-    player_get_direction_upper_nybble();  //unnecessary
+    GetPlayerMovementDirection();  //unnecessary
     player_get_pos_to_and_height(&position);
     MapGridGetMetatileBehaviorAt(position.x, position.y);  //unnecessary
     sub_8068C30(&gMapHeader, map_warp_check_packed(&gMapHeader, &position), &position);
diff --git a/src/field_effect.c b/src/field_effect.c
index 51d1a1a0a..24609254a 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -267,7 +267,7 @@ bool8 (*const gUnknown_0839F300[])(struct Task *) = {
     sub_8086ED4
 };
 
-bool8 (*const gUnknown_0839F31C[])(struct Task *, struct MapObject *) = {
+bool8 (*const gUnknown_0839F31C[])(struct Task *, struct EventObject *) = {
     sub_8086FB0,
     waterfall_1_do_anim_probably,
     waterfall_2_wait_anim_finish_probably,
@@ -281,7 +281,7 @@ bool8 (*const gUnknown_0839F330[])(struct Task *) = {
     dive_3_unknown
 };
 
-bool8 (*const gUnknown_0839F33C[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0839F33C[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_808722C,
     sub_8087264,
     sub_8087298,
@@ -290,14 +290,14 @@ bool8 (*const gUnknown_0839F33C[])(struct Task *, struct MapObject *, struct Spr
     sub_80873F4
 };
 
-bool8 (*const gUnknown_0839F354[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0839F354[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_80874CC,
     sub_80874FC,
     sub_8087548,
     sub_808759C
 };
 
-bool8 (*const gUnknown_0839F364[])(struct Task *, struct MapObject *, struct Sprite *) = {
+bool8 (*const gUnknown_0839F364[])(struct Task *, struct EventObject *, struct Sprite *) = {
     sub_80876C8,
     sub_80876F8,
     sub_8087774,
@@ -1081,7 +1081,7 @@ void mapldr_080842E8(void)
     pal_fill_black();
     CreateTask(task00_8084310, 0);
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
 }
 
@@ -1118,13 +1118,13 @@ void mapldr_08084390(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_black();
     CreateTask(c3_080843F8, 0);
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     if (gPlayerAvatar.flags & 0x08)
     {
-        FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST);
+        EventObjectTurn(&gEventObjects[gPlayerAvatar.eventObjectId], DIR_WEST);
     }
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
 }
 
@@ -1144,7 +1144,7 @@ void c3_080843F8(u8 taskId)
     if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
     {
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(taskId);
     }
 }
@@ -1159,7 +1159,7 @@ void sub_8086748(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_map_transition();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_8086774, 0);
     gFieldCallback = NULL;
 }
@@ -1173,14 +1173,14 @@ void sub_8086774(u8 taskId)
 
 bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0]
 {
-    struct MapObject *playerObject;
+    struct EventObject *playerObject;
     struct Sprite *playerSprite;
-    playerObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     playerSprite = &gSprites[gPlayerAvatar.spriteId];
     CameraObjectReset2();
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     gPlayerAvatar.preventStep = TRUE;
-    FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+    EventObjectSetHeldMovement(playerObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
     task->data[4] = playerSprite->subspriteMode;
     playerObject->fixedPriority = 1;
     playerSprite->oam.priority = 1;
@@ -1207,7 +1207,7 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
     sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
     task->data[1] = 1;
     task->data[2] = 0;
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
     PlaySE(SE_RU_HYUU);
     task->data[0]++;
     return FALSE;
@@ -1215,10 +1215,10 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
 
 bool8 sub_80868E4(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
 
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     sprite = &gSprites[gPlayerAvatar.spriteId];
     sprite->pos2.y += task->data[1];
     if (task->data[1] < 8)
@@ -1232,15 +1232,15 @@ bool8 sub_80868E4(struct Task *task)
     if (task->data[3] == 0 && sprite->pos2.y >= -16)
     {
         task->data[3]++;
-        mapObject->fixedPriority = 0;
+        eventObject->fixedPriority = 0;
         sprite->subspriteMode = task->data[4];
-        mapObject->triggerGroundEffectsOnMove = 1;
+        eventObject->triggerGroundEffectsOnMove = 1;
     }
     if (sprite->pos2.y >= 0)
     {
         PlaySE(SE_W070);
-        mapObject->triggerGroundEffectsOnStop = 1;
-        mapObject->landingJump = 1;
+        eventObject->triggerGroundEffectsOnStop = 1;
+        eventObject->landingJump = 1;
         sprite->pos2.y = 0;
         task->data[0]++;
     }
@@ -1277,7 +1277,7 @@ bool8 sub_80869F8(struct Task *task)
     gPlayerAvatar.preventStep = FALSE;
     ScriptContext2_Disable();
     CameraObjectReset1();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     InstallCameraPanAheadCallback();
     DestroyTask(FindTaskIdByFunc(sub_8086774));
     return FALSE;
@@ -1317,7 +1317,7 @@ void sub_8086A68(u8 taskId)
 
 bool8 sub_8086AA0(struct Task *task)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     sub_80B4824(task->data[1]);
     task->data[0]++;
@@ -1326,11 +1326,11 @@ bool8 sub_8086AA0(struct Task *task)
 
 bool8 sub_8086AC0(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(GetPlayerFacingDirection()));
         task->data[0]++;
         task->data[2] = 0;
         task->data[3] = 0;
@@ -1441,13 +1441,13 @@ void sub_8086CBC(u8 taskId)
 
 bool8 sub_8086CF4(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     s16 x;
     s16 y;
     u8 behavior;
     CameraObjectReset2();
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(DIR_EAST));
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(DIR_EAST));
     PlayerGetDestCoords(&x, &y);
     behavior = MapGridGetMetatileBehaviorAt(x, y);
     task->data[0]++;
@@ -1539,13 +1539,13 @@ bool8 sub_8086EB0(struct Task *task)
 
 bool8 sub_8086ED4(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         CameraObjectReset1();
         ScriptContext2_Disable();
-        FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST));
+        EventObjectSetHeldMovement(eventObject, GetWalkNormalMovementAction(DIR_EAST));
         DestroyTask(FindTaskIdByFunc(sub_8086CBC));
     }
     return FALSE;
@@ -1564,10 +1564,10 @@ bool8 FldEff_UseWaterfall(void)
 
 void sub_8086F64(u8 taskId)
 {
-    while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId]));
+    while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]));
 }
 
-bool8 sub_8086FB0(struct Task *task, struct MapObject *mapObject)
+bool8 sub_8086FB0(struct Task *task, struct EventObject *eventObject)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
@@ -1575,12 +1575,12 @@ bool8 sub_8086FB0(struct Task *task, struct MapObject *mapObject)
     return FALSE;
 }
 
-bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObject)
+bool8 waterfall_1_do_anim_probably(struct Task *task, struct EventObject *eventObject)
 {
     ScriptContext2_Enable();
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
+    if (!EventObjectIsMovementOverridden(eventObject))
     {
-        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
+        EventObjectClearHeldMovementIfFinished(eventObject);
         gFieldEffectArguments[0] = task->data[1];
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         task->data[0]++;
@@ -1588,7 +1588,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec
     return FALSE;
 }
 
-bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject *mapObject)
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct EventObject *eventObject)
 {
     if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
@@ -1598,20 +1598,20 @@ bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject
     return TRUE;
 }
 
-bool8 sub_8087030(struct Task *task, struct MapObject *mapObject)
+bool8 sub_8087030(struct Task *task, struct EventObject *eventObject)
 {
-    FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(DIR_NORTH));
+    EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(DIR_NORTH));
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_8087058(struct Task *task, struct MapObject *mapObject)
+bool8 sub_8087058(struct Task *task, struct EventObject *eventObject)
 {
-    if (!FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (!EventObjectClearHeldMovementIfFinished(eventObject))
     {
         return FALSE;
     }
-    if (MetatileBehavior_IsWaterfall(mapObject->currentMetatileBehavior))
+    if (MetatileBehavior_IsWaterfall(eventObject->currentMetatileBehavior))
     {
         task->data[0] = 3;
         return TRUE;
@@ -1663,7 +1663,7 @@ bool8 dive_3_unknown(struct Task *task)
     PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior);
+        dive_warp(&mapPosition, gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior);
         DestroyTask(FindTaskIdByFunc(Task_Dive));
         FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
     }
@@ -1680,22 +1680,22 @@ void sub_80871B8(u8 priority)
 
 void sub_80871D0(u8 taskId)
 {
-    while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_808722C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808722C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     SetCameraPanningCallback(NULL);
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->fixedPriority = 1;
+    eventObject->fixedPriority = 1;
     task->data[1] = 1;
     task->data[0]++;
     return TRUE;
 }
 
-bool8 sub_8087264(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8087264(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     SetCameraPanning(0, task->data[1]);
     task->data[1] = -task->data[1];
@@ -1708,12 +1708,12 @@ bool8 sub_8087264(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8087298(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite->pos2.y = 0;
     task->data[3] = 1;
-    gFieldEffectArguments[0] = mapObject->currentCoords.x;
-    gFieldEffectArguments[1] = mapObject->currentCoords.y;
+    gFieldEffectArguments[0] = eventObject->currentCoords.x;
+    gFieldEffectArguments[1] = eventObject->currentCoords.y;
     gFieldEffectArguments[2] = sprite->subpriority - 1;
     gFieldEffectArguments[3] = sprite->oam.priority;
     FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
@@ -1722,7 +1722,7 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite
     return TRUE;
 }
 
-bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80872E4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     s16 centerToCornerVecY;
     SetCameraPanning(0, task->data[1]);
@@ -1754,7 +1754,7 @@ bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite
     if (task->data[5] == 0 && sprite->pos2.y < -0x10)
     {
         task->data[5]++;
-        mapObject->fixedPriority = 1;
+        eventObject->fixedPriority = 1;
         sprite->oam.priority = 1;
         sprite->subspriteMode = 2;
     }
@@ -1765,7 +1765,7 @@ bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80873D8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80873D8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     sub_8053FF8();
     fade_8080918();
@@ -1773,7 +1773,7 @@ bool8 sub_80873D8(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_80873F4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80873F4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && sub_8054034() == TRUE)
     {
@@ -1798,25 +1798,25 @@ void mapldr_080851BC(void)
 
 void sub_8087470(u8 taskId)
 {
-    while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_80874CC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80874CC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     CameraObjectReset2();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->invisible = 1;
+    eventObject->invisible = 1;
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80874FC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (IsWeatherNotFadingIn())
     {
-        gFieldEffectArguments[0] = mapObject->currentCoords.x;
-        gFieldEffectArguments[1] = mapObject->currentCoords.y;
+        gFieldEffectArguments[0] = eventObject->currentCoords.x;
+        gFieldEffectArguments[1] = eventObject->currentCoords.y;
         gFieldEffectArguments[2] = sprite->subpriority - 1;
         gFieldEffectArguments[3] = sprite->oam.priority;
         task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1825,27 +1825,27 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
-bool8 sub_8087548(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8087548(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     sprite = &gSprites[task->data[1]];
     if (sprite->animCmdIndex > 1)
     {
         task->data[0]++;
-        mapObject->invisible = 0;
+        eventObject->invisible = 0;
         CameraObjectReset1();
         PlaySE(SE_W091);
-        FieldObjectSetSpecialAnim(mapObject, sub_80608A4(DIR_EAST));
+        EventObjectSetHeldMovement(eventObject, sub_80608A4(DIR_EAST));
     }
     return FALSE;
 }
 
-bool8 sub_808759C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_808759C(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         DestroyTask(FindTaskIdByFunc(sub_8087470));
     }
     return FALSE;
@@ -1881,27 +1881,27 @@ void sub_8087654(u8 priority)
 
 void sub_808766C(u8 taskId)
 {
-    while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+    while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId], &gSprites[gPlayerAvatar.spriteId]));
 }
 
-bool8 sub_80876C8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80876C8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
     gPlayerAvatar.preventStep = TRUE;
-    mapObject->fixedPriority = 1;
+    eventObject->fixedPriority = 1;
     task->data[0]++;
     return FALSE;
 }
 
-bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80876F8(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         if (task->data[1] > 3)
         {
-            gFieldEffectArguments[0] = mapObject->currentCoords.x;
-            gFieldEffectArguments[1] = mapObject->currentCoords.y;
+            gFieldEffectArguments[0] = eventObject->currentCoords.x;
+            gFieldEffectArguments[1] = eventObject->currentCoords.y;
             gFieldEffectArguments[2] = sprite->subpriority - 1;
             gFieldEffectArguments[3] = sprite->oam.priority;
             task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
@@ -1909,24 +1909,24 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
         } else
         {
             task->data[1]++;
-            FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->facingDirection));
+            EventObjectSetHeldMovement(eventObject, GetWalkInPlaceFastestMovementAction(eventObject->facingDirection));
             PlaySE(SE_FU_ZUZUZU);
         }
     }
     return FALSE;
 }
 
-bool8 sub_8087774(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_8087774(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (gSprites[task->data[1]].animCmdIndex == 2)
     {
-        mapObject->invisible = 1;
+        eventObject->invisible = 1;
         task->data[0]++;
     }
     return FALSE;
 }
 
-bool8 sub_80877AC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80877AC(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
@@ -1940,7 +1940,7 @@ bool8 sub_80877AC(struct Task *task, struct MapObject *mapObject, struct Sprite
 void sub_80878C4(u8);
 void mapldr_080859D4(void);
 
-bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+bool8 sub_80877D4(struct Task *task, struct EventObject *eventObject, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && sub_8054034() == TRUE)
     {
@@ -1973,7 +1973,7 @@ void sub_808788C(struct Sprite *sprite)
 void sub_80878A8(void)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CreateTask(sub_80878C4, 0x50);
 }
 
@@ -1986,24 +1986,24 @@ void sub_80878F4(struct Task *task)
 {
     task->data[0]++;
     task->data[14] = 64;
-    task->data[15] = player_get_direction_lower_nybble();
+    task->data[15] = GetPlayerFacingDirection();
 }
 
 void sub_8087914(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     u8 unknown_0839F380[5] = {1, 3, 4, 2, 1};
     if (task->data[14] != 0 && (--task->data[14]) == 0)
     {
         sub_8053FF8();
         fade_8080918();
     }
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         if (task->data[14] == 0 && !gPaletteFade.active && sub_8054034() == TRUE)
         {
-            FieldObjectSetDirection(mapObject, task->data[15]);
+            SetEventObjectDirection(eventObject, task->data[15]);
             sub_8053678();
             warp_in();
             gFieldCallback = mapldr_080859D4;
@@ -2011,7 +2011,7 @@ void sub_8087914(struct Task *task)
             DestroyTask(FindTaskIdByFunc(sub_80878C4));
         } else if (task->data[1] == 0 || (--task->data[1]) == 0)
         {
-            FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection]));
+            EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(unknown_0839F380[eventObject->facingDirection]));
             if (task->data[2] < 12)
             {
                 task->data[2]++;
@@ -2033,9 +2033,9 @@ void mapldr_080859D4(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_map_transition();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CreateTask(sub_8087A74, 0);
 }
 
@@ -2049,36 +2049,36 @@ void sub_8087AA4(struct Task *task)
     if (IsWeatherNotFadingIn())
     {
         task->data[0]++;
-        task->data[15] = player_get_direction_lower_nybble();
+        task->data[15] = GetPlayerFacingDirection();
     }
 }
 
 void sub_8087AC8(struct Task *task)
 {
     u8 unknown_0839F380[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (task->data[1] == 0 || (--task->data[1]) == 0)
     {
-        if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) && !FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+        if (EventObjectIsMovementOverridden(eventObject) && !EventObjectClearHeldMovementIfFinished(eventObject))
         {
             return;
         }
-        if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble())
+        if (task->data[2] >= 32 && task->data[15] == GetPlayerFacingDirection())
         {
-            mapObject->invisible = 0;
+            eventObject->invisible = 0;
             ScriptContext2_Disable();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_8087A74));
             return;
         }
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->facingDirection]));
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(unknown_0839F380[eventObject->facingDirection]));
         if (task->data[2] < 32)
         {
             task->data[2]++;
         }
         task->data[1] = task->data[2] >> 2;
     }
-    mapObject->invisible ^= 1;
+    eventObject->invisible ^= 1;
 }
 
 static void ExecuteTeleportFieldEffectTask(u8);
@@ -2108,23 +2108,23 @@ static void ExecuteTeleportFieldEffectTask(u8 taskId)
 static void TeleportFieldEffectTask1(struct Task *task)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     CameraObjectReset2();
-    task->data[15] = player_get_direction_lower_nybble();
+    task->data[15] = GetPlayerFacingDirection();
     task->data[0]++;
 }
 
 static void TeleportFieldEffectTask2(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if (task->data[1] == 0 || (--task->data[1]) == 0)
     {
-        FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
         task->data[1] = 8;
         task->data[2]++;
     }
-    if (task->data[2] > 7 && task->data[15] == mapObject->facingDirection)
+    if (task->data[2] > 7 && task->data[15] == eventObject->facingDirection)
     {
         task->data[0]++;
         task->data[1] = 4;
@@ -2137,12 +2137,12 @@ static void TeleportFieldEffectTask2(struct Task *task)
 static void TeleportFieldEffectTask3(struct Task *task)
 {
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
     if ((--task->data[1]) <= 0)
     {
         task->data[1] = 4;
-        FieldObjectTurn(mapObject, spinDirections[mapObject->facingDirection]);
+        EventObjectTurn(eventObject, spinDirections[eventObject->facingDirection]);
     }
     sprite->pos1.y -= task->data[3];
     task->data[4] += task->data[3];
@@ -2181,9 +2181,9 @@ static void mapldr_08085D88(void)
     Overworld_PlaySpecialMapMusic();
     pal_fill_for_map_transition();
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gFieldCallback = NULL;
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = 1;
     CameraObjectReset2();
     CreateTask(sub_8087E1C, 0);
 }
@@ -2208,12 +2208,12 @@ void sub_8087E4C(struct Task *task)
         sprite = &gSprites[gPlayerAvatar.spriteId];
         centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
         sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
-        gMapObjects[gPlayerAvatar.mapObjectId].invisible = 0;
+        gEventObjects[gPlayerAvatar.eventObjectId].invisible = 0;
         task->data[0]++;
         task->data[1] = 8;
         task->data[2] = 1;
         task->data[14] = sprite->subspriteMode;
-        task->data[15] = player_get_direction_lower_nybble();
+        task->data[15] = GetPlayerFacingDirection();
         PlaySE(SE_TK_WARPIN);
     }
 }
@@ -2221,14 +2221,14 @@ void sub_8087E4C(struct Task *task)
 void sub_8087ED8(struct Task *task)
 {
     u8 unknown_0839F380[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
     if ((sprite->pos2.y += task->data[1]) >= -8)
     {
         if (task->data[13] == 0)
         {
             task->data[13]++;
-            mapObject->triggerGroundEffectsOnMove = 1;
+            eventObject->triggerGroundEffectsOnMove = 1;
             sprite->subspriteMode = task->data[14];
         }
     } else
@@ -2246,7 +2246,7 @@ void sub_8087ED8(struct Task *task)
     if ((--task->data[2]) == 0)
     {
         task->data[2] = 4;
-        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]);
+        EventObjectTurn(eventObject, unknown_0839F380[eventObject->facingDirection]);
     }
     if (sprite->pos2.y >= 0)
     {
@@ -2260,16 +2260,16 @@ void sub_8087ED8(struct Task *task)
 void sub_8087FDC(struct Task *task)
 {
     u8 unknown_0839F380[5] = {1, 3, 4, 2, 1};
-    struct MapObject *mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
     if ((--task->data[1]) == 0)
     {
-        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->facingDirection]);
+        EventObjectTurn(eventObject, unknown_0839F380[eventObject->facingDirection]);
         task->data[1] = 8;
-        if ((++task->data[2]) > 4 && task->data[14] == mapObject->facingDirection)
+        if ((++task->data[2]) > 4 && task->data[14] == eventObject->facingDirection)
         {
             ScriptContext2_Disable();
             CameraObjectReset1();
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             DestroyTask(FindTaskIdByFunc(sub_8087E1C));
         }
     }
@@ -2821,31 +2821,31 @@ void sub_8088954(u8 taskId)
 void sub_8088984(struct Task *task)
 {
     ScriptContext2_Enable();
-    FreezeMapObjects();
+    FreezeEventObjects();
     gPlayerAvatar.preventStep = TRUE;
     SetPlayerAvatarStateMask(8);
     PlayerGetDestCoords(&task->data[1], &task->data[2]);
-    MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection, &task->data[1], &task->data[2]);
+    MoveCoords(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection, &task->data[1], &task->data[2]);
     task->data[0]++;
 }
 
 void sub_80889E4(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         sub_8059BF4();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_8088A30(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectCheckHeldMovementStatus(eventObject))
     {
         gFieldEffectArguments[0] = task->data[15] | 0x80000000;
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
@@ -2855,32 +2855,32 @@ void sub_8088A30(struct Task *task)
 
 void sub_8088A78(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
-        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
-        FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->movementDirection));
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sub_805B980(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+        EventObjectClearHeldMovementIfFinished(eventObject);
+        EventObjectSetHeldMovement(eventObject, GetJumpSpecialMovementAction(eventObject->movementDirection));
         gFieldEffectArguments[0] = task->data[1];
         gFieldEffectArguments[1] = task->data[2];
-        gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
-        mapObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
+        gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId;
+        eventObject->fieldEffectSpriteId = FieldEffectStart(FLDEFF_SURF_BLOB);
         task->data[0]++;
     }
 }
 
 void sub_8088AF4(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         gPlayerAvatar.preventStep = FALSE;
         gPlayerAvatar.flags &= 0xdf;
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->movementDirection));
-        sub_8127ED0(mapObject->fieldEffectSpriteId, 1);
-        UnfreezeMapObjects();
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(eventObject->movementDirection));
+        sub_8127ED0(eventObject->fieldEffectSpriteId, 1);
+        UnfreezeEventObjects();
         ScriptContext2_Disable();
         FieldEffectActiveListRemove(FLDEFF_USE_SURF);
         DestroyTask(FindTaskIdByFunc(sub_8088954));
@@ -2960,24 +2960,24 @@ void sub_8088C70(u8 taskId)
 
 void sub_8088CA0(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[15] = gPlayerAvatar.flags;
         gPlayerAvatar.preventStep = TRUE;
         SetPlayerAvatarStateMask(1);
         sub_8059BF4();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_8088CF8(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         gFieldEffectArguments[0] = task->data[1];
@@ -2987,14 +2987,14 @@ void sub_8088CF8(struct Task *task)
 
 void sub_8088D3C(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         if (task->data[15] & 0x08)
         {
-            sub_8127ED0(mapObject->fieldEffectSpriteId, 2);
-            sub_8127EFC(mapObject->fieldEffectSpriteId, 0);
+            sub_8127ED0(eventObject->fieldEffectSpriteId, 2);
+            sub_8127EFC(eventObject->fieldEffectSpriteId, 0);
         }
         task->data[1] = sub_8088F60();
         task->data[0]++;
@@ -3008,15 +3008,15 @@ void sub_8088D94(struct Task *task)
         task->data[0]++;
         task->data[2] = 16;
         SetPlayerAvatarTransitionFlags(PLAYER_AVATAR_FLAG_ON_FOOT);
-        FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02);
+        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], 0x02);
     }
 }
 
 void sub_8088DD8(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if ((task->data[2] == 0 || (--task->data[2]) == 0) && EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         PlaySE(SE_W019);
@@ -3026,17 +3026,17 @@ void sub_8088DD8(struct Task *task)
 
 void sub_8088E2C(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((++task->data[2]) >= 8)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
-        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
-        mapObject->inanimate = 1;
-        FieldObjectSetSpecialAnim(mapObject, 0x48);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sub_805B980(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+        StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
+        eventObject->inanimate = 1;
+        EventObjectSetHeldMovement(eventObject, 0x48);
         if (task->data[15] & 0x08)
         {
-            DestroySprite(&gSprites[mapObject->fieldEffectSpriteId]);
+            DestroySprite(&gSprites[eventObject->fieldEffectSpriteId]);
         }
         task->data[0]++;
         task->data[2] = 0;
@@ -3045,14 +3045,14 @@ void sub_8088E2C(struct Task *task)
 
 void sub_8088EB4(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((++task->data[2]) >= 10)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
-        mapObject->inanimate = 0;
-        mapObject->hasShadow = 0;
-        sub_8088FFC(task->data[1], mapObject->spriteId);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        EventObjectClearHeldMovementIfActive(eventObject);
+        eventObject->inanimate = 0;
+        eventObject->hasShadow = 0;
+        sub_8088FFC(task->data[1], eventObject->spriteId);
         CameraObjectReset2();
         task->data[0]++;
     }
@@ -3257,9 +3257,9 @@ void sub_8089270(u8 taskId)
 
 void sub_80892A0(struct Task *task)
 {
-    struct MapObject *mapObject;
-    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    struct EventObject *eventObject;
+    eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(eventObject) || EventObjectClearHeldMovementIfFinished(eventObject))
     {
         task->data[0]++;
         task->data[2] = 17;
@@ -3268,27 +3268,27 @@ void sub_80892A0(struct Task *task)
         SetPlayerAvatarStateMask(0x01);
         if (task->data[15] & 0x08)
         {
-            sub_8127ED0(mapObject->fieldEffectSpriteId, 0);
+            sub_8127ED0(eventObject->fieldEffectSpriteId, 0);
         }
-        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+        sub_805B980(eventObject, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
         CameraObjectReset2();
-        FieldObjectTurn(mapObject, DIR_WEST);
-        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
-        mapObject->invisible = 0;
+        EventObjectTurn(eventObject, DIR_WEST);
+        StartSpriteAnim(&gSprites[eventObject->spriteId], 0x16);
+        eventObject->invisible = 0;
         task->data[1] = sub_8088F60();
         sub_8088FC0(task->data[1]);
-        sub_8088FFC(task->data[1], mapObject->spriteId);
+        sub_8088FFC(task->data[1], eventObject->spriteId);
     }
 }
 
 void sub_8089354(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
     if (task->data[2] == 0 || (--task->data[2]) == 0)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
         sub_8088FFC(task->data[1], 0x40);
         sprite->pos1.x += sprite->pos2.x;
         sprite->pos1.y += sprite->pos2.y;
@@ -3331,26 +3331,26 @@ void sub_80893C0(struct Task *task)
 
 void sub_8089414(struct Task *task)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *sprite;
     if (sub_8088FA4(task->data[1]))
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
-        sprite = &gSprites[mapObject->spriteId];
-        mapObject->inanimate = 0;
-        sub_805C058(mapObject, mapObject->currentCoords.x, mapObject->currentCoords.y);
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
+        sprite = &gSprites[eventObject->spriteId];
+        eventObject->inanimate = 0;
+        sub_805C058(eventObject, eventObject->currentCoords.x, eventObject->currentCoords.y);
         sprite->pos2.x = 0;
         sprite->pos2.y = 0;
         sprite->coordOffsetEnabled = 1;
         sub_8059BF4();
-        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        EventObjectSetHeldMovement(eventObject, 0x39);
         task->data[0]++;
     }
 }
 
 void sub_808948C(struct Task *task)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId]))
+    if (EventObjectClearHeldMovementIfFinished(&gEventObjects[gPlayerAvatar.eventObjectId]))
     {
         task->data[0]++;
         sub_8089230(task->data[1]);
@@ -3370,18 +3370,18 @@ void sub_80894C4(struct Task *task)
 void fishE(struct Task *task)
 {
     u8 state;
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     if ((--task->data[1]) == 0)
     {
-        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        eventObject = &gEventObjects[gPlayerAvatar.eventObjectId];
         state = PLAYER_AVATAR_STATE_NORMAL;
         if (task->data[15] & 0x08)
         {
             state = PLAYER_AVATAR_STATE_SURFING;
-            sub_8127ED0(mapObject->fieldEffectSpriteId, 1);
+            sub_8127ED0(eventObject->fieldEffectSpriteId, 1);
         }
-        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(state));
-        FieldObjectTurn(mapObject, DIR_SOUTH);
+        sub_805B980(eventObject, GetPlayerAvatarGraphicsIdByStateId(state));
+        EventObjectTurn(eventObject, DIR_SOUTH);
         gPlayerAvatar.flags = task->data[15];
         gPlayerAvatar.preventStep = FALSE;
         FieldEffectActiveListRemove(FLDEFF_FLY_IN);
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index ea3225564..11f6e12b2 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -12,9 +12,9 @@
 #include "constants/songs.h"
 
 static void sub_81269E0(struct Sprite *);
-static void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite);
-static void npc_pal_op_A(struct MapObject *, u8);
-static void npc_pal_op_B(struct MapObject *, u8);
+static void npc_pal_op(struct EventObject *eventObject, struct Sprite *sprite);
+static void npc_pal_op_A(struct EventObject *, u8);
+static void npc_pal_op_B(struct EventObject *, u8);
 static void sub_81275A0(struct Sprite *);
 static void sub_81275C4(struct Sprite *);
 static void sub_8127DA0(struct Sprite *);
@@ -22,13 +22,13 @@ static void sub_8127DD0(struct Sprite *);
 static void sub_8127E30(struct Sprite *);
 static void sub_812882C(struct Sprite *, u8, u8);
 static void sub_81278D8(struct Sprite *);
-static void sub_8127FD4(struct MapObject *, struct Sprite *);
-static void sub_812800C(struct MapObject *, struct Sprite *);
-static void sub_81280A0(struct MapObject *, struct Sprite *, struct Sprite *);
+static void sub_8127FD4(struct EventObject *, struct Sprite *);
+static void sub_812800C(struct EventObject *, struct Sprite *);
+static void sub_81280A0(struct EventObject *, struct Sprite *, struct Sprite *);
 static void sub_8128174(struct Sprite *);
 static u32 ShowDisguiseFieldEffect(u8, u8, u8);
 
-void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 flag)
+void SetUpReflection(struct EventObject *eventObject, struct Sprite *sprite, bool8 flag)
 {
     struct Sprite *newSprite;
 
@@ -43,41 +43,41 @@ void SetUpReflection(struct MapObject *mapObject, struct Sprite *sprite, bool8 f
     newSprite->affineAnimBeginning = TRUE;
     newSprite->subspriteMode = 0;
     newSprite->data[0] = sprite->data[0];
-    newSprite->data[1] = mapObject->localId;
+    newSprite->data[1] = eventObject->localId;
     newSprite->data[7] = flag;
-    npc_pal_op(mapObject, newSprite);
+    npc_pal_op(eventObject, newSprite);
     if (!flag)
     {
         newSprite->oam.affineMode = 1;
     }
 }
 
-static s16 sub_81268D0(struct MapObject *mapObject)
+static s16 sub_81268D0(struct EventObject *eventObject)
 {
-    return GetFieldObjectGraphicsInfo(mapObject->graphicsId)->height - 2;
+    return GetEventObjectGraphicsInfo(eventObject->graphicsId)->height - 2;
 }
 
-static void npc_pal_op(struct MapObject *mapObject, struct Sprite *sprite)
+static void npc_pal_op(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 whichElement;
     u16 unk_8041e2c[] = {0x0c, 0x1c, 0x2c};
     sprite->data[2] = 0;
-    if (!GetFieldObjectGraphicsInfo(mapObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(mapObject->previousMetatileBehavior)) || (whichElement = sub_8057450(mapObject->currentMetatileBehavior))))
+    if (!GetEventObjectGraphicsInfo(eventObject->graphicsId)->disableReflectionPaletteLoad && ((whichElement = sub_8057450(eventObject->previousMetatileBehavior)) || (whichElement = sub_8057450(eventObject->currentMetatileBehavior))))
     {
         sprite->data[2] = unk_8041e2c[whichElement - 1];
-        npc_pal_op_A(mapObject, sprite->oam.paletteNum);
+        npc_pal_op_A(eventObject, sprite->oam.paletteNum);
     }
     else
     {
-        npc_pal_op_B(mapObject, sprite->oam.paletteNum);
+        npc_pal_op_B(eventObject, sprite->oam.paletteNum);
     }
 }
 
-static void npc_pal_op_B(struct MapObject *mapObject, u8 paletteNum)
+static void npc_pal_op_B(struct EventObject *eventObject, u8 paletteNum)
 {
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     if (graphicsInfo->paletteTag2 != 0x11ff)
     {
         if (graphicsInfo->paletteSlot == 0)
@@ -96,11 +96,11 @@ static void npc_pal_op_B(struct MapObject *mapObject, u8 paletteNum)
     }
 }
 
-static void npc_pal_op_A(struct MapObject *mapObject, u8 paletteNum)
+static void npc_pal_op_A(struct EventObject *eventObject, u8 paletteNum)
 {
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+    graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
     if (graphicsInfo->paletteTag2 != 0x11ff)
     {
         pal_patch_for_npc(graphicsInfo->paletteTag2, paletteNum);
@@ -110,12 +110,12 @@ static void npc_pal_op_A(struct MapObject *mapObject, u8 paletteNum)
 
 static void sub_81269E0(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *oldSprite;
 
-    mapObject = &gMapObjects[sprite->data[0]];
-    oldSprite = &gSprites[mapObject->spriteId];
-    if (!mapObject->active || !mapObject->hasReflection || mapObject->localId != sprite->data[1])
+    eventObject = &gEventObjects[sprite->data[0]];
+    oldSprite = &gSprites[eventObject->spriteId];
+    if (!eventObject->active || !eventObject->hasReflection || eventObject->localId != sprite->data[1])
     {
         sprite->inUse = FALSE;
     }
@@ -130,7 +130,7 @@ static void sub_81269E0(struct Sprite *sprite)
         sprite->subspriteTableNum = oldSprite->subspriteTableNum;
         sprite->invisible = oldSprite->invisible;
         sprite->pos1.x = oldSprite->pos1.x;
-        sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(mapObject) + sprite->data[2];
+        sprite->pos1.y = oldSprite->pos1.y + sub_81268D0(eventObject) + sprite->data[2];
         sprite->centerToCornerVecX = oldSprite->centerToCornerVecX;
         sprite->centerToCornerVecY = oldSprite->centerToCornerVecY;
         sprite->pos2.x = oldSprite->pos2.x;
@@ -204,12 +204,12 @@ const u16 gUnknown_08401E36[] = {
 
 u32 FldEff_Shadow(void)
 {
-    u8 mapObjectId;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    u8 eventObjectId;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     u8 spriteId;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId);
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gUnknown_08401E32[graphicsInfo->shadowSize]], 0, 0, 0x94);
     if (spriteId != MAX_SPRITES)
     {
@@ -224,22 +224,22 @@ u32 FldEff_Shadow(void)
 
 void oamc_shadow(struct Sprite *sprite)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId))
     {
         FieldEffectStop(sprite, FLDEFF_SHADOW);
     }
     else
     {
-        mapObject = &gMapObjects[mapObjectId];
-        linkedSprite = &gSprites[mapObject->spriteId];
+        eventObject = &gEventObjects[eventObjectId];
+        linkedSprite = &gSprites[eventObject->spriteId];
         sprite->oam.priority = linkedSprite->oam.priority;
         sprite->pos1.x = linkedSprite->pos1.x;
         sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3];
-        if (!mapObject->active || !mapObject->hasShadow || MetatileBehavior_IsPokeGrass(mapObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(mapObject->previousMetatileBehavior) || MetatileBehavior_IsReflective(mapObject->currentMetatileBehavior) || MetatileBehavior_IsReflective(mapObject->previousMetatileBehavior))
+        if (!eventObject->active || !eventObject->hasShadow || MetatileBehavior_IsPokeGrass(eventObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->currentMetatileBehavior) || MetatileBehavior_IsSurfableWaterOrUnderwater(eventObject->previousMetatileBehavior) || MetatileBehavior_IsReflective(eventObject->currentMetatileBehavior) || MetatileBehavior_IsReflective(eventObject->previousMetatileBehavior))
         {
             FieldEffectStop(sprite, FLDEFF_SHADOW);
         }
@@ -282,8 +282,8 @@ void unc_grass_normal(struct Sprite *sprite)
     u8 mapGroup;
     u8 metatileBehavior;
     u8 localId;
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
     mapNum = sprite->data[5] >> 8;
     mapGroup = sprite->data[5];
@@ -297,14 +297,14 @@ void unc_grass_normal(struct Sprite *sprite)
     mapNum = sprite->data[3];
     mapGroup = sprite->data[4];
     metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsTallGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_TALL_GRASS);
     }
     else
     {
-        mapObject = &gMapObjects[mapObjectId];
-        if ((mapObject->currentCoords.x != sprite->data[1] || mapObject->currentCoords.y != sprite->data[2]) && (mapObject->previousCoords.x != sprite->data[1] || mapObject->previousCoords.y != sprite->data[2]))
+        eventObject = &gEventObjects[eventObjectId];
+        if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2]))
         {
             sprite->data[7] = TRUE;
         }
@@ -313,7 +313,7 @@ void unc_grass_normal(struct Sprite *sprite)
         {
             metatileBehavior = 4;
         }
-        sub_806487C(sprite, 0);
+        UpdateEventObjectSpriteVisibility(sprite, 0);
         sub_812882C(sprite, sprite->data[0], metatileBehavior);
     }
 }
@@ -391,8 +391,8 @@ void unc_grass_tall(struct Sprite *sprite)
     u8 mapGroup;
     u8 metatileBehavior;
     u8 localId;
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
 
     mapNum = sprite->data[5] >> 8;
     mapGroup = sprite->data[5];
@@ -406,18 +406,18 @@ void unc_grass_tall(struct Sprite *sprite)
     mapNum = sprite->data[3];
     mapGroup = sprite->data[4];
     metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjectId) || !MetatileBehavior_IsLongGrass(metatileBehavior) || (sprite->data[7] && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_LONG_GRASS);
     }
     else
     {
-        mapObject = &gMapObjects[mapObjectId];
-        if ((mapObject->currentCoords.x != sprite->data[1] || mapObject->currentCoords.y != sprite->data[2]) && (mapObject->previousCoords.x != sprite->data[1] || mapObject->previousCoords.y != sprite->data[2]))
+        eventObject = &gEventObjects[eventObjectId];
+        if ((eventObject->currentCoords.x != sprite->data[1] || eventObject->currentCoords.y != sprite->data[2]) && (eventObject->previousCoords.x != sprite->data[1] || eventObject->previousCoords.y != sprite->data[2]))
         {
             sprite->data[7] = TRUE;
         }
-        sub_806487C(sprite, 0);
+        UpdateEventObjectSpriteVisibility(sprite, 0);
         sub_812882C(sprite, sprite->data[0], 0);
     }
 }
@@ -442,44 +442,44 @@ u32 FldEff_JumpLongGrass(void)
 
 u32 FldEff_ShortGrass(void)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     u8 spriteId;
     struct Sprite *sprite;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    mapObject = &gMapObjects[mapObjectId];
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    eventObject = &gEventObjects[eventObjectId];
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[30], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &(gSprites[spriteId]);
         sprite->coordOffsetEnabled = TRUE;
-        sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
+        sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[3] = gSprites[eventObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[eventObject->spriteId].pos1.y;
     }
     return 0;
 }
 
 void sub_8127334(struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     s16 x;
     s16 y;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inShortGrass)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShortGrass)
     {
         FieldEffectStop(sprite, FLDEFF_SHORT_GRASS);
     }
     else
     {
-        graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
-        linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+        graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId);
+        linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId];
         y = linkedSprite->pos1.y;
         x = linkedSprite->pos1.x;
         if (x != sprite->data[3] || y != sprite->data[4])
@@ -496,7 +496,7 @@ void sub_8127334(struct Sprite *sprite)
         sprite->pos2.y = (graphicsInfo->height >> 1) - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
         sprite->oam.priority = linkedSprite->oam.priority;
-        sub_806487C(sprite, linkedSprite->invisible);
+        UpdateEventObjectSpriteVisibility(sprite, linkedSprite->invisible);
     }
 }
 
@@ -570,14 +570,14 @@ static void sub_81275A0(struct Sprite *sprite)
     {
         sprite->data[0] = 1;
     }
-    sub_806487C(sprite, FALSE);
+    UpdateEventObjectSpriteVisibility(sprite, FALSE);
 }
 
 static void sub_81275C4(struct Sprite *sprite)
 {
     sprite->invisible ^= 1;
     sprite->data[1] ++;
-    sub_806487C(sprite, sprite->invisible);
+    UpdateEventObjectSpriteVisibility(sprite, sprite->invisible);
     if (sprite->data[1] > 56)
     {
         FieldEffectStop(sprite, sprite->data[7]);
@@ -586,22 +586,22 @@ static void sub_81275C4(struct Sprite *sprite)
 
 u32 FldEff_Splash(void)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     u8 spriteId;
     struct Sprite *sprite;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    mapObject = &gMapObjects[mapObjectId];
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    eventObject = &gEventObjects[eventObjectId];
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
-        graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+        graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
-        linkedSprite = &gSprites[mapObject->spriteId];
+        linkedSprite = &gSprites[eventObject->spriteId];
         sprite->oam.priority = linkedSprite->oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
@@ -614,17 +614,17 @@ u32 FldEff_Splash(void)
 
 void sub_81276B4(struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
 
-    if (sprite->animEnded || TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId))
+    if (sprite->animEnded || TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId))
     {
         FieldEffectStop(sprite, FLDEFF_SPLASH);
     }
     else
     {
-        sprite->pos1.x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x;
-        sprite->pos1.y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y;
-        sub_806487C(sprite, FALSE);
+        sprite->pos1.x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x;
+        sprite->pos1.y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y;
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -666,22 +666,22 @@ u32 FldEff_JumpBigSplash(void)
 
 u32 FldEff_FeetInFlowingWater(void)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     u8 spriteId;
     struct Sprite *sprite;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    mapObject = &gMapObjects[mapObjectId];
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    eventObject = &gEventObjects[eventObjectId];
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[13], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
-        graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+        graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
         sprite = &gSprites[spriteId];
         sprite->callback = sub_81278D8;
         sprite->coordOffsetEnabled = TRUE;
-        sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
+        sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
@@ -695,26 +695,26 @@ u32 FldEff_FeetInFlowingWater(void)
 
 static void sub_81278D8(struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     struct Sprite *linkedSprite;
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inShallowFlowingWater)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inShallowFlowingWater)
     {
         FieldEffectStop(sprite, FLDEFF_FEET_IN_FLOWING_WATER);
     }
     else
     {
-        mapObject = &gMapObjects[mapObjectId];
-        linkedSprite = &gSprites[mapObject->spriteId];
+        eventObject = &gEventObjects[eventObjectId];
+        linkedSprite = &gSprites[eventObject->spriteId];
         sprite->pos1.x = linkedSprite->pos1.x;
         sprite->pos1.y = linkedSprite->pos1.y;
         sprite->subpriority = linkedSprite->subpriority;
-        sub_806487C(sprite, FALSE);
-        if (mapObject->currentCoords.x != sprite->data[3] || mapObject->currentCoords.y != sprite->data[4])
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
+        if (eventObject->currentCoords.x != sprite->data[3] || eventObject->currentCoords.y != sprite->data[4])
         {
-            sprite->data[3] = mapObject->currentCoords.x;
-            sprite->data[4] = mapObject->currentCoords.y;
+            sprite->data[3] = eventObject->currentCoords.x;
+            sprite->data[4] = eventObject->currentCoords.y;
             if (!sprite->invisible)
             {
                 PlaySE(SE_MIZU);
@@ -741,46 +741,46 @@ u32 FldEff_Ripple(void)
 
 u32 FldEff_HotSpringsWater(void)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     u8 spriteId;
     struct Sprite *sprite;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    mapObject = &gMapObjects[mapObjectId];
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    eventObject = &gEventObjects[eventObjectId];
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[31], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
-        sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
+        sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[3] = gSprites[eventObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[eventObject->spriteId].pos1.y;
     }
     return 0;
 }
 
 void sub_8127A7C(struct Sprite *sprite)
 {
-    u8 mapObjectId;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    u8 eventObjectId;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inHotSprings)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inHotSprings)
     {
         FieldEffectStop(sprite, FLDEFF_HOT_SPRINGS_WATER);
     }
     else
     {
-        graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
-        linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+        graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId);
+        linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId];
         sprite->pos1.x = linkedSprite->pos1.x;
         sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
-        sub_806487C(sprite, FALSE);
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -914,13 +914,13 @@ static void sub_8127DD0(struct Sprite *sprite)
     sprite->animPaused = FALSE;
     MapGridSetMetatileIdAt(sprite->data[1], sprite->data[2], sprite->data[3]);
     CurrentMapDrawMetatileAt(sprite->data[1], sprite->data[2]);
-    gMapObjects[gPlayerAvatar.mapObjectId].triggerGroundEffectsOnMove = TRUE;
+    gEventObjects[gPlayerAvatar.eventObjectId].triggerGroundEffectsOnMove = TRUE;
     sprite->data[0] = 2;
 }
 
 static void sub_8127E30(struct Sprite *sprite)
 {
-    sub_806487C(sprite, FALSE);
+    UpdateEventObjectSpriteVisibility(sprite, FALSE);
     if (sprite->animEnded)
     {
         FieldEffectStop(sprite, FLDEFF_ASH);
@@ -981,35 +981,35 @@ static u8 sub_8127F70(struct Sprite *sprite)
 
 void sub_8127F7C(struct Sprite *sprite)
 {
-    struct MapObject *mapObject;
+    struct EventObject *eventObject;
     struct Sprite *linkedSprite;
 
-    mapObject = &gMapObjects[sprite->data[2]];
-    linkedSprite = &gSprites[mapObject->spriteId];
-    sub_8127FD4(mapObject, sprite);
-    sub_812800C(mapObject, sprite);
-    sub_81280A0(mapObject, linkedSprite, sprite);
+    eventObject = &gEventObjects[sprite->data[2]];
+    linkedSprite = &gSprites[eventObject->spriteId];
+    sub_8127FD4(eventObject, sprite);
+    sub_812800C(eventObject, sprite);
+    sub_81280A0(eventObject, linkedSprite, sprite);
     sprite->oam.priority = linkedSprite->oam.priority;
 }
 
-static void sub_8127FD4(struct MapObject *mapObject, struct Sprite *sprite)
+static void sub_8127FD4(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 unk_8041E54[] = {0, 0, 1, 2, 3};
     if (sub_8127F64(sprite) == 0)
     {
-        StartSpriteAnimIfDifferent(sprite, unk_8041E54[mapObject->movementDirection]);
+        StartSpriteAnimIfDifferent(sprite, unk_8041E54[eventObject->movementDirection]);
     }
 }
 
 #ifdef NONMATCHING
-static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
+static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite)
 {
     s16 x;
     s16 y;
     u8 i;
 
-    x = mapObject->currentCoords.x;
-    y = mapObject->currentCoords.y;
+    x = eventObject->currentCoords.x;
+    y = eventObject->currentCoords.y;
     if (sprite->pos2.y == 0 && (x != sprite->data[6] || y != sprite->data[7]))
     {
         sprite->data[5] = sprite->pos2.y;
@@ -1025,7 +1025,7 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
     }
 }
 #else
-NAKED static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
+NAKED static void sub_812800C(struct EventObject *eventObject, struct Sprite *sprite)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r8\n"
@@ -1106,7 +1106,7 @@ NAKED static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite
 }
 #endif
 
-static void sub_81280A0(struct MapObject *mapObject, struct Sprite *linkedSprite, struct Sprite *sprite)
+static void sub_81280A0(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite)
 {
     u16 unk_8401E5A[] = {3, 7};
     u8 v0 = sub_8127F5C(sprite);
@@ -1185,26 +1185,26 @@ u32 FldEff_Dust(void)
 
 u32 FldEff_SandPile(void)
 {
-    u8 mapObjectId;
-    struct MapObject *mapObject;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
     u8 spriteId;
     struct Sprite *sprite;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
 
-    mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
-    mapObject = &gMapObjects[mapObjectId];
+    eventObjectId = GetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2]);
+    eventObject = &gEventObjects[eventObjectId];
     spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[29], 0, 0, 0);
     if (spriteId != MAX_SPRITES)
     {
-        graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
+        graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
         sprite = &gSprites[spriteId];
         sprite->coordOffsetEnabled = TRUE;
-        sprite->oam.priority = gSprites[mapObject->spriteId].oam.priority;
+        sprite->oam.priority = gSprites[eventObject->spriteId].oam.priority;
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[mapObject->spriteId].pos1.x;
-        sprite->data[4] = gSprites[mapObject->spriteId].pos1.y;
+        sprite->data[3] = gSprites[eventObject->spriteId].pos1.x;
+        sprite->data[4] = gSprites[eventObject->spriteId].pos1.y;
         sprite->pos2.y = (graphicsInfo->height >> 1) - 2;
         SeekSpriteAnim(sprite, 2);
     }
@@ -1213,18 +1213,18 @@ u32 FldEff_SandPile(void)
 
 void sub_81282E0(struct Sprite *sprite)
 {
-    u8 mapObjectId;
+    u8 eventObjectId;
     s16 x;
     s16 y;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjectId) || !gMapObjects[mapObjectId].inSandPile)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjectId) || !gEventObjects[eventObjectId].inSandPile)
     {
         FieldEffectStop(sprite, FLDEFF_SAND_PILE);
     }
     else
     {
-        y = gSprites[gMapObjects[mapObjectId].spriteId].pos1.y;
-        x = gSprites[gMapObjects[mapObjectId].spriteId].pos1.x;
+        y = gSprites[gEventObjects[eventObjectId].spriteId].pos1.y;
+        x = gSprites[gEventObjects[eventObjectId].spriteId].pos1.x;
         if (x != sprite->data[3] || y != sprite->data[4])
         {
             sprite->data[3] = x;
@@ -1236,8 +1236,8 @@ void sub_81282E0(struct Sprite *sprite)
         }
         sprite->pos1.x = x;
         sprite->pos1.y = y;
-        sprite->subpriority = gSprites[gMapObjects[mapObjectId].spriteId].subpriority;
-        sub_806487C(sprite, FALSE);
+        sprite->subpriority = gSprites[gEventObjects[eventObjectId].spriteId].subpriority;
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -1262,7 +1262,7 @@ void sub_8128410(struct Sprite *sprite)
     sprite->data[0] += 0x80;
     sprite->data[0] &= 0x100;
     sprite->pos1.y -= sprite->data[0] >> 8;
-    sub_806487C(sprite, FALSE);
+    UpdateEventObjectSpriteVisibility(sprite, FALSE);
     if (sprite->invisible || sprite->animEnded)
     {
         FieldEffectStop(sprite, FLDEFF_BUBBLES);
@@ -1309,7 +1309,7 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
     u8 spriteId;
     struct Sprite *sprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId))
+    if (TryGetEventObjectIdByLocalIdAndMap(gFieldEffectArguments[0], gFieldEffectArguments[1], gFieldEffectArguments[2], &spriteId))
     {
         FieldEffectActiveListRemove(fldEff);
         return MAX_SPRITES;
@@ -1330,17 +1330,17 @@ static u32 ShowDisguiseFieldEffect(u8 fldEff, u8 templateIdx, u8 paletteNum)
 
 void sub_81285AC(struct Sprite *sprite)
 {
-    u8 mapObjectId;
-    const struct MapObjectGraphicsInfo *graphicsInfo;
+    u8 eventObjectId;
+    const struct EventObjectGraphicsInfo *graphicsInfo;
     struct Sprite *linkedSprite;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &mapObjectId))
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[2], sprite->data[3], sprite->data[4], &eventObjectId))
     {
         FieldEffectStop(sprite, sprite->data[1]);
     }
 
-    graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
-    linkedSprite = &gSprites[gMapObjects[mapObjectId].spriteId];
+    graphicsInfo = GetEventObjectGraphicsInfo(gEventObjects[eventObjectId].graphicsId);
+    linkedSprite = &gSprites[gEventObjects[eventObjectId].spriteId];
     sprite->invisible = linkedSprite->invisible;
     sprite->pos1.x = linkedSprite->pos1.x;
     sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16;
@@ -1360,31 +1360,31 @@ void sub_81285AC(struct Sprite *sprite)
     }
 }
 
-void sub_812869C(struct MapObject *mapObject)
+void sub_812869C(struct EventObject *eventObject)
 {
-    if (mapObject->directionSequenceIndex == 1)
+    if (eventObject->directionSequenceIndex == 1)
     {
-        gSprites[mapObject->fieldEffectSpriteId].data[0] ++;
+        gSprites[eventObject->fieldEffectSpriteId].data[0]++;
     }
 }
 
-bool8 sub_81286C4(struct MapObject *mapObject)
+bool8 sub_81286C4(struct EventObject *eventObject)
 {
     struct Sprite *sprite;
 
-    if (mapObject->directionSequenceIndex == 2)
+    if (eventObject->directionSequenceIndex == 2)
     {
         return TRUE;
     }
-    if (mapObject->directionSequenceIndex == 0)
+    if (eventObject->directionSequenceIndex == 0)
     {
         return TRUE;
     }
-    sprite = &gSprites[mapObject->fieldEffectSpriteId];
+    sprite = &gSprites[eventObject->fieldEffectSpriteId];
     if (sprite->data[7])
     {
-        mapObject->directionSequenceIndex = 2;
-        sprite->data[0] ++;
+        eventObject->directionSequenceIndex = 2;
+        sprite->data[0]++;
         return TRUE;
     }
     return FALSE;
@@ -1434,7 +1434,7 @@ void sub_81287C4(struct Sprite *sprite)
     }
     else
     {
-        sub_806487C(sprite, FALSE);
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
         SetObjectSubpriorityByZCoord(sprite->data[0], sprite, 0);
     }
 }
@@ -1447,7 +1447,7 @@ void sub_8128800(struct Sprite *sprite)
     }
     else
     {
-        sub_806487C(sprite, FALSE);
+        UpdateEventObjectSpriteVisibility(sprite, FALSE);
     }
 }
 
@@ -1462,18 +1462,18 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
     s16 ly;
     s16 ylo;
     s16 yhi;
-    struct MapObject *mapObject; // r4
-    const struct MapObjectGraphicsInfo *graphicsInfo; // destroyed
+    struct EventObject *eventObject; // r4
+    const struct EventObjectGraphicsInfo *graphicsInfo; // destroyed
     struct Sprite *linkedSprite; // r5
 
     SetObjectSubpriorityByZCoord(z, sprite, offset);
     for (i = 0; i < 16; i ++)
     {
-        mapObject = &gMapObjects[i];
-        if (mapObject->active)
+        eventObject = &gEventObjects[i];
+        if (eventObject->active)
         {
-            graphicsInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
-            linkedSprite = &gSprites[mapObject->spriteId];
+            graphicsInfo = GetEventObjectGraphicsInfo(eventObject->graphicsId);
+            linkedSprite = &gSprites[eventObject->spriteId];
             xhi = sprite->pos1.x + sprite->centerToCornerVecX;
             xlo = sprite->pos1.x - sprite->centerToCornerVecX;
             lx = linkedSprite->pos1.x;
@@ -1512,14 +1512,14 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
                     "\tlsls r0, r7, 3\n"
                     "\tadds r0, r7\n"
                     "\tlsls r0, 2\n"
-                    "\tldr r1, _081288DC @ =gMapObjects\n"
+                    "\tldr r1, _081288DC @ =gEventObjects\n"
                     "\tadds r4, r0, r1\n"
                     "\tldrb r0, [r4]\n"
                     "\tlsls r0, 31\n"
                     "\tcmp r0, 0\n"
                     "\tbeq _081288E4\n"
                     "\tldrb r0, [r4, 0x5]\n"
-                    "\tbl GetFieldObjectGraphicsInfo\n"
+                    "\tbl GetEventObjectGraphicsInfo\n"
                     "\tldrb r1, [r4, 0x4]\n"
                     "\tlsls r0, r1, 4\n"
                     "\tadds r0, r1\n"
@@ -1586,7 +1586,7 @@ NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
                     "\tstrb r0, [r2]\n"
                     "\tb _081288EE\n"
                     "\t.align 2, 0\n"
-                    "_081288DC: .4byte gMapObjects\n"
+                    "_081288DC: .4byte gEventObjects\n"
                     "_081288E0: .4byte gSprites\n"
                     "_081288E4:\n"
                     "\tadds r0, r7, 0x1\n"
diff --git a/src/field_fadetransition.c b/src/field_fadetransition.c
index 4a4122641..7a65c696a 100644
--- a/src/field_fadetransition.c
+++ b/src/field_fadetransition.c
@@ -11,7 +11,7 @@
 #include "fldeff_flash.h"
 #include "link.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "overworld.h"
@@ -220,7 +220,7 @@ void sub_8080B9C(u8 taskId)
     {
     case 0:
         sub_8080958(0);
-        FreezeMapObjects();
+        FreezeEventObjects();
         PlayerGetDestCoords(x, y);
         FieldSetDoorOpened(*x, *y);
         task->data[0] = 1;
@@ -228,27 +228,27 @@ void sub_8080B9C(u8 taskId)
     case 1:
         if (sub_8080E70())
         {
-            u8 mapObjId;
+            u8 eventObjId;
             sub_8080958(1);
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 8);
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 8);
             task->data[0] = 2;
         }
         break;
     case 2:
         if (walkrun_is_standing_still())
         {
-            u8 mapObjId;
+            u8 eventObjId;
             task->data[1] = FieldAnimateDoorClose(*x, *y);
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]);
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]);
             task->data[0] = 3;
         }
         break;
     case 3:
         if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
         {
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             task->data[0] = 4;
         }
         break;
@@ -269,24 +269,24 @@ void task_map_chg_seq_0807E20C(u8 taskId)
     {
     case 0:
         sub_8080958(0);
-        FreezeMapObjects();
+        FreezeEventObjects();
         PlayerGetDestCoords(x, y);
         task->data[0] = 1;
         break;
     case 1:
         if (sub_8080E70())
         {
-            u8 mapObjId;
+            u8 eventObjId;
             sub_8080958(1);
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], GetGoSpeed0AnimId(player_get_direction_lower_nybble()));
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], GetWalkNormalMovementAction(GetPlayerFacingDirection()));
             task->data[0] = 2;
         }
         break;
     case 2:
         if (walkrun_is_standing_still())
         {
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             task->data[0] = 3;
         }
         break;
@@ -302,14 +302,14 @@ void task_map_chg_seq_0807E2CC(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        FreezeMapObjects();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         gTasks[taskId].data[0]++;
         break;
     case 1:
         if (sub_8080E70())
         {
-            UnfreezeMapObjects();
+            UnfreezeEventObjects();
             ScriptContext2_Disable();
             DestroyTask(taskId);
         }
@@ -533,7 +533,7 @@ void task0A_fade_n_map_maybe(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeMapObjects();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         task->data[0]++;
         break;
@@ -560,7 +560,7 @@ void sub_808115C(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeMapObjects();
+        FreezeEventObjects();
         PlayerGetDestCoords(x, y);
         PlaySE(GetDoorSoundEffect(*x, *y - 1));
         task->data[1] = FieldAnimateDoorOpen(*x, *y - 1);
@@ -569,21 +569,21 @@ void sub_808115C(u8 taskId)
     case 1:
         if (task->data[1] < 0 || gTasks[task->data[1]].isActive != TRUE)
         {
-            u8 mapObjId;
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectClearAnimIfSpecialAnimActive(&gMapObjects[mapObjId]);
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 9);
+            u8 eventObjId;
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectClearHeldMovementIfActive(&gEventObjects[eventObjId]);
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 9);
             task->data[0] = 2;
         }
         break;
     case 2:
         if (walkrun_is_standing_still())
         {
-            u8 mapObjId;
+            u8 eventObjId;
             task->data[1] = FieldAnimateDoorClose(*x, *y - 1);
-            mapObjId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-            FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]);
+            eventObjId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+            EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]);
             sub_8080958(0);
             task->data[0] = 3;
         }
@@ -611,7 +611,7 @@ void sub_80812C8(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        FreezeMapObjects();
+        FreezeEventObjects();
         ScriptContext2_Enable();
         task->data[0]++;
         break;
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index b17816f6d..f17cd9bc6 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -22,13 +22,13 @@
 #include "tv.h"
 #include "wild_encounter.h"
 #include "constants/field_effects.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 
 EWRAM_DATA struct PlayerAvatar gPlayerAvatar = {0};
 
 //Functions
-static bool8 sub_8058854(struct MapObject *, u8);
-static void npc_clear_strange_bits(struct MapObject *a);
+static bool8 sub_8058854(struct EventObject *, u8);
+static void npc_clear_strange_bits(struct EventObject *a);
 static void MovePlayerAvatarUsingKeypadInput(u8 a, u16 b, u16 c);
 static void PlayerAllowForcedMovementIfMovingSameDirection(void);
 static bool8 TryDoMetatileBehaviorForcedMovement(void);
@@ -47,7 +47,7 @@ static bool8 PlayerIsAnimActive(void);
 static bool8 PlayerCheckIfAnimFinishedOrInactive(void);
 static void PlayerNotOnBikeCollide(u8 a);
 static void PlayCollisionSoundIfNotFacingWarp(u8 a);
-static void sub_8059D60(struct MapObject *a);
+static void sub_8059D60(struct EventObject *a);
 static void StartStrengthAnim(u8 a, u8 b);
 static void DoPlayerMatJump(void);
 static void sub_805A06C(void);
@@ -112,7 +112,7 @@ static bool8 (*const gUnknown_0830FBF8[])(u8) =
     MetatileBehavior_IsHorizontalRail,
 };
 static const u8 gUnknown_0830FC0C[] = {9, 10, 11, 12, 13};
-static void (*const gUnknown_0830FC14[])(struct MapObject *) =
+static void (*const gUnknown_0830FC14[])(struct EventObject *) =
 {
     PlayerAvatarTransition_Normal,
     PlayerAvatarTransition_MachBike,
@@ -132,43 +132,43 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks[])(u8) =
 };
 static const u8 sRivalAvatarGfxIds[][2] =
 {
-    {MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL,     MAP_OBJ_GFX_RIVAL_MAY_NORMAL},
-    {MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE,  MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE},
-    {MAP_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE,  MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE},
-    {MAP_OBJ_GFX_RIVAL_BRENDAN_SURFING,    MAP_OBJ_GFX_RIVAL_MAY_SURFING},
-    {MAP_OBJ_GFX_BRENDAN_UNDERWATER,       MAP_OBJ_GFX_MAY_UNDERWATER},
-    {MAP_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE},
-    {MAP_OBJ_GFX_BRENDAN_FISHING,          MAP_OBJ_GFX_MAY_FISHING},
-    {MAP_OBJ_GFX_BRENDAN_WATERING,         MAP_OBJ_GFX_MAY_WATERING},
+    {EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL,     EVENT_OBJ_GFX_RIVAL_MAY_NORMAL},
+    {EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE,  EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE},
+    {EVENT_OBJ_GFX_RIVAL_BRENDAN_ACRO_BIKE,  EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE},
+    {EVENT_OBJ_GFX_RIVAL_BRENDAN_SURFING,    EVENT_OBJ_GFX_RIVAL_MAY_SURFING},
+    {EVENT_OBJ_GFX_BRENDAN_UNDERWATER,       EVENT_OBJ_GFX_MAY_UNDERWATER},
+    {EVENT_OBJ_GFX_RIVAL_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE},
+    {EVENT_OBJ_GFX_BRENDAN_FISHING,          EVENT_OBJ_GFX_MAY_FISHING},
+    {EVENT_OBJ_GFX_BRENDAN_WATERING,         EVENT_OBJ_GFX_MAY_WATERING},
 };
 static const u8 sPlayerAvatarGfxIds[][2] =
 {
-    {MAP_OBJ_GFX_BRENDAN_NORMAL,     MAP_OBJ_GFX_MAY_NORMAL},
-    {MAP_OBJ_GFX_BRENDAN_MACH_BIKE,  MAP_OBJ_GFX_MAY_MACH_BIKE},
-    {MAP_OBJ_GFX_BRENDAN_ACRO_BIKE,  MAP_OBJ_GFX_MAY_ACRO_BIKE},
-    {MAP_OBJ_GFX_BRENDAN_SURFING,    MAP_OBJ_GFX_MAY_SURFING},
-    {MAP_OBJ_GFX_BRENDAN_UNDERWATER, MAP_OBJ_GFX_MAY_UNDERWATER},
-    {MAP_OBJ_GFX_BRENDAN_FIELD_MOVE, MAP_OBJ_GFX_MAY_FIELD_MOVE},
-    {MAP_OBJ_GFX_BRENDAN_FISHING,    MAP_OBJ_GFX_MAY_FISHING},
-    {MAP_OBJ_GFX_BRENDAN_WATERING,   MAP_OBJ_GFX_MAY_WATERING},
+    {EVENT_OBJ_GFX_BRENDAN_NORMAL,     EVENT_OBJ_GFX_MAY_NORMAL},
+    {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE,  EVENT_OBJ_GFX_MAY_MACH_BIKE},
+    {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE,  EVENT_OBJ_GFX_MAY_ACRO_BIKE},
+    {EVENT_OBJ_GFX_BRENDAN_SURFING,    EVENT_OBJ_GFX_MAY_SURFING},
+    {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, EVENT_OBJ_GFX_MAY_UNDERWATER},
+    {EVENT_OBJ_GFX_BRENDAN_FIELD_MOVE, EVENT_OBJ_GFX_MAY_FIELD_MOVE},
+    {EVENT_OBJ_GFX_BRENDAN_FISHING,    EVENT_OBJ_GFX_MAY_FISHING},
+    {EVENT_OBJ_GFX_BRENDAN_WATERING,   EVENT_OBJ_GFX_MAY_WATERING},
 };
 static const u8 gUnknown_0830FC64[2][5][2] =
 {
     //male
     {
-        {MAP_OBJ_GFX_BRENDAN_NORMAL, 1},
-        {MAP_OBJ_GFX_BRENDAN_MACH_BIKE, 2},
-        {MAP_OBJ_GFX_BRENDAN_ACRO_BIKE, 4},
-        {MAP_OBJ_GFX_BRENDAN_SURFING, 8},
-        {MAP_OBJ_GFX_BRENDAN_UNDERWATER, 16},
+        {EVENT_OBJ_GFX_BRENDAN_NORMAL, 1},
+        {EVENT_OBJ_GFX_BRENDAN_MACH_BIKE, 2},
+        {EVENT_OBJ_GFX_BRENDAN_ACRO_BIKE, 4},
+        {EVENT_OBJ_GFX_BRENDAN_SURFING, 8},
+        {EVENT_OBJ_GFX_BRENDAN_UNDERWATER, 16},
     },
     //female
     {
-        {MAP_OBJ_GFX_MAY_NORMAL, 1},
-        {MAP_OBJ_GFX_MAY_MACH_BIKE, 2},
-        {MAP_OBJ_GFX_MAY_ACRO_BIKE, 4},
-        {MAP_OBJ_GFX_MAY_SURFING, 8},
-        {MAP_OBJ_GFX_MAY_UNDERWATER, 16},
+        {EVENT_OBJ_GFX_MAY_NORMAL, 1},
+        {EVENT_OBJ_GFX_MAY_MACH_BIKE, 2},
+        {EVENT_OBJ_GFX_MAY_ACRO_BIKE, 4},
+        {EVENT_OBJ_GFX_MAY_SURFING, 8},
+        {EVENT_OBJ_GFX_MAY_UNDERWATER, 16},
     }
 };
 static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of sArrowWarpMetatileBehaviorChecks
@@ -178,17 +178,17 @@ static bool8 (*const sArrowWarpMetatileBehaviorChecks2[])(u8) =  //Duplicate of
     MetatileBehavior_IsWestArrowWarp,
     MetatileBehavior_IsEastArrowWarp,
 };
-static u8 (*const gUnknown_0830FC88[])(struct Task *, struct MapObject *, struct MapObject *) =
+static u8 (*const gUnknown_0830FC88[])(struct Task *, struct EventObject *, struct EventObject *) =
 {
     sub_8059E84,
     sub_8059EA4,
     sub_8059F40,
 };
-static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct MapObject *) =
+static u8 (*const sPlayerAvatarSecretBaseMatJump[])(struct Task *, struct EventObject *) =
 {
     PlayerAvatar_DoSecretBaseMatJump,
 };
-static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) =
+static u8 (*const gUnknown_0830FC98[])(struct Task *, struct EventObject *) =
 {
     sub_805A0D8,
     sub_805A100,
@@ -196,19 +196,19 @@ static u8 (*const gUnknown_0830FC98[])(struct Task *, struct MapObject *) =
     sub_805A1B8,
 };
 
-fieldmap_object_null_cb(sub_80587B4, sub_80587D8);
+movement_type_empty_callback(MovementType_Player);
 
 void player_step(u8 direction, u16 newKeys, u16 heldKeys)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    sub_8059D60(playerMapObj);
+    sub_8059D60(playerEventObj);
     if (gPlayerAvatar.preventStep == FALSE)
     {
         Bike_TryAcroBikeHistoryUpdate(newKeys, heldKeys);
-        if (!sub_8058854(playerMapObj, direction))
+        if (!sub_8058854(playerEventObj, direction))
         {
-            npc_clear_strange_bits(playerMapObj);
+            npc_clear_strange_bits(playerEventObj);
             DoPlayerAvatarTransition();
             if (TryDoMetatileBehaviorForcedMovement() == 0)
             {
@@ -219,16 +219,15 @@ void player_step(u8 direction, u16 newKeys, u16 heldKeys)
     }
 }
 
-static bool8 sub_8058854(struct MapObject *playerMapObj, u8 direction)
+static bool8 sub_8058854(struct EventObject *playerEventObj, u8 direction)
 {
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj)
-     && !FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj))
+    if (EventObjectIsMovementOverridden(playerEventObj)
+     && !EventObjectClearHeldMovementIfFinished(playerEventObj))
     {
-        u8 specialAnim = FieldObjectGetSpecialAnim(playerMapObj);
-
-        if (specialAnim > 24 && specialAnim < 29 && direction != DIR_NONE && playerMapObj->movementDirection != direction)
+        u8 heldMovementActionId = EventObjectGetHeldMovementActionId(playerEventObj);
+        if (heldMovementActionId > 24 && heldMovementActionId < 29 && direction != DIR_NONE && playerEventObj->movementDirection != direction)
         {
-            FieldObjectClearAnim(playerMapObj);
+            EventObjectClearHeldMovement(playerEventObj);
             return FALSE;
         }
         else
@@ -239,11 +238,11 @@ static bool8 sub_8058854(struct MapObject *playerMapObj, u8 direction)
     return FALSE;
 }
 
-static void npc_clear_strange_bits(struct MapObject *mapObj)
+static void npc_clear_strange_bits(struct EventObject *eventObj)
 {
-    mapObj->inanimate = 0;
-    mapObj->disableAnim = 0;
-    mapObj->facingDirectionLocked = 0;
+    eventObj->inanimate = 0;
+    eventObj->disableAnim = 0;
+    eventObj->facingDirectionLocked = 0;
     gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_DASH;
 }
 
@@ -277,7 +276,7 @@ static u8 GetForcedMovementByMetatileBehavior(void)
 
     if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_5))
     {
-        u8 r5 = gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior;
+        u8 r5 = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior;
 
         for (i = 0; i < 18; i++)
         {
@@ -292,11 +291,11 @@ bool8 ForcedMovement_None(void)
 {
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_6)
     {
-        struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-        playerMapObj->facingDirectionLocked = 0;
-        playerMapObj->enableAnim = 1;
-        FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection);
+        playerEventObj->facingDirectionLocked = 0;
+        playerEventObj->enableAnim = 1;
+        SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection);
         gPlayerAvatar.flags &= ~PLAYER_AVATAR_FLAG_6;
     }
     return FALSE;
@@ -334,10 +333,10 @@ static u8 DoForcedMovement(u8 direction, void (*b)(u8))
 
 static u8 DoForcedMovementInCurrentDirection(void (*a)(u8))
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    playerMapObj->disableAnim = 1;
-    return DoForcedMovement(playerMapObj->movementDirection, a);
+    playerEventObj->disableAnim = 1;
+    return DoForcedMovement(playerEventObj->movementDirection, a);
 }
 
 bool8 ForcedMovement_Slip(void)
@@ -387,10 +386,10 @@ bool8 sub_8058B54(void)
 
 static u8 ForcedMovement_Slide(u8 direction, void (*b)(u8))
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    playerMapObj->disableAnim = 1;
-    playerMapObj->facingDirectionLocked = 1;
+    playerEventObj->disableAnim = 1;
+    playerEventObj->facingDirectionLocked = 1;
     return DoForcedMovement(direction, b);
 }
 
@@ -428,12 +427,12 @@ bool8 sub_8058C10(void)
 
 bool8 ForcedMovement_MuddySlope(void)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (playerMapObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3)
+    if (playerEventObj->movementDirection != DIR_NORTH || GetPlayerSpeed() <= 3)
     {
         Bike_UpdateBikeCounterSpeed(0);
-        playerMapObj->facingDirectionLocked = 1;
+        playerEventObj->facingDirectionLocked = 1;
         return DoForcedMovement(1, PlayerGoSpeed2);
     }
     else
@@ -458,7 +457,7 @@ static u8 CheckMovementInputNotOnBike(u8 direction)
         gPlayerAvatar.runningState = NOT_MOVING;
         return 0;
     }
-    else if (direction != player_get_direction_upper_nybble() && gPlayerAvatar.runningState != MOVING)
+    else if (direction != GetPlayerMovementDirection() && gPlayerAvatar.runningState != MOVING)
     {
         gPlayerAvatar.runningState = TURN_DIRECTION;
         return 1;
@@ -472,7 +471,7 @@ static u8 CheckMovementInputNotOnBike(u8 direction)
 
 void PlayerNotOnBikeNotMoving(u8 direction, u16 heldKeys)
 {
-    PlayerFaceDirection(player_get_direction_lower_nybble());
+    PlayerFaceDirection(GetPlayerFacingDirection());
 }
 
 void PlayerNotOnBikeTurningInPlace(u8 direction, u16 heldKeys)
@@ -501,7 +500,7 @@ void sub_8058D0C(u8 direction, u16 heldKeys)
             return;
         }
         if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_UNDERWATER) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH)
-         && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior) == 0)
+         && IsRunningDisallowed(gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior) == 0)
         {
             sub_805940C(direction);
             gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_DASH;
@@ -516,19 +515,19 @@ void sub_8058D0C(u8 direction, u16 heldKeys)
 static u8 CheckForPlayerAvatarCollision(u8 direction)
 {
     s16 x, y;
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    x = playerMapObj->currentCoords.x;
-    y = playerMapObj->currentCoords.y;
+    x = playerEventObj->currentCoords.x;
+    y = playerEventObj->currentCoords.y;
     MoveCoords(direction, &x, &y);
-    return CheckForFieldObjectCollision(playerMapObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
+    return CheckForEventObjectCollision(playerEventObj, x, y, direction, MapGridGetMetatileBehaviorAt(x, y));
 }
 
-u8 CheckForFieldObjectCollision(struct MapObject *a, s16 x, s16 y, u8 direction, u8 e)
+u8 CheckForEventObjectCollision(struct EventObject *a, s16 x, s16 y, u8 direction, u8 e)
 {
     u8 collision;
 
-    collision = npc_block_way(a, x, y, direction);
+    collision = GetCollisionAtCoords(a, x, y, direction);
     if (collision == 3 && sub_8058EF0(x, y, direction))
         return 5;
     if (ShouldJumpLedge(x, y, direction))
@@ -552,7 +551,7 @@ static u8 sub_8058EF0(s16 a, s16 b, u8 c)
 {
     if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
      && MapGridGetZCoordAt(a, b) == 3
-     && GetFieldObjectIdByXYZ(a, b, 3) == 16)
+     && GetEventObjectIdByXYZ(a, b, 3) == 16)
     {
         sub_805A20C(c);
         return 1;
@@ -575,19 +574,19 @@ static u8 sub_8058F6C(s16 a, s16 b, u8 c)
 {
     if (FlagGet(FLAG_SYS_USE_STRENGTH))
     {
-        u8 mapObjectId = GetFieldObjectIdByXY(a, b);
+        u8 eventObjectId = GetEventObjectIdByXY(a, b);
 
-        if (mapObjectId != 16)
+        if (eventObjectId != 16)
         {
-            if (gMapObjects[mapObjectId].graphicsId == 0x57)
+            if (gEventObjects[eventObjectId].graphicsId == 0x57)
             {
-                a = gMapObjects[mapObjectId].currentCoords.x;
-                b = gMapObjects[mapObjectId].currentCoords.y;
+                a = gEventObjects[eventObjectId].currentCoords.x;
+                b = gEventObjects[eventObjectId].currentCoords.y;
                 MoveCoords(c, &a, &b);
-                if (npc_block_way(&gMapObjects[mapObjectId], a, b, c) == 0
+                if (GetCollisionAtCoords(&gEventObjects[eventObjectId], a, b, c) == 0
                  && MetatileBehavior_IsNonAnimDoor(MapGridGetMetatileBehaviorAt(a, b)) == 0)
                 {
-                    StartStrengthAnim(mapObjectId, c);
+                    StartStrengthAnim(eventObjectId, c);
                     return 1;
                 }
             }
@@ -628,13 +627,13 @@ static void DoPlayerAvatarTransition(void)
 #ifdef NONMATCHING
             if (flags & 1)
             {
-                gUnknown_0830FC14[i](&gMapObjects[gPlayerAvatar.mapObjectId]);
+                gUnknown_0830FC14[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
             }
 #else
             if (flags & 1)
             {
-                register void (*const *funcs)(struct MapObject *) asm("r0") = gUnknown_0830FC14;
-                funcs[i](&gMapObjects[gPlayerAvatar.mapObjectId]);
+                register void (*const *funcs)(struct EventObject *) asm("r0") = gUnknown_0830FC14;
+                funcs[i](&gEventObjects[gPlayerAvatar.eventObjectId]);
             }
 #endif
         }
@@ -642,58 +641,58 @@ static void DoPlayerAvatarTransition(void)
     }
 }
 
-void nullsub_49(struct MapObject *mapObj)
+void nullsub_49(struct EventObject *eventObj)
 {
 }
 
-void PlayerAvatarTransition_Normal(struct MapObject *mapObj)
+void PlayerAvatarTransition_Normal(struct EventObject *eventObj)
 {
-    sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
-    FieldObjectTurn(mapObj, mapObj->movementDirection);
+    sub_805B980(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ON_FOOT);
 }
 
-void PlayerAvatarTransition_MachBike(struct MapObject *mapObj)
+void PlayerAvatarTransition_MachBike(struct EventObject *eventObj)
 {
-    sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE));
-    FieldObjectTurn(mapObj, mapObj->movementDirection);
+    sub_805B980(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_MACH_BIKE));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_MACH_BIKE);
     BikeClearState(0, 0);
 }
 
-void PlayerAvatarTransition_AcroBike(struct MapObject *mapObj)
+void PlayerAvatarTransition_AcroBike(struct EventObject *eventObj)
 {
-    sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
-    FieldObjectTurn(mapObj, mapObj->movementDirection);
+    sub_805B980(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_ACRO_BIKE);
     BikeClearState(0, 0);
     Bike_HandleBumpySlopeJump();
 }
 
-void PlayerAvatarTransition_Surfing(struct MapObject *mapObj)
+void PlayerAvatarTransition_Surfing(struct EventObject *eventObj)
 {
     u8 unk;
 
-    sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
-    FieldObjectTurn(mapObj, mapObj->movementDirection);
+    sub_805B980(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_SURFING));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_SURFING);
-    gFieldEffectArguments[0] = mapObj->currentCoords.x;
-    gFieldEffectArguments[1] = mapObj->currentCoords.y;
-    gFieldEffectArguments[2] = gPlayerAvatar.mapObjectId;
+    gFieldEffectArguments[0] = eventObj->currentCoords.x;
+    gFieldEffectArguments[1] = eventObj->currentCoords.y;
+    gFieldEffectArguments[2] = gPlayerAvatar.eventObjectId;
     unk = FieldEffectStart(FLDEFF_SURF_BLOB);
-    mapObj->fieldEffectSpriteId = unk;
+    eventObj->fieldEffectSpriteId = unk;
     sub_8127ED0(unk, 1);
 }
 
-void PlayerAvatarTransition_Underwater(struct MapObject *mapObj)
+void PlayerAvatarTransition_Underwater(struct EventObject *eventObj)
 {
-    sub_805B980(mapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER));
-    FieldObjectTurn(mapObj, mapObj->movementDirection);
+    sub_805B980(eventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_UNDERWATER));
+    EventObjectTurn(eventObj, eventObj->movementDirection);
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_UNDERWATER);
-    mapObj->fieldEffectSpriteId = sub_8128124(mapObj->spriteId);
+    eventObj->fieldEffectSpriteId = sub_8128124(eventObj->spriteId);
 }
 
-void sub_80591F4(struct MapObject *mapObj)
+void sub_80591F4(struct EventObject *eventObj)
 {
     gPlayerAvatar.flags |= PLAYER_AVATAR_FLAG_5;
 }
@@ -718,7 +717,7 @@ void sub_8059204(void)
 
 static bool8 player_is_anim_in_certain_ranges(void)
 {
-    u8 unk = gMapObjects[gPlayerAvatar.mapObjectId].animId;
+    u8 unk = gEventObjects[gPlayerAvatar.eventObjectId].movementActionId;
 
     if (unk < 4
      || (unk >= 16 && unk < 0x15)
@@ -740,92 +739,92 @@ static bool8 sub_80592A4(void)
 
 static bool8 PlayerIsAnimActive(void)
 {
-    return FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[gPlayerAvatar.mapObjectId]);
+    return EventObjectIsMovementOverridden(&gEventObjects[gPlayerAvatar.eventObjectId]);
 }
 
 static bool8 PlayerCheckIfAnimFinishedOrInactive(void)
 {
-    return FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]);
+    return EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]);
 }
 
-static void player_set_x22(u8 a)
+static void PlayerSetCopyableMovement(u8 a)
 {
-    gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId = a;
+    gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement = a;
 }
 
-u8 player_get_x22(void)
+u8 PlayerGetCopyableMovement(void)
 {
-    return gMapObjects[gPlayerAvatar.mapObjectId].playerAnimId;
+    return gEventObjects[gPlayerAvatar.eventObjectId].playerCopyableMovement;
 }
 
 static void sub_8059348(u8 a)
 {
-    FieldObjectForceSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], a);
+    EventObjectForceSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], a);
 }
 
-void PlayerSetAnimId(u8 animId, u8 b)
+void PlayerSetAnimId(u8 movementActionId, u8 copyableMovement)
 {
     if (!PlayerIsAnimActive())
     {
-        player_set_x22(b);
-        FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], animId);
+        PlayerSetCopyableMovement(copyableMovement);
+        EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], movementActionId);
     }
 }
 
 // normal speed (1 speed)
 void PlayerGoSpeed1(u8 a)
 {
-    PlayerSetAnimId(GetGoSpeed0AnimId(a), 2);
+    PlayerSetAnimId(GetWalkNormalMovementAction(a), 2);
 }
 
 // fast speed (2 speed)
 void PlayerGoSpeed2(u8 a)
 {
-    PlayerSetAnimId(sub_8060744(a), 2);
+    PlayerSetAnimId(GetWalkFastMovementAction(a), 2);
 }
 
 void npc_use_some_d2s(u8 a)
 {
-    PlayerSetAnimId(d2s_08064034(a), 2);
+    PlayerSetAnimId(GetRideWaterCurrentMovementAction(a), 2);
 }
 
 // fastest speed (4 speed)
 void PlayerGoSpeed4(u8 a)
 {
-    PlayerSetAnimId(sub_806079C(a), 2);
+    PlayerSetAnimId(GetWalkFastestMovementAction(a), 2);
 }
 
 void sub_805940C(u8 a)
 {
-    PlayerSetAnimId(sub_80607F4(a), 2);
+    PlayerSetAnimId(GetPlayerRunMovementAction(a), 2);
 }
 
 void PlayerOnBikeCollide(u8 a)
 {
     PlayCollisionSoundIfNotFacingWarp(a);
-    PlayerSetAnimId(GetStepInPlaceDelay16AnimId(a), 2);
+    PlayerSetAnimId(GetWalkInPlaceNormalMovementAction(a), 2);
 }
 
 static void PlayerNotOnBikeCollide(u8 a)
 {
     PlayCollisionSoundIfNotFacingWarp(a);
-    PlayerSetAnimId(GetStepInPlaceDelay32AnimId(a), 2);
+    PlayerSetAnimId(GetWalkInPlaceSlowMovementAction(a), 2);
 }
 
 void PlayerFaceDirection(u8 direction)
 {
-    PlayerSetAnimId(GetFaceDirectionAnimId(direction), 1);
+    PlayerSetAnimId(GetFaceDirectionMovementAction(direction), 1);
 }
 
 void PlayerTurnInPlace(u8 direction)
 {
-    PlayerSetAnimId(GetStepInPlaceDelay8AnimId(direction), 1);
+    PlayerSetAnimId(GetWalkInPlaceFastMovementAction(direction), 1);
 }
 
 void PlayerJumpLedge(u8 direction)
 {
     PlaySE(SE_DANSA);
-    PlayerSetAnimId(GetJumpLedgeAnimId(direction), 8);
+    PlayerSetAnimId(GetJump2MovementAction(direction), 8);
 }
 
 void sub_80594C0(void)
@@ -833,81 +832,81 @@ void sub_80594C0(void)
     if (gPlayerAvatar.tileTransitionState == T_TILE_CENTER || gPlayerAvatar.tileTransitionState == T_NOT_MOVING)
     {
         if (player_should_look_direction_be_enforced_upon_movement())
-            sub_8059348(GetFaceDirectionAnimId(gMapObjects[gPlayerAvatar.mapObjectId].facingDirection));
+            sub_8059348(GetFaceDirectionMovementAction(gEventObjects[gPlayerAvatar.eventObjectId].facingDirection));
     }
 }
 
 // wheelie idle
-void PlayerIdleWheelie(u8 a)
+void PlayerIdleWheelie(u8 direction)
 {
-    PlayerSetAnimId(sub_80609D8(a), 1);
+    PlayerSetAnimId(GetAcroWheelieFaceDirectionMovementAction(direction), 1);
 }
 
 // normal to wheelie
-void PlayerStartWheelie(u8 a)
+void PlayerStartWheelie(u8 direction)
 {
-    PlayerSetAnimId(sub_8060A04(a), 1);
+    PlayerSetAnimId(GetAcroPopWheelieFaceDirectionMovementAction(direction), 1);
 }
 
 // wheelie to normal
-void PlayerEndWheelie(u8 a)
+void PlayerEndWheelie(u8 direction)
 {
-    PlayerSetAnimId(sub_8060A30(a), 1);
+    PlayerSetAnimId(GetAcroEndWheelieFaceDirectionMovementAction(direction), 1);
 }
 
 // wheelie hopping standing
 void PlayerStandingHoppingWheelie(u8 a)
 {
     PlaySE(SE_JITE_PYOKO);
-    PlayerSetAnimId(sub_8060A5C(a), 1);
+    PlayerSetAnimId(GetAcroWheelieHopFaceDirectionMovementAction(a), 1);
 }
 
 // wheelie hopping moving
 void PlayerMovingHoppingWheelie(u8 a)
 {
     PlaySE(SE_JITE_PYOKO);
-    PlayerSetAnimId(sub_8060A88(a), 2);
+    PlayerSetAnimId(GetAcroWheelieHopDirectionMovementAction(a), 2);
 }
 
 // wheelie hopping ledge
 void PlayerLedgeHoppingWheelie(u8 a)
 {
     PlaySE(SE_JITE_PYOKO);
-    PlayerSetAnimId(sub_8060AB4(a), 8);
+    PlayerSetAnimId(GetAcroWheelieJumpDirectionMovementAction(a), 8);
 }
 
 // acro turn jump
 void PlayerAcroTurnJump(u8 direction)
 {
     PlaySE(SE_JITE_PYOKO);
-    PlayerSetAnimId(sub_8060878(direction), 1);
+    PlayerSetAnimId(GetJumpInPlaceTurnAroundMovementAction(direction), 1);
 }
 
 void sub_80595DC(u8 direction)
 {
     PlaySE(SE_WALL_HIT);
-    PlayerSetAnimId(sub_8060AE0(direction), 2);
+    PlayerSetAnimId(GetAcroWheelieInPlaceDirectionMovementAction(direction), 2);
 }
 
-void sub_8059600(u8 a)
+void sub_8059600(u8 direction)
 {
-    PlayerSetAnimId(sub_8060B0C(a), 2);
+    PlayerSetAnimId(GetAcroPopWheelieMoveDirectionMovementAction(direction), 2);
 }
 
-void sub_8059618(u8 a)
+void sub_8059618(u8 direction)
 {
-    PlayerSetAnimId(sub_8060B38(a), 2);
+    PlayerSetAnimId(GetAcroWheelieMoveDirectionMovementAction(direction), 2);
 }
 
-void sub_8059630(u8 a)
+void sub_8059630(u8 direction)
 {
-    PlayerSetAnimId(sub_8060B64(a), 2);
+    PlayerSetAnimId(GetAcroEndWheelieMoveDirectionMovementAction(direction), 2);
 }
 
 static void PlayCollisionSoundIfNotFacingWarp(u8 a)
 {
     s16 x, y;
-    u8 metatileBehavior = gMapObjects[gPlayerAvatar.mapObjectId].currentMetatileBehavior;
+    u8 metatileBehavior = gEventObjects[gPlayerAvatar.eventObjectId].currentMetatileBehavior;
 
     if (!sArrowWarpMetatileBehaviorChecks[a - 1](metatileBehavior))
     {
@@ -924,35 +923,35 @@ static void PlayCollisionSoundIfNotFacingWarp(u8 a)
 
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y)
 {
-    *x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x;
-    *y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y;
-    MoveCoords(player_get_direction_lower_nybble(), x, y);
+    *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
+    *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
+    MoveCoords(GetPlayerFacingDirection(), x, y);
 }
 
 void PlayerGetDestCoords(s16 *x, s16 *y)
 {
-    *x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x;
-    *y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y;
+    *x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
+    *y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
 }
 
-u8 player_get_direction_lower_nybble(void)
+u8 GetPlayerFacingDirection(void)
 {
-    return gMapObjects[gPlayerAvatar.mapObjectId].facingDirection;
+    return gEventObjects[gPlayerAvatar.eventObjectId].facingDirection;
 }
 
-u8 player_get_direction_upper_nybble(void)
+u8 GetPlayerMovementDirection(void)
 {
-    return gMapObjects[gPlayerAvatar.mapObjectId].movementDirection;
+    return gEventObjects[gPlayerAvatar.eventObjectId].movementDirection;
 }
 
 u8 PlayerGetZCoord(void)
 {
-    return gMapObjects[gPlayerAvatar.mapObjectId].previousElevation;
+    return gEventObjects[gPlayerAvatar.eventObjectId].previousElevation;
 }
 
 void unref_sub_8059790(s16 a, s16 b)
 {
-    sub_805C058(&gMapObjects[gPlayerAvatar.mapObjectId], a, b);
+    sub_805C058(&gEventObjects[gPlayerAvatar.eventObjectId], a, b);
 }
 
 u8 TestPlayerAvatarFlags(u8 a)
@@ -977,10 +976,10 @@ void sub_80597E8(void)
 
 void sub_80597F4(void)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    npc_clear_strange_bits(playerMapObj);
-    FieldObjectSetDirection(playerMapObj, playerMapObj->facingDirection);
+    npc_clear_strange_bits(playerEventObj);
+    SetEventObjectDirection(playerEventObj, playerEventObj->facingDirection);
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
     {
         Bike_HandleBumpySlopeJump();
@@ -1007,14 +1006,14 @@ u8 unref_GetRivalAvatarGenderByGraphcsId(u8 gfxId)
 {
     switch (gfxId)
     {
-    case MAP_OBJ_GFX_RIVAL_MAY_NORMAL:
-    case MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE:
-    case MAP_OBJ_GFX_RIVAL_MAY_ACRO_BIKE:
-    case MAP_OBJ_GFX_RIVAL_MAY_SURFING:
-    case MAP_OBJ_GFX_RIVAL_MAY_FIELD_MOVE:
-    case MAP_OBJ_GFX_MAY_UNDERWATER:
-    case MAP_OBJ_GFX_MAY_FISHING:
-    case MAP_OBJ_GFX_MAY_WATERING:
+    case EVENT_OBJ_GFX_RIVAL_MAY_NORMAL:
+    case EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE:
+    case EVENT_OBJ_GFX_RIVAL_MAY_ACRO_BIKE:
+    case EVENT_OBJ_GFX_RIVAL_MAY_SURFING:
+    case EVENT_OBJ_GFX_RIVAL_MAY_FIELD_MOVE:
+    case EVENT_OBJ_GFX_MAY_UNDERWATER:
+    case EVENT_OBJ_GFX_MAY_FISHING:
+    case EVENT_OBJ_GFX_MAY_WATERING:
         return FEMALE;
     default:
         return MALE;
@@ -1025,14 +1024,14 @@ u8 GetPlayerAvatarGenderByGraphicsId(u8 gfxId)
 {
     switch (gfxId)
     {
-    case MAP_OBJ_GFX_MAY_NORMAL:
-    case MAP_OBJ_GFX_MAY_MACH_BIKE:
-    case MAP_OBJ_GFX_MAY_ACRO_BIKE:
-    case MAP_OBJ_GFX_MAY_SURFING:
-    case MAP_OBJ_GFX_MAY_FIELD_MOVE:
-    case MAP_OBJ_GFX_MAY_UNDERWATER:
-    case MAP_OBJ_GFX_MAY_FISHING:
-    case MAP_OBJ_GFX_MAY_WATERING:
+    case EVENT_OBJ_GFX_MAY_NORMAL:
+    case EVENT_OBJ_GFX_MAY_MACH_BIKE:
+    case EVENT_OBJ_GFX_MAY_ACRO_BIKE:
+    case EVENT_OBJ_GFX_MAY_SURFING:
+    case EVENT_OBJ_GFX_MAY_FIELD_MOVE:
+    case EVENT_OBJ_GFX_MAY_UNDERWATER:
+    case EVENT_OBJ_GFX_MAY_FISHING:
+    case EVENT_OBJ_GFX_MAY_WATERING:
         return FEMALE;
     default:
         return MALE;
@@ -1058,7 +1057,7 @@ bool8 PartyHasMonWithSurf(void)
 
 bool8 IsPlayerSurfingNorth(void)
 {
-    if (player_get_direction_upper_nybble() == DIR_NORTH && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
+    if (GetPlayerMovementDirection() == DIR_NORTH && TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
         return TRUE;
     else
         return FALSE;
@@ -1066,12 +1065,12 @@ bool8 IsPlayerSurfingNorth(void)
 
 bool8 IsPlayerFacingSurfableFishableWater(void)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    s16 x = playerMapObj->currentCoords.x;
-    s16 y = playerMapObj->currentCoords.y;
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    s16 x = playerEventObj->currentCoords.x;
+    s16 y = playerEventObj->currentCoords.y;
 
-    MoveCoords(playerMapObj->facingDirection, &x, &y);
-    if (npc_block_way(playerMapObj, x, y, playerMapObj->facingDirection) == 3 && PlayerGetZCoord() == 3
+    MoveCoords(playerEventObj->facingDirection, &x, &y);
+    if (GetCollisionAtCoords(playerEventObj, x, y, playerEventObj->facingDirection) == 3 && PlayerGetZCoord() == 3
      && MetatileBehavior_IsSurfableFishableWater(MapGridGetMetatileBehaviorAt(x, y)))
         return TRUE;
     else
@@ -1124,87 +1123,87 @@ void SetPlayerAvatarExtraStateTransition(u8 a, u8 b)
 
 void InitPlayerAvatar(s16 x, s16 y, u8 direction, u8 gender)
 {
-    struct MapObjectTemplate playerMapObjTemplate;
-    u8 mapObjectId;
-    struct MapObject *mapObject;
-
-    playerMapObjTemplate.localId = 0xFF;
-    playerMapObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
-    playerMapObjTemplate.x = x - 7;
-    playerMapObjTemplate.y = y - 7;
-    playerMapObjTemplate.elevation = 0;
-    playerMapObjTemplate.movementType = 11;
-    playerMapObjTemplate.unkA_0 = 0;
-    playerMapObjTemplate.unkA_4 = 0;
-    playerMapObjTemplate.unkC = 0;
-    playerMapObjTemplate.unkE = 0;
-    playerMapObjTemplate.script = NULL;
-    playerMapObjTemplate.flagId = 0;
-    mapObjectId = SpawnSpecialFieldObject(&playerMapObjTemplate);
-    mapObject = &gMapObjects[mapObjectId];
-    mapObject->isPlayer = 1;
-    mapObject->warpArrowSpriteId = sub_8126B54();
-    FieldObjectTurn(mapObject, direction);
+    struct EventObjectTemplate playerEventObjTemplate;
+    u8 eventObjectId;
+    struct EventObject *eventObject;
+
+    playerEventObjTemplate.localId = 0xFF;
+    playerEventObjTemplate.graphicsId = GetPlayerAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gender);
+    playerEventObjTemplate.x = x - 7;
+    playerEventObjTemplate.y = y - 7;
+    playerEventObjTemplate.elevation = 0;
+    playerEventObjTemplate.movementType = MOVEMENT_TYPE_PLAYER;
+    playerEventObjTemplate.movementRangeX = 0;
+    playerEventObjTemplate.movementRangeY = 0;
+    playerEventObjTemplate.trainerType = 0;
+    playerEventObjTemplate.trainerRange_berryTreeId = 0;
+    playerEventObjTemplate.script = NULL;
+    playerEventObjTemplate.flagId = 0;
+    eventObjectId = SpawnSpecialEventObject(&playerEventObjTemplate);
+    eventObject = &gEventObjects[eventObjectId];
+    eventObject->isPlayer = 1;
+    eventObject->warpArrowSpriteId = sub_8126B54();
+    EventObjectTurn(eventObject, direction);
     ClearPlayerAvatarInfo();
     gPlayerAvatar.runningState = NOT_MOVING;
     gPlayerAvatar.tileTransitionState = T_NOT_MOVING;
-    gPlayerAvatar.mapObjectId = mapObjectId;
-    gPlayerAvatar.spriteId = mapObject->spriteId;
+    gPlayerAvatar.eventObjectId = eventObjectId;
+    gPlayerAvatar.spriteId = eventObject->spriteId;
     gPlayerAvatar.gender = gender;
     SetPlayerAvatarStateMask(PLAYER_AVATAR_FLAG_5 | PLAYER_AVATAR_FLAG_ON_FOOT);
 }
 
 void sub_8059B88(u8 a)
 {
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = a;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = a;
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_SURFING))
-        gSprites[gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId].invisible = a;
+        gSprites[gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId].invisible = a;
 }
 
 void sub_8059BF4(void)
 {
-    sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
+    sub_805B980(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FIELD_MOVE));
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 0);
 }
 
-void sub_8059C3C(u8 a)
+void sub_8059C3C(u8 direction)
 {
-    sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING));
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDE8(a));
+    sub_805B980(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_FISHING));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingDirectionAnimNum(direction));
 }
 
 void sub_8059C94(u8 direction)
 {
-    sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FD98(direction));
+    sub_805B980(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_ACRO_BIKE));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetAcroWheelieDirectionAnimNum(direction));
     SeekSpriteAnim(&gSprites[gPlayerAvatar.spriteId], 1);
 }
 
 void sub_8059D08(u8 direction)
 {
-    sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], FieldObjectDirectionToImageAnimId(direction));
+    sub_805B980(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_WATERING));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFaceDirectionAnimNum(direction));
 }
 
-static void sub_8059D60(struct MapObject *mapObject)
+static void sub_8059D60(struct EventObject *eventObject)
 {
     s16 x;
     s16 y;
     u8 direction;
-    u8 metatileBehavior = mapObject->currentMetatileBehavior;
+    u8 metatileBehavior = eventObject->currentMetatileBehavior;
 
     for (x = 0, direction = DIR_SOUTH; x < 4; x++, direction++)
     {
-        if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == mapObject->movementDirection)
+        if (sArrowWarpMetatileBehaviorChecks2[x](metatileBehavior) && direction == eventObject->movementDirection)
         {
-            x = mapObject->currentCoords.x;
-            y = mapObject->currentCoords.y;
+            x = eventObject->currentCoords.x;
+            y = eventObject->currentCoords.y;
             MoveCoords(direction, &x, &y);
-            sub_8126BC4(mapObject->warpArrowSpriteId, direction, x, y);
+            sub_8126BC4(eventObject->warpArrowSpriteId, direction, x, y);
             return;
         }
     }
-    objid_set_invisible(mapObject->warpArrowSpriteId);
+    objid_set_invisible(eventObject->warpArrowSpriteId);
 }
 
 /* Strength */
@@ -1223,12 +1222,12 @@ static void StartStrengthAnim(u8 a, u8 b)
 static void sub_8059E2C(u8 taskId)
 {
     while (gUnknown_0830FC88[gTasks[taskId].data[0]](&gTasks[taskId],
-                                                     &gMapObjects[gPlayerAvatar.mapObjectId],
-                                                     &gMapObjects[gTasks[taskId].data[1]]))
+                                                     &gEventObjects[gPlayerAvatar.eventObjectId],
+                                                     &gEventObjects[gTasks[taskId].data[1]]))
         ;
 }
 
-u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c)
+u8 sub_8059E84(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
 {
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
@@ -1236,19 +1235,19 @@ u8 sub_8059E84(struct Task *task, struct MapObject *b, struct MapObject *c)
     return 0;
 }
 
-u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
+u8 sub_8059EA4(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
 {
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(b)
-     && !FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(c))
+    if (!EventObjectIsMovementOverridden(playerObject)
+     && !EventObjectIsMovementOverridden(strengthObject))
     {
-        FieldObjectClearAnimIfSpecialAnimFinished(b);
-        FieldObjectClearAnimIfSpecialAnimFinished(c);
-        FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId((u8)task->data[2]));
-        FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId((u8)task->data[2]));
-        gFieldEffectArguments[0] = c->currentCoords.x;
-        gFieldEffectArguments[1] = c->currentCoords.y;
-        gFieldEffectArguments[2] = c->previousElevation;
-        gFieldEffectArguments[3] = gSprites[c->spriteId].oam.priority;
+        EventObjectClearHeldMovementIfFinished(playerObject);
+        EventObjectClearHeldMovementIfFinished(strengthObject);
+        EventObjectSetHeldMovement(playerObject, GetWalkInPlaceNormalMovementAction((u8)task->data[2]));
+        EventObjectSetHeldMovement(strengthObject, GetWalkSlowMovementAction((u8)task->data[2]));
+        gFieldEffectArguments[0] = strengthObject->currentCoords.x;
+        gFieldEffectArguments[1] = strengthObject->currentCoords.y;
+        gFieldEffectArguments[2] = strengthObject->previousElevation;
+        gFieldEffectArguments[3] = gSprites[strengthObject->spriteId].oam.priority;
         FieldEffectStart(FLDEFF_DUST);
         PlaySE(SE_W070);
         task->data[0]++;
@@ -1256,13 +1255,13 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
     return 0;
 }
 
-u8 sub_8059F40(struct Task *task, struct MapObject *b, struct MapObject *c)
+u8 sub_8059F40(struct Task *task, struct EventObject *playerObject, struct EventObject *strengthObject)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(b)
-     && FieldObjectCheckIfSpecialAnimFinishedOrInactive(c))
+    if (EventObjectCheckHeldMovementStatus(playerObject)
+     && EventObjectCheckHeldMovementStatus(strengthObject))
     {
-        FieldObjectClearAnimIfSpecialAnimFinished(b);
-        FieldObjectClearAnimIfSpecialAnimFinished(c);
+        EventObjectClearHeldMovementIfFinished(playerObject);
+        EventObjectClearHeldMovementIfFinished(strengthObject);
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
         DestroyTask(FindTaskIdByFunc(sub_8059E2C));
@@ -1281,18 +1280,18 @@ static void DoPlayerMatJump(void)
 
 static void DoPlayerAvatarSecretBaseMatJump(u8 taskId)
 {
-    while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId]))
+    while (sPlayerAvatarSecretBaseMatJump[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
         ;
 }
 
 // because data[0] is used to call this, it can be inferred that there may have been multiple mat jump functions at one point, so the name for these groups of functions is appropriate in assuming the sole use of mat jump.
-u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct MapObject *mapObject)
+u8 PlayerAvatar_DoSecretBaseMatJump(struct Task *task, struct EventObject *eventObject)
 {
     gPlayerAvatar.preventStep = TRUE;
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         PlaySE(SE_DANSA);
-        FieldObjectSetSpecialAnim(mapObject, sub_806084C(mapObject->facingDirection));
+        EventObjectSetHeldMovement(eventObject, GetJumpInPlaceMovementAction(eventObject->facingDirection));
         task->data[1]++;
         if (task->data[1] > 1)
         {
@@ -1317,29 +1316,29 @@ static void sub_805A06C(void)
 
 static void sub_805A08C(u8 taskId)
 {
-    while (gUnknown_0830FC98[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId]))
+    while (gUnknown_0830FC98[gTasks[taskId].data[0]](&gTasks[taskId], &gEventObjects[gPlayerAvatar.eventObjectId]))
         ;
 }
 
-u8 sub_805A0D8(struct Task *task, struct MapObject *mapObject)
+u8 sub_805A0D8(struct Task *task, struct EventObject *eventObject)
 {
     task->data[0]++;
-    task->data[1] = mapObject->movementDirection;
+    task->data[1] = eventObject->movementDirection;
     gPlayerAvatar.preventStep = TRUE;
     ScriptContext2_Enable();
     PlaySE(SE_TK_WARPIN);
     return 1;
 }
 
-u8 sub_805A100(struct Task *task, struct MapObject *mapObject)
+u8 sub_805A100(struct Task *task, struct EventObject *eventObject)
 {
     u8 directions[] = {DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
 
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
         u8 direction;
 
-        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(direction = directions[mapObject->movementDirection - 1]));
+        EventObjectSetHeldMovement(eventObject, GetFaceDirectionMovementAction(direction = directions[eventObject->movementDirection - 1]));
         if (direction == (u8)task->data[1])
             task->data[2]++;
         task->data[0]++;
@@ -1349,23 +1348,23 @@ u8 sub_805A100(struct Task *task, struct MapObject *mapObject)
     return 0;
 }
 
-u8 sub_805A178(struct Task *task, struct MapObject *mapObject)
+u8 sub_805A178(struct Task *task, struct EventObject *eventObject)
 {
     const u8 arr[] = {16, 16, 17, 18, 19};
 
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
-        FieldObjectSetSpecialAnim(mapObject, arr[task->data[2]]);
+        EventObjectSetHeldMovement(eventObject, arr[task->data[2]]);
         task->data[0] = 1;
     }
     return 0;
 }
 
-u8 sub_805A1B8(struct Task *task, struct MapObject *mapObject)
+u8 sub_805A1B8(struct Task *task, struct EventObject *eventObject)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    if (EventObjectClearHeldMovementIfFinished(eventObject))
     {
-        FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(GetOppositeDirection(task->data[1])));
+        EventObjectSetHeldMovement(eventObject, GetWalkSlowMovementAction(GetOppositeDirection(task->data[1])));
         ScriptContext2_Disable();
         gPlayerAvatar.preventStep = FALSE;
         DestroyTask(FindTaskIdByFunc(sub_805A08C));
@@ -1395,29 +1394,29 @@ void sub_805A20C(u8 a)
 
 static void taskFF_0805D1D4(u8 taskId)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj))
+    if (EventObjectIsMovementOverridden(playerEventObj))
     {
-        if (!FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj))
+        if (!EventObjectClearHeldMovementIfFinished(playerEventObj))
             return;
     }
-    sub_8127ED0(playerMapObj->fieldEffectSpriteId, 2);
-    FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0]));
+    sub_8127ED0(playerEventObj->fieldEffectSpriteId, 2);
+    EventObjectSetHeldMovement(playerEventObj, GetJumpSpecialMovementAction((u8)gTasks[taskId].data[0]));
     gTasks[taskId].func = sub_805A2D0;
 }
 
 static void sub_805A2D0(u8 taskId)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj))
+    if (EventObjectClearHeldMovementIfFinished(playerEventObj))
     {
-        sub_805B980(playerMapObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
-        FieldObjectSetSpecialAnim(playerMapObj, GetFaceDirectionAnimId(playerMapObj->facingDirection));
+        sub_805B980(playerEventObj, GetPlayerAvatarGraphicsIdByStateId(PLAYER_AVATAR_STATE_NORMAL));
+        EventObjectSetHeldMovement(playerEventObj, GetFaceDirectionMovementAction(playerEventObj->facingDirection));
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
-        DestroySprite(&gSprites[playerMapObj->fieldEffectSpriteId]);
+        DestroySprite(&gSprites[playerEventObj->fieldEffectSpriteId]);
         DestroyTask(taskId);
     }
 }
@@ -1487,17 +1486,17 @@ u8 Fishing1(struct Task *task)
 
 u8 Fishing2(struct Task *task)
 {
-    struct MapObject *playerMapObj;
+    struct EventObject *playerEventObj;
     const s16 arr1[] = {1, 1, 1};
     const s16 arr2[] = {1, 3, 6};
 
     task->tRoundsPlayed = 0;
     task->tMinRoundsRequired = arr1[task->tFishingRod] + (Random() % arr2[task->tFishingRod]);
-    task->tPlayerGfxId = gMapObjects[gPlayerAvatar.mapObjectId].graphicsId;
-    playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    FieldObjectClearAnimIfSpecialAnimActive(playerMapObj);
-    playerMapObj->enableAnim = 1;
-    sub_8059C3C(playerMapObj->facingDirection);
+    task->tPlayerGfxId = gEventObjects[gPlayerAvatar.eventObjectId].graphicsId;
+    playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    EventObjectClearHeldMovementIfActive(playerEventObj);
+    playerEventObj->enableAnim = 1;
+    sub_8059C3C(playerEventObj->facingDirection);
     task->tStep++;
     return 0;
 }
@@ -1575,7 +1574,7 @@ u8 Fishing6(struct Task *task)
     if (!DoesCurrentMapHaveFishingMons() || (Random() & 1))
         task->tStep = FISHING_NO_BITE;
     else
-        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FE08(player_get_direction_lower_nybble()));
+        StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingBiteDirectionAnimNum(GetPlayerFacingDirection()));
     return 1;
 }
 
@@ -1649,12 +1648,12 @@ u8 Fishing11(struct Task *task)
     {
         if (Menu_UpdateWindowText())
         {
-            struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+            struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-            sub_805B980(playerMapObj, task->tPlayerGfxId);
-            FieldObjectTurn(playerMapObj, playerMapObj->movementDirection);
+            sub_805B980(playerEventObj, task->tPlayerGfxId);
+            EventObjectTurn(playerEventObj, playerEventObj->movementDirection);
             if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-                sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 0, 0);
+                sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0);
             gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
             gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
             Menu_EraseScreen();
@@ -1678,7 +1677,7 @@ u8 Fishing11(struct Task *task)
 u8 Fishing12(struct Task *task)
 {
     sub_805A954();
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
     MenuPrintMessageDefaultCoords(gOtherText_NotEvenANibble);
     task->tStep = FISHING_SHOW_RESULT;
     return 1;
@@ -1688,7 +1687,7 @@ u8 Fishing12(struct Task *task)
 u8 Fishing13(struct Task *task)
 {
     sub_805A954();
-    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], sub_805FDF8(player_get_direction_lower_nybble()));
+    StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
     MenuPrintMessageDefaultCoords(gOtherText_ItGotAway);
     task->tStep++;
     return 1;
@@ -1708,12 +1707,12 @@ u8 Fishing15(struct Task *task)
     sub_805A954();
     if (gSprites[gPlayerAvatar.spriteId].animEnded)
     {
-        struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+        struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-        sub_805B980(playerMapObj, task->tPlayerGfxId);
-        FieldObjectTurn(playerMapObj, playerMapObj->movementDirection);
+        sub_805B980(playerEventObj, task->tPlayerGfxId);
+        EventObjectTurn(playerEventObj, playerEventObj->movementDirection);
         if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-            sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 0, 0);
+            sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 0, 0);
         gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
         gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
         task->tStep++;
@@ -1727,7 +1726,7 @@ u8 Fishing16(struct Task *task)
     {
         gPlayerAvatar.preventStep = FALSE;
         ScriptContext2_Disable();
-        UnfreezeMapObjects();
+        UnfreezeEventObjects();
         Menu_EraseScreen();
         sub_80BE97C(0);
         DestroyTask(FindTaskIdByFunc(Task_Fishing));
@@ -1763,7 +1762,7 @@ static void sub_805A954(void)
     if (animType == 1 || animType == 2 || animType == 3)
     {
         playerSprite->pos2.x = 8;
-        if (player_get_direction_lower_nybble() == 3)
+        if (GetPlayerFacingDirection() == 3)
             playerSprite->pos2.x = -8;
     }
     if (animType == 5)
@@ -1771,7 +1770,7 @@ static void sub_805A954(void)
     if (animType == 10 || animType == 11)
         playerSprite->pos2.y = 8;
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-        sub_8127F28(gMapObjects[gPlayerAvatar.mapObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
+        sub_8127F28(gEventObjects[gPlayerAvatar.eventObjectId].fieldEffectSpriteId, 1, playerSprite->pos2.y);
 }
 
 #if DEBUG
@@ -1787,8 +1786,8 @@ u8 debug_sub_805F2B0(u8 a)
 u8 debug_sub_805F2DC(u8 a)
 {
     if (a == 0)
-        PlayerFaceDirection(gMapObjects[gPlayerAvatar.mapObjectId].movementDirection);
-    else if (gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera && !CanCameraMoveInDirection(a))
+        PlayerFaceDirection(gEventObjects[gPlayerAvatar.eventObjectId].movementDirection);
+    else if (gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera && !CanCameraMoveInDirection(a))
         PlayerOnBikeCollide(a);
     else
         PlayerGoSpeed4(a);
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index c710547d3..cf67aa361 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -26,8 +26,8 @@ enum
     STEP_END = 0xFE,
 };
 
-const u32 gMapObjectPic_MovingBox[] = INCBIN_U32("graphics/map_objects/pics/misc/moving_box.4bpp");
-const u16 gMapObjectPalette19[] = INCBIN_U16("graphics/map_objects/palettes/19.gbapal");
+const u32 gEventObjectPic_MovingBox[] = INCBIN_U32("graphics/event_objects/pics/misc/moving_box.4bpp");
+const u16 gEventObjectPalette19[] = INCBIN_U16("graphics/event_objects/palettes/19.gbapal");
 
 static const s8 gTruckCamera_HorizontalTable[] =
 {
@@ -348,24 +348,24 @@ void Task_HandlePorthole(u8 taskId)
 
 void sub_80C78A0(void)
 {
-    u8 spriteId = AddPseudoFieldObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
+    u8 spriteId = AddPseudoEventObject(0x8C, SpriteCallbackDummy, 112, 80, 0);
 
     gSprites[spriteId].coordOffsetEnabled = FALSE;
 
     if (VarGet(VAR_PORTHOLE_STATE) == 2)
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(4));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(4));
     }
     else
     {
-        StartSpriteAnim(&gSprites[spriteId], FieldObjectDirectionToImageAnimId(3));
+        StartSpriteAnim(&gSprites[spriteId], GetFaceDirectionAnimNum(3));
     }
 }
 
 void sub_80C791C(void)
 {
     sub_80C78A0();
-    gMapObjects[gPlayerAvatar.mapObjectId].invisible = TRUE;
+    gEventObjects[gPlayerAvatar.eventObjectId].invisible = TRUE;
     pal_fill_black();
     CreateTask(Task_HandlePorthole, 80);
     ScriptContext2_Enable();
diff --git a/src/field_specials.c b/src/field_specials.c
index 4bb9ad801..829a933bf 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -317,7 +317,12 @@ void SpawnBerryBlenderLinkPlayerSprites(void)
     u8 j = 0;
     s16 x = 0;
     s16 y = 0;
-    u8 unknown_083F8358[] = {7, 9, 8, 10};
+    u8 facingDirectionMovementTypes[] = {
+        MOVEMENT_TYPE_FACE_UP,
+        MOVEMENT_TYPE_FACE_LEFT,
+        MOVEMENT_TYPE_FACE_DOWN,
+        MOVEMENT_TYPE_FACE_RIGHT,
+    };
     s8 unknown_083F835C[][2] = {
         { 0,  1},
         { 1,  0},
@@ -330,7 +335,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void)
     u8 i;
 
     myLinkPlayerNumber = sub_8008218();
-    playerDirectionLowerNybble = player_get_direction_lower_nybble();
+    playerDirectionLowerNybble = GetPlayerFacingDirection();
     switch (playerDirectionLowerNybble)
     {
         case DIR_WEST:
@@ -357,7 +362,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void)
         if (myLinkPlayerNumber != i)
         {
             rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender);
-            SpawnSpecialFieldObjectParametrized(rivalAvatarGraphicsId, unknown_083F8358[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0);
+            SpawnSpecialEventObjectParametrized(rivalAvatarGraphicsId, facingDirectionMovementTypes[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0);
             j++;
             if (j == 4)
             {
@@ -795,7 +800,7 @@ static void PCTurnOffEffect_0(struct Task *task)
     if (task->data[3] == 6)
     {
         task->data[3] = 0;
-        playerDirectionLowerNybble = player_get_direction_lower_nybble();
+        playerDirectionLowerNybble = GetPlayerFacingDirection();
         switch (playerDirectionLowerNybble)
         {
             case DIR_NORTH:
@@ -868,7 +873,7 @@ static void PCTurnOffEffect(void)
     s8 dx = 0;
     s8 dy = 0;
     u16 tileId = 0;
-    u8 playerDirectionLowerNybble = player_get_direction_lower_nybble();
+    u8 playerDirectionLowerNybble = GetPlayerFacingDirection();
     switch (playerDirectionLowerNybble)
     {
         case DIR_NORTH:
@@ -1117,7 +1122,7 @@ void sub_810E984(u8 taskId)
             gSpecialVar_Result = 1;
             gSpecialVar_0x8005 = gUnknown_0203925B;
             ShakeScreenInElevator();
-            FieldObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH);
+            EventObjectTurnByLocalIdAndMap(gSpecialVar_LastTalked, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, DIR_SOUTH);
             sub_810EEDC();
             Menu_EraseScreen();
             DestroyTask(taskId);
@@ -1758,15 +1763,15 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems)
 
 void SpawnCameraDummy(void)
 {
-    u8 mapObjectId = SpawnSpecialFieldObjectParametrized(7, 8, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3);
-    gMapObjects[mapObjectId].invisible = 1;
-    CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId);
+    u8 eventObjectId = SpawnSpecialEventObjectParametrized(7, MOVEMENT_TYPE_FACE_DOWN, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3);
+    gEventObjects[eventObjectId].invisible = 1;
+    CameraObjectSetFollowedObjectId(gEventObjects[eventObjectId].spriteId);
 }
 
 void RemoveCameraDummy(void)
 {
     CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId());
-    RemoveFieldObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+    RemoveEventObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
 }
 
 u8 GetPokeblockNameByMonNature(void)
@@ -2035,9 +2040,9 @@ u16 ScriptGetPartyMonSpecies(void)
     return GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_SPECIES2, NULL);
 }
 
-void sub_810F8FC(void)
+void TryInitBattleTowerAwardManEventObject(void)
 {
-    sub_805ADDC(6);
+    TryInitLocalEventObject(6);
 }
 
 u16 GetDaysUntilPacifidlogTMAvailable(void)
diff --git a/src/fldeff_berrytree.c b/src/fldeff_berrytree.c
index fa4a7e76b..8ff418ee6 100644
--- a/src/fldeff_berrytree.c
+++ b/src/fldeff_berrytree.c
@@ -15,26 +15,26 @@ static void Task_WateringBerryTreeAnim_0(u8 taskId)
 
 static void Task_WateringBerryTreeAnim_1(u8 taskId)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerMapObj)
-        || FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj))
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (!EventObjectIsMovementOverridden(playerEventObj)
+        || EventObjectClearHeldMovementIfFinished(playerEventObj))
     {
-        sub_8059D08(player_get_direction_lower_nybble());
-        FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble()));
+        sub_8059D08(GetPlayerFacingDirection());
+        EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
         gTasks[taskId].func = Task_WateringBerryTreeAnim_2;
     }
 }
 
 static void Task_WateringBerryTreeAnim_2(u8 taskId)
 {
-    struct MapObject *playerMapObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectClearAnimIfSpecialAnimFinished(playerMapObj))
+    struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectClearHeldMovementIfFinished(playerEventObj))
     {
         s16 value = gTasks[taskId].data[1]++;
         
         if (value < 10)
         {
-            FieldObjectSetSpecialAnim(playerMapObj, GetStepInPlaceDelay16AnimId(player_get_direction_lower_nybble()));
+            EventObjectSetHeldMovement(playerEventObj, GetWalkInPlaceNormalMovementAction(GetPlayerFacingDirection()));
         }
         else
         {
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index bea376645..ce580a65c 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -4,7 +4,7 @@
 #include "event_object_movement.h"
 #include "field_player_avatar.h"
 #include "fieldmap.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "metatile_behavior.h"
 #include "metatile_behaviors.h"
 #include "pokemon_menu.h"
@@ -17,7 +17,7 @@
 #include "trig.h"
 #include "ewram.h"
 #include "constants/field_effects.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 
 extern void (*gFieldCallback)(void);
@@ -91,7 +91,7 @@ void Debug_SetUpFieldMove_Cut(void)
     u8 i, j;
     u8 metatile;
 
-    if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         FieldCallback_CutTree();
@@ -130,7 +130,7 @@ bool8 SetUpFieldMove_Cut(void)
     u8 i, j;
     u8 tileBehavior;
 
-    if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
     {
         // Standing in front of cuttable tree.
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
diff --git a/src/fldeff_decoration.c b/src/fldeff_decoration.c
index 8295a2fe0..ea0eb96c5 100644
--- a/src/fldeff_decoration.c
+++ b/src/fldeff_decoration.c
@@ -164,7 +164,7 @@ static void sub_80C6A14(u8 taskId)
 
 void sub_80C6A54(s16 x, s16 y)
 {
-    u8 dir = player_get_direction_lower_nybble();
+    u8 dir = GetPlayerFacingDirection();
     if (dir == DIR_SOUTH)
     {
         sub_80C69C4(x, y);
@@ -236,8 +236,8 @@ void SpriteCB_YellowCave4Sparkle(struct Sprite *sprite)
 
 void DoYellowCave4Sparkle(void)
 {
-    s16 x = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.x;
-    s16 y = gMapObjects[gPlayerAvatar.mapObjectId].currentCoords.y;
+    s16 x = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.x;
+    s16 y = gEventObjects[gPlayerAvatar.eventObjectId].currentCoords.y;
     u8 spriteId;
 
     sub_8060470(&x, &y, 8, 4);
@@ -261,7 +261,7 @@ bool8 FldEff_SandPillar(void)
     gFieldEffectArguments[5] = x;
     gFieldEffectArguments[6] = y;
 
-    switch (player_get_direction_lower_nybble())
+    switch (GetPlayerFacingDirection())
     {
     case DIR_SOUTH:
         CreateSprite(
diff --git a/src/fldeff_secretpower.c b/src/fldeff_secretpower.c
index e58a1e82f..fd8791cb8 100644
--- a/src/fldeff_secretpower.c
+++ b/src/fldeff_secretpower.c
@@ -252,7 +252,7 @@ void Debug_SetUpFieldMove_SecretPower(void)
 
     CheckPlayerHasSecretBase();
 
-    if (gSpecialVar_Result == 1 || player_get_direction_lower_nybble() != DIR_NORTH)
+    if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH)
     {
         ScriptContext2_Disable();
         return;
@@ -291,7 +291,7 @@ bool8 SetUpFieldMove_SecretPower(void)
     u8 behavior;
 
     CheckPlayerHasSecretBase();
-    if (gSpecialVar_Result == 1 || player_get_direction_lower_nybble() != DIR_NORTH)
+    if (gSpecialVar_Result == 1 || GetPlayerFacingDirection() != DIR_NORTH)
         return FALSE;
 
     GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 9f1f3a670..0b66ed0d2 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -9,7 +9,7 @@
 #include "task.h"
 #include "text.h"
 #include "constants/field_effects.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 
 static void sub_811AA18(void);
 static void sub_811AA38(void);
@@ -31,7 +31,7 @@ void debug_sub_8130318(void)
         gSpecialVar_Result = 0;
         sub_811AA38();
     }
-    else if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
+    else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         gSpecialVar_Result = 0;
@@ -54,7 +54,7 @@ bool8 SetUpFieldMove_Strength(void)
     }
     else
     {
-        if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_PUSHABLE_BOULDER) != TRUE)
+        if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE)
             return 0;
         gSpecialVar_Result = gLastFieldPokeMenuOpened;
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
diff --git a/src/item_menu.c b/src/item_menu.c
index fa2ac3a5d..78c342e90 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -3356,7 +3356,7 @@ bool32 sub_80A6D1C(void)
             u8 taskId;
 
             ScriptContext2_Enable();
-            FreezeMapObjects();
+            FreezeEventObjects();
             sub_80594C0();
             sub_80597F4();
             gSpecialVar_ItemId = gSaveBlock1.registeredItem;
diff --git a/src/item_use.c b/src/item_use.c
index 9638588fe..5dfaa942d 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -17,7 +17,7 @@
 #include "constants/items.h"
 #include "mail.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "metatile_behavior.h"
@@ -290,7 +290,7 @@ void RunItemfinderResults(u8 taskId)
             }
             else // player is above hidden item.
             {
-                playerDir = player_get_direction_lower_nybble();
+                playerDir = GetPlayerFacingDirection();
 
                 // rotate player clockwise depending on current direction.
                 for (i = 0; i < 4; i++)
@@ -688,15 +688,15 @@ u8 GetPlayerDirectionTowardsHiddenItem(s16 itemX, s16 itemY)
 
 void SetPlayerDirectionTowardsItem(u8 direction)
 {
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
-    FieldObjectClearAnim(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
-    UnfreezeMapObject(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    EventObjectClearHeldMovement(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
+    UnfreezeEventObject(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]);
     PlayerTurnInPlace(direction);
 }
 
 void DisplayItemRespondingMessageAndExitItemfinder(u8 taskId)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE)
         DisplayItemMessageOnField(taskId, gOtherText_ItemfinderResponding, ExitItemfinder, 0);
 }
 
@@ -704,7 +704,7 @@ void RotatePlayerAndExitItemfinder(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0)]) == TRUE
     || data[2] == FALSE)
     {
         SetPlayerDirectionTowardsItem(gItemFinderDirections[data[5]]);
diff --git a/src/load_save.c b/src/load_save.c
index 8424b1121..7960a42eb 100644
--- a/src/load_save.c
+++ b/src/load_save.c
@@ -81,32 +81,32 @@ void LoadPlayerParty(void)
         gPlayerParty[i] = gSaveBlock1.playerParty[i];
 }
 
-static void SaveMapObjects(void)
+static void SaveEventObjects(void)
 {
     int i;
 
     for (i = 0; i < 16; i++)
-        gSaveBlock1.mapObjects[i] = gMapObjects[i];
+        gSaveBlock1.eventObjects[i] = gEventObjects[i];
 }
 
-static void LoadMapObjects(void)
+static void LoadEventObjects(void)
 {
     int i;
 
     for (i = 0; i < 16; i++)
-        gMapObjects[i] = gSaveBlock1.mapObjects[i];
+        gEventObjects[i] = gSaveBlock1.eventObjects[i];
 }
 
 void SaveSerializedGame(void)
 {
     SavePlayerParty();
-    SaveMapObjects();
+    SaveEventObjects();
 }
 
 void LoadSerializedGame(void)
 {
     LoadPlayerParty();
-    LoadMapObjects();
+    LoadEventObjects();
 }
 
 void LoadPlayerBag(void)
diff --git a/src/mauville_man.c b/src/mauville_man.c
index ac9a02ce9..b3e13ef64 100644
--- a/src/mauville_man.c
+++ b/src/mauville_man.c
@@ -10,7 +10,7 @@
 #include "overworld.h"
 #include "random.h"
 #include "script.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "sound.h"
 #include "string_util.h"
@@ -806,7 +806,7 @@ static void Task_BardSong(u8 taskId)
 
 void sub_80F83D0(void)
 {
-    VarSet(VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
+    VarSet(VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_BARD + GetCurrentMauvilleOldMan());
 }
 
 struct Story
diff --git a/src/menu.c b/src/menu.c
index 9abcf66d1..ba3199d5a 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1,7 +1,7 @@
 #include "global.h"
 #include "menu.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu_cursor.h"
 #include "script.h"
 #include "constants/songs.h"
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 60799bacb..afc17fab3 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -1302,7 +1302,7 @@ static void sub_80B6E68(void)
     u8 spriteId;
 
     rivalGfxId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, namingScreenDataPtr->speciesOrPlayerGender);
-    spriteId = AddPseudoFieldObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0);
+    spriteId = AddPseudoEventObject(rivalGfxId, SpriteCallbackDummy, 0x38, 0x18, 0);
     gSprites[spriteId].oam.priority = 3;
     StartSpriteAnim(&gSprites[spriteId], 4);
 }
diff --git a/src/overworld.c b/src/overworld.c
index 98bb43add..c27ac999f 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -97,7 +97,7 @@ EWRAM_DATA struct WarpData gUnknown_02029808 = {0};
 EWRAM_DATA struct UnkPlayerStruct gUnknown_02029810 = {0};
 EWRAM_DATA static u16 sAmbientCrySpecies = 0;
 EWRAM_DATA static bool8 sIsAmbientCryWaterMon = FALSE;
-EWRAM_DATA struct LinkPlayerMapObject gLinkPlayerMapObjects[4] = {0};
+EWRAM_DATA struct LinkPlayerEventObject gLinkPlayerEventObjects[4] = {0};
 
 static u8 gUnknown_03000580[4];
 static u16 (*gUnknown_03000584)(u32);
@@ -150,22 +150,22 @@ const struct ScanlineEffectParams gUnknown_08216694 =
     0,
 };
 
-static u8 sub_8055C68(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8055C88(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8055C8C(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055C68(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8055C88(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8055C8C(struct LinkPlayerEventObject *, struct EventObject *, u8);
 
-static u8 (*const gUnknown_082166A0[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+static u8 (*const gUnknown_082166A0[])(struct LinkPlayerEventObject *, struct EventObject *, u8) =
 {
     sub_8055C68,
     sub_8055C88,
     sub_8055C8C,
 };
 
-static u8 sub_8055CAC(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8055CB0(struct LinkPlayerMapObject *, struct MapObject *, u8);
-static u8 sub_8055D18(struct LinkPlayerMapObject *, struct MapObject *, u8);
+static u8 sub_8055CAC(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8055CB0(struct LinkPlayerEventObject *, struct EventObject *, u8);
+static u8 sub_8055D18(struct LinkPlayerEventObject *, struct EventObject *, u8);
 
-static u8 (*const gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapObject *, u8) =
+static u8 (*const gUnknown_082166AC[])(struct LinkPlayerEventObject *, struct EventObject *, u8) =
 {
     sub_8055CAC,
     sub_8055CB0,
@@ -180,10 +180,10 @@ static u8 (*const gUnknown_082166AC[])(struct LinkPlayerMapObject *, struct MapO
     sub_8055D18,
 };
 
-static void sub_8055D30(struct LinkPlayerMapObject *, struct MapObject *);
-static void sub_8055D38(struct LinkPlayerMapObject *, struct MapObject *);
+static void sub_8055D30(struct LinkPlayerEventObject *, struct EventObject *);
+static void sub_8055D38(struct LinkPlayerEventObject *, struct EventObject *);
 
-static void (*const gUnknown_082166D8[])(struct LinkPlayerMapObject *, struct MapObject *) =
+static void (*const gUnknown_082166D8[])(struct LinkPlayerEventObject *, struct EventObject *) =
 {
     sub_8055D30,
     sub_8055D38,
@@ -283,51 +283,51 @@ void SetGameStat(u8 index, u32 value)
         gSaveBlock1.gameStats[index] = value;
 }
 
-void LoadMapObjTemplatesFromHeader(void)
+void LoadEventObjTemplatesFromHeader(void)
 {
-    // Clear map object templates
-    CpuFill32(0, gSaveBlock1.mapObjectTemplates, sizeof(gSaveBlock1.mapObjectTemplates));
+    // Clear event object templates
+    CpuFill32(0, gSaveBlock1.eventObjectTemplates, sizeof(gSaveBlock1.eventObjectTemplates));
 
     // Copy map header events to save block
-    CpuCopy32(gMapHeader.events->mapObjects,
-              gSaveBlock1.mapObjectTemplates,
-              gMapHeader.events->mapObjectCount * sizeof(struct MapObjectTemplate));
+    CpuCopy32(gMapHeader.events->eventObjects,
+              gSaveBlock1.eventObjectTemplates,
+              gMapHeader.events->eventObjectCount * sizeof(struct EventObjectTemplate));
 }
 
-static void LoadSaveblockMapObjScripts(void)
+static void LoadSaveblockEventObjScripts(void)
 {
-    struct MapObjectTemplate *mapObjectTemplates = gSaveBlock1.mapObjectTemplates;
+    struct EventObjectTemplate *eventObjectTemplates = gSaveBlock1.eventObjectTemplates;
     s32 i;
 
     for (i = 0; i < 64; i++)
-        mapObjectTemplates[i].script = gMapHeader.events->mapObjects[i].script;
+        eventObjectTemplates[i].script = gMapHeader.events->eventObjects[i].script;
 }
 
-void Overworld_SetMapObjTemplateCoords(u8 localId, s16 x, s16 y)
+void Overworld_SetEventObjTemplateCoords(u8 localId, s16 x, s16 y)
 {
     s32 i;
     for (i = 0; i < 64; i++)
     {
-        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
-        if (mapObjectTemplate->localId == localId)
+        struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i];
+        if (eventObjectTemplate->localId == localId)
         {
-            mapObjectTemplate->x = x;
-            mapObjectTemplate->y = y;
+            eventObjectTemplate->x = x;
+            eventObjectTemplate->y = y;
             return;
         }
     }
 }
 
-void Overworld_SetMapObjTemplateMovementType(u8 localId, u8 movementType)
+void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType)
 {
     s32 i;
 
     for (i = 0; i < 64; i++)
     {
-        struct MapObjectTemplate *mapObjectTemplate = &gSaveBlock1.mapObjectTemplates[i];
-        if (mapObjectTemplate->localId == localId)
+        struct EventObjectTemplate *eventObjectTemplate = &gSaveBlock1.eventObjectTemplates[i];
+        if (eventObjectTemplate->localId == localId)
         {
-            mapObjectTemplate->movementType = movementType;
+            eventObjectTemplate->movementType = movementType;
             return;
         }
     }
@@ -596,7 +596,7 @@ void sub_80538F0(u8 mapGroup, u8 mapNum)
     sub_8053F0C();
     ApplyCurrentWarp();
     set_current_map_header_from_sav1_save_old_name();
-    LoadMapObjTemplatesFromHeader();
+    LoadEventObjTemplatesFromHeader();
     ClearTempFieldEventData();
     ResetCyclingRoadChallengeData();
     prev_quest_postbuffer_cursor_backup_reset();
@@ -629,7 +629,7 @@ void sub_8053994(u32 a1)
     bool8 v3;
 
     set_current_map_header_from_sav1_save_old_name();
-    LoadMapObjTemplatesFromHeader();
+    LoadEventObjTemplatesFromHeader();
     v2 = is_map_type_1_2_3_5_or_6(gMapHeader.mapType);
     v3 = Overworld_MapTypeIsIndoors(gMapHeader.mapType);
     ClearTempFieldEventData();
@@ -663,7 +663,7 @@ void player_avatar_init_params_reset(void)
 
 void walkrun_find_lowest_active_bit_in_bitfield(void)
 {
-    gUnknown_02029810.player_field_1 = player_get_direction_lower_nybble();
+    gUnknown_02029810.player_field_1 = GetPlayerFacingDirection();
 
     if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE))
         gUnknown_02029810.player_field_0 = 2;
@@ -1460,8 +1460,8 @@ void CB2_ContinueSavedGame(void)
 #endif
     ResetSafariZoneFlag_();
     LoadSaveblockMapHeader();
-    LoadSaveblockMapObjScripts();
-    UnfreezeMapObjects();
+    LoadSaveblockEventObjScripts();
+    UnfreezeEventObjects();
     DoTimeBasedEvents();
     sub_805308C();
     sub_8055FC0();
@@ -1825,7 +1825,7 @@ void sub_8054D90(void)
     gUnknown_0300489C = 0;
     gUnknown_03004898 = 0;
     sub_805AA98();
-    sub_805B55C(0, 0);
+    TrySpawnEventObjects(0, 0);
     mapheader_run_first_tag4_script_list_match();
 }
 
@@ -1841,7 +1841,7 @@ void mli4_mapscripts_and_other(void)
     InitPlayerAvatar(x, y, player->player_field_1, gSaveBlock2.playerGender);
     SetPlayerAvatarTransitionFlags(player->player_field_0);
     player_avatar_init_params_reset();
-    sub_805B55C(0, 0);
+    TrySpawnEventObjects(0, 0);
     ResetBerryTreeSparkleFlags();
     mapheader_run_first_tag4_script_list_match();
 }
@@ -1854,7 +1854,7 @@ void sub_8054E20(void)
 
 void sub_8054E34(void)
 {
-    gMapObjects[gPlayerAvatar.mapObjectId].trackedByCamera = 1;
+    gEventObjects[gPlayerAvatar.eventObjectId].trackedByCamera = 1;
     InitCameraUpdateCallback(gPlayerAvatar.spriteId);
 }
 
@@ -1885,7 +1885,7 @@ void sub_8054EC8(void)
 
     for (i = 0; i < gFieldLinkPlayerCount; i++)
     {
-        SpawnLinkPlayerMapObject(i, i + x, y, gLinkPlayers[i].gender);
+        SpawnLinkPlayerEventObject(i, i + x, y, gLinkPlayers[i].gender);
         CreateLinkPlayerSprite(i);
     }
 
@@ -2273,7 +2273,7 @@ void sub_80555B0(int linkPlayerId, int a2, struct UnkStruct_8054FF8 *a3)
 
     a3->a = linkPlayerId;
     a3->b = (linkPlayerId == a2) ? 1 : 0;
-    a3->c = gLinkPlayerMapObjects[linkPlayerId].mode;
+    a3->c = gLinkPlayerEventObjects[linkPlayerId].mode;
     a3->d = sub_8055B30(linkPlayerId);
     sub_8055B08(linkPlayerId, &x, &y);
     a3->sub.x = x;
@@ -2475,109 +2475,109 @@ bool32 sub_8055940(void)
     return TRUE;
 }
 
-void ZeroLinkPlayerMapObject(struct LinkPlayerMapObject *linkPlayerMapObj)
+void ClearLinkPlayerEventObject(struct LinkPlayerEventObject *linkPlayerEventObj)
 {
-    memset(linkPlayerMapObj, 0, sizeof(struct LinkPlayerMapObject));
+    memset(linkPlayerEventObj, 0, sizeof(struct LinkPlayerEventObject));
 }
 
-void strange_npc_table_clear(void)
+void ClearLinkPlayerEventObjects(void)
 {
-    memset(gLinkPlayerMapObjects, 0, sizeof(gLinkPlayerMapObjects));
+    memset(gLinkPlayerEventObjects, 0, sizeof(gLinkPlayerEventObjects));
 }
 
-void ZeroMapObject(struct MapObject *mapObj)
+static void ClearEventObject(struct EventObject *eventObj)
 {
-    memset(mapObj, 0, sizeof(struct MapObject));
+    memset(eventObj, 0, sizeof(struct EventObject));
 }
 
-void SpawnLinkPlayerMapObject(u8 linkPlayerId, s16 x, s16 y, u8 a4)
+void SpawnLinkPlayerEventObject(u8 linkPlayerId, s16 x, s16 y, u8 a4)
 {
-    u8 mapObjId = sub_805AB54();
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    u8 eventObjId = GetFirstInactiveEventObjectId();
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
 
-    ZeroLinkPlayerMapObject(linkPlayerMapObj);
-    ZeroMapObject(mapObj);
+    ClearLinkPlayerEventObject(linkPlayerEventObj);
+    ClearEventObject(eventObj);
 
-    linkPlayerMapObj->active = 1;
-    linkPlayerMapObj->linkPlayerId = linkPlayerId;
-    linkPlayerMapObj->mapObjId = mapObjId;
-    linkPlayerMapObj->mode = 0;
+    linkPlayerEventObj->active = 1;
+    linkPlayerEventObj->linkPlayerId = linkPlayerId;
+    linkPlayerEventObj->eventObjId = eventObjId;
+    linkPlayerEventObj->mode = 0;
 
-    mapObj->active = 1;
-    mapObj->regularAnimActive = a4;
-    mapObj->range.as_byte = 2;
-    mapObj->spriteId = 64;
+    eventObj->active = 1;
+    eventObj->singleMovementActive = a4;
+    eventObj->range.as_byte = 2;
+    eventObj->spriteId = 64;
 
-    InitLinkPlayerMapObjectPos(mapObj, x, y);
+    InitLinkPlayerEventObjectPos(eventObj, x, y);
 }
 
-void InitLinkPlayerMapObjectPos(struct MapObject *mapObj, s16 x, s16 y)
+void InitLinkPlayerEventObjectPos(struct EventObject *eventObj, s16 x, s16 y)
 {
-    mapObj->currentCoords.x = x;
-    mapObj->currentCoords.y = y;
-    mapObj->previousCoords.x = x;
-    mapObj->previousCoords.y = y;
-    sub_80603CC(x, y, &mapObj->initialCoords.x, &mapObj->initialCoords.y);
-    mapObj->initialCoords.x += 8;
-    FieldObjectUpdateZCoord(mapObj);
+    eventObj->currentCoords.x = x;
+    eventObj->currentCoords.y = y;
+    eventObj->previousCoords.x = x;
+    eventObj->previousCoords.y = y;
+    sub_80603CC(x, y, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
+    eventObj->initialCoords.x += 8;
+    EventObjectUpdateZCoord(eventObj);
 }
 
 void unref_sub_8055A6C(u8 linkPlayerId, u8 a2)
 {
-    if (gLinkPlayerMapObjects[linkPlayerId].active)
+    if (gLinkPlayerEventObjects[linkPlayerId].active)
     {
-        u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-        struct MapObject *mapObj = &gMapObjects[mapObjId];
-        mapObj->range.as_byte = a2;
+        u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+        struct EventObject *eventObj = &gEventObjects[eventObjId];
+        eventObj->range.as_byte = a2;
     }
 }
 
 void unref_sub_8055A9C(u8 linkPlayerId)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    if (mapObj->spriteId != 64 )
-        DestroySprite(&gSprites[mapObj->spriteId]);
-    linkPlayerMapObj->active = 0;
-    mapObj->active = 0;
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    if (eventObj->spriteId != 64 )
+        DestroySprite(&gSprites[eventObj->spriteId]);
+    linkPlayerEventObj->active = 0;
+    eventObj->active = 0;
 }
 
 u8 sub_8055AE8(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->spriteId;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->spriteId;
 }
 
 void sub_8055B08(u8 linkPlayerId, u16 *x, u16 *y)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    *x = mapObj->currentCoords.x;
-    *y = mapObj->currentCoords.y;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    *x = eventObj->currentCoords.x;
+    *y = eventObj->currentCoords.y;
 }
 
 u8 sub_8055B30(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->range.as_byte;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->range.as_byte;
 }
 
 u8 sub_8055B50(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return mapObj->currentElevation;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return eventObj->currentElevation;
 }
 
 s32 unref_sub_8055B74(u8 linkPlayerId)
 {
-    u8 mapObjId = gLinkPlayerMapObjects[linkPlayerId].mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
-    return 16 - (s8)mapObj->directionSequenceIndex;
+    u8 eventObjId = gLinkPlayerEventObjects[linkPlayerId].eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
+    return 16 - (s8)eventObj->directionSequenceIndex;
 }
 
 u8 GetLinkPlayerIdAt(s16 x, s16 y)
@@ -2585,11 +2585,11 @@ u8 GetLinkPlayerIdAt(s16 x, s16 y)
     u8 i;
     for (i = 0; i < 4; i++)
     {
-        if (gLinkPlayerMapObjects[i].active
-         && (gLinkPlayerMapObjects[i].mode == 0 || gLinkPlayerMapObjects[i].mode == 2))
+        if (gLinkPlayerEventObjects[i].active
+         && (gLinkPlayerEventObjects[i].mode == 0 || gLinkPlayerEventObjects[i].mode == 2))
         {
-            struct MapObject *mapObj = &gMapObjects[gLinkPlayerMapObjects[i].mapObjId];
-            if (mapObj->currentCoords.x == x && mapObj->currentCoords.y == y)
+            struct EventObject *eventObj = &gEventObjects[gLinkPlayerEventObjects[i].eventObjId];
+            if (eventObj->currentCoords.x == x && eventObj->currentCoords.y == y)
                 return i;
         }
     }
@@ -2598,79 +2598,79 @@ u8 GetLinkPlayerIdAt(s16 x, s16 y)
 
 void sub_8055BFC(u8 linkPlayerId, u8 a2)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
 
-    if (linkPlayerMapObj->active)
+    if (linkPlayerEventObj->active)
     {
         if (a2 > 10)
-            mapObj->triggerGroundEffectsOnMove = 1;
+            eventObj->triggerGroundEffectsOnMove = 1;
         else
-            gUnknown_082166D8[gUnknown_082166A0[linkPlayerMapObj->mode](linkPlayerMapObj, mapObj, a2)](linkPlayerMapObj, mapObj);
+            gUnknown_082166D8[gUnknown_082166A0[linkPlayerEventObj->mode](linkPlayerEventObj, eventObj, a2)](linkPlayerEventObj, eventObj);
     }
 }
 
-static u8 sub_8055C68(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C68(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
+    return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3);
 }
 
-static u8 sub_8055C88(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C88(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     return 1;
 }
 
-static u8 sub_8055C8C(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055C8C(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    return gUnknown_082166AC[a3](linkPlayerMapObj, mapObj, a3);
+    return gUnknown_082166AC[a3](linkPlayerEventObj, eventObj, a3);
 }
 
-static u8 sub_8055CAC(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CAC(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     return 0;
 }
 
-static u8 sub_8055CB0(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055CB0(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
     s16 x, y;
 
-    mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte);
-    FieldObjectMoveDestCoords(mapObj, mapObj->range.as_byte, &x, &y);
+    eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte);
+    EventObjectMoveDestCoords(eventObj, eventObj->range.as_byte, &x, &y);
 
-    if (LinkPlayerDetectCollision(linkPlayerMapObj->mapObjId, mapObj->range.as_byte, x, y))
+    if (LinkPlayerDetectCollision(linkPlayerEventObj->eventObjId, eventObj->range.as_byte, x, y))
     {
         return 0;
     }
     else
     {
-        mapObj->directionSequenceIndex = 16;
-        npc_coords_shift(mapObj, x, y);
-        FieldObjectUpdateZCoord(mapObj);
+        eventObj->directionSequenceIndex = 16;
+        ShiftEventObjectCoords(eventObj, x, y);
+        EventObjectUpdateZCoord(eventObj);
         return 1;
     }
 }
 
-static u8 sub_8055D18(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj, u8 a3)
+static u8 sub_8055D18(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj, u8 a3)
 {
-    mapObj->range.as_byte = npc_something3(a3, mapObj->range.as_byte);
+    eventObj->range.as_byte = npc_something3(a3, eventObj->range.as_byte);
     return 0;
 }
 
-static void sub_8055D30(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D30(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj)
 {
-    linkPlayerMapObj->mode = 0;
+    linkPlayerEventObj->mode = 0;
 }
 
-static void sub_8055D38(struct LinkPlayerMapObject *linkPlayerMapObj, struct MapObject *mapObj)
+static void sub_8055D38(struct LinkPlayerEventObject *linkPlayerEventObj, struct EventObject *eventObj)
 {
-    mapObj->directionSequenceIndex--;
-    linkPlayerMapObj->mode = 1;
-    MoveCoords(mapObj->range.as_byte, &mapObj->initialCoords.x, &mapObj->initialCoords.y);
-    if (!mapObj->directionSequenceIndex)
+    eventObj->directionSequenceIndex--;
+    linkPlayerEventObj->mode = 1;
+    MoveCoords(eventObj->range.as_byte, &eventObj->initialCoords.x, &eventObj->initialCoords.y);
+    if (!eventObj->directionSequenceIndex)
     {
-        npc_coords_shift_still(mapObj);
-        linkPlayerMapObj->mode = 2;
+        ShiftStillEventObjectCoords(eventObj);
+        linkPlayerEventObj->mode = 2;
     }
 }
 
@@ -2694,15 +2694,15 @@ u8 npc_something3(u8 a1, u8 a2)
     return a2;
 }
 
-u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y)
+u8 LinkPlayerDetectCollision(u8 selfEventObjId, u8 a2, s16 x, s16 y)
 {
     u8 i;
     for (i = 0; i < 16; i++)
     {
-        if (i != selfMapObjId)
+        if (i != selfEventObjId)
         {
-            if ((gMapObjects[i].currentCoords.x == x && gMapObjects[i].currentCoords.y == y)
-             || (gMapObjects[i].previousCoords.x == x && gMapObjects[i].previousCoords.y == y))
+            if ((gEventObjects[i].currentCoords.x == x && gEventObjects[i].currentCoords.y == y)
+             || (gEventObjects[i].previousCoords.x == x && gEventObjects[i].previousCoords.y == y))
             {
                 return 1;
             }
@@ -2713,36 +2713,36 @@ u8 LinkPlayerDetectCollision(u8 selfMapObjId, u8 a2, s16 x, s16 y)
 
 void CreateLinkPlayerSprite(u8 linkPlayerId)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[linkPlayerId];
-    u8 mapObjId = linkPlayerMapObj->mapObjId;
-    struct MapObject *mapObj = &gMapObjects[mapObjId];
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[linkPlayerId];
+    u8 eventObjId = linkPlayerEventObj->eventObjId;
+    struct EventObject *eventObj = &gEventObjects[eventObjId];
     struct Sprite *sprite;
 
-    if (linkPlayerMapObj->active)
+    if (linkPlayerEventObj->active)
     {
-        u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, mapObj->regularAnimActive);
-        mapObj->spriteId = AddPseudoFieldObject(val, SpriteCB_LinkPlayer, 0, 0, 0);
-        sprite = &gSprites[mapObj->spriteId];
+        u8 val = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, eventObj->singleMovementActive);
+        eventObj->spriteId = AddPseudoEventObject(val, SpriteCB_LinkPlayer, 0, 0, 0);
+        sprite = &gSprites[eventObj->spriteId];
         sprite->coordOffsetEnabled = TRUE;
         sprite->data[0] = linkPlayerId;
-        mapObj->triggerGroundEffectsOnMove = 0;
+        eventObj->triggerGroundEffectsOnMove = 0;
     }
 }
 
 void SpriteCB_LinkPlayer(struct Sprite *sprite)
 {
-    struct LinkPlayerMapObject *linkPlayerMapObj = &gLinkPlayerMapObjects[sprite->data[0]];
-    struct MapObject *mapObj = &gMapObjects[linkPlayerMapObj->mapObjId];
-    sprite->pos1.x = mapObj->initialCoords.x;
-    sprite->pos1.y = mapObj->initialCoords.y;
-    SetObjectSubpriorityByZCoord(mapObj->previousElevation, sprite, 1);
-    sprite->oam.priority = ZCoordToPriority(mapObj->previousElevation);
-    if (!linkPlayerMapObj->mode)
-        StartSpriteAnim(sprite, FieldObjectDirectionToImageAnimId(mapObj->range.as_byte));
+    struct LinkPlayerEventObject *linkPlayerEventObj = &gLinkPlayerEventObjects[sprite->data[0]];
+    struct EventObject *eventObj = &gEventObjects[linkPlayerEventObj->eventObjId];
+    sprite->pos1.x = eventObj->initialCoords.x;
+    sprite->pos1.y = eventObj->initialCoords.y;
+    SetObjectSubpriorityByZCoord(eventObj->previousElevation, sprite, 1);
+    sprite->oam.priority = ZCoordToPriority(eventObj->previousElevation);
+    if (!linkPlayerEventObj->mode)
+        StartSpriteAnim(sprite, GetFaceDirectionAnimNum(eventObj->range.as_byte));
     else
-        StartSpriteAnimIfDifferent(sprite, get_go_image_anim_num(mapObj->range.as_byte));
-    sub_806487C(sprite, 0);
-    if (mapObj->triggerGroundEffectsOnMove)
+        StartSpriteAnimIfDifferent(sprite, GetMoveDirectionAnimNum(eventObj->range.as_byte));
+    UpdateEventObjectSpriteVisibility(sprite, 0);
+    if (eventObj->triggerGroundEffectsOnMove)
     {
         sprite->invisible = ((sprite->data[7] & 4) >> 2);
         sprite->data[7]++;
diff --git a/src/rom6.c b/src/rom6.c
index 24c2de6d2..7fcd9808a 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/songs.h"
 #include "rom6.h"
 #include "braille_puzzles.h"
@@ -34,18 +34,18 @@ static void sub_810B634(void);
 
 bool8 SetLastTalkedObjectInFrontOfPlayer(u8 graphicsId)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
     GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
     gPlayerFacingPosition.height = PlayerGetZCoord();
-    mapObjId = GetFieldObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
-    if (gMapObjects[mapObjId].graphicsId != graphicsId)
+    eventObjId = GetEventObjectIdByXYZ(gPlayerFacingPosition.x, gPlayerFacingPosition.y, gPlayerFacingPosition.height);
+    if (gEventObjects[eventObjId].graphicsId != graphicsId)
     {
         return FALSE;
     }
     else
     {
-        gSpecialVar_LastTalked = gMapObjects[mapObjId].localId;
+        gSpecialVar_LastTalked = gEventObjects[eventObjId].localId;
         return TRUE;
     }
 }
@@ -58,13 +58,13 @@ u8 oei_task_add(void)
 
 static void task08_080C9820(u8 taskId)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
     ScriptContext2_Enable();
     gPlayerAvatar.preventStep = TRUE;
-    mapObjId = gPlayerAvatar.mapObjectId;
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(&gMapObjects[mapObjId])
-     || FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
+    eventObjId = gPlayerAvatar.eventObjectId;
+    if (!EventObjectIsMovementOverridden(&gEventObjects[eventObjId])
+     || EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]))
     {
         if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
@@ -74,7 +74,7 @@ static void task08_080C9820(u8 taskId)
         else
         {
             sub_8059BF4();
-            FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], 0x39);
+            EventObjectSetHeldMovement(&gEventObjects[eventObjId], 0x39);
             gTasks[taskId].func = sub_810B3DC;
         }
     }
@@ -82,7 +82,7 @@ static void task08_080C9820(u8 taskId)
 
 static void sub_810B3DC(u8 taskId)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(&gMapObjects[gPlayerAvatar.mapObjectId]) == TRUE)
+    if (EventObjectCheckHeldMovementStatus(&gEventObjects[gPlayerAvatar.eventObjectId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
         gTasks[taskId].func = sub_810B428;
@@ -91,9 +91,9 @@ static void sub_810B3DC(u8 taskId)
 
 static void sub_810B428(u8 taskId)
 {
-    if (!FieldEffectActiveListContains(6))
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
-        gFieldEffectArguments[1] = player_get_direction_lower_nybble();
+        gFieldEffectArguments[1] = GetPlayerFacingDirection();
         if (gFieldEffectArguments[1] == 1)
             gFieldEffectArguments[2] = 0;
         if (gFieldEffectArguments[1] == 2)
@@ -102,7 +102,7 @@ static void sub_810B428(u8 taskId)
             gFieldEffectArguments[2] = 2;
         if (gFieldEffectArguments[1] == 4)
             gFieldEffectArguments[2] = 3;
-        sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
+        sub_805B980(&gEventObjects[gPlayerAvatar.eventObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
         FieldEffectActiveListRemove(6);
         gTasks[taskId].func = sub_810B4CC;
@@ -121,7 +121,7 @@ static void sub_810B4CC(u8 taskId)
 #if DEBUG
 void debug_sub_8120968(void)
 {
-    if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
+    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         sub_810B53C();
@@ -135,7 +135,7 @@ void debug_sub_8120968(void)
 
 bool8 SetUpFieldMove_RockSmash(void)
 {
-    if (SetLastTalkedObjectInFrontOfPlayer(MAP_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
+    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
     {
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
         gPostMenuFieldCallback = sub_810B53C;
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 29c1f982e..3ad433fb7 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -22,7 +22,7 @@
 #include "fieldmap.h"
 #include "item.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu.h"
 #include "money.h"
 #include "mystery_event_script.h"
@@ -1012,7 +1012,7 @@ bool8 ScrCmd_removeobject(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
-    RemoveFieldObjectByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+    RemoveEventObjectByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     return FALSE;
 }
 
@@ -1022,7 +1022,7 @@ bool8 ScrCmd_removeobject_at(struct ScriptContext *ctx)
     u8 mapGroup = ScriptReadByte(ctx);
     u8 mapNum = ScriptReadByte(ctx);
 
-    RemoveFieldObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
+    RemoveEventObjectByLocalIdAndMap(objectId, mapNum, mapGroup);
     return FALSE;
 }
 
@@ -1060,7 +1060,7 @@ bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx)
     u16 x = VarGet(ScriptReadHalfword(ctx));
     u16 y = VarGet(ScriptReadHalfword(ctx));
 
-    Overworld_SetMapObjTemplateCoords(localId, x, y);
+    Overworld_SetEventObjTemplateCoords(localId, x, y);
     return FALSE;
 }
 
@@ -1068,7 +1068,7 @@ bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
-    sub_805C78C(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+    TryOverrideTemplateCoordsForEventObject(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     return FALSE;
 }
 
@@ -1115,10 +1115,10 @@ bool8 ScrCmd_resetobjectpriority(struct ScriptContext *ctx)
 
 bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
 {
-    if (gMapObjects[gSelectedMapObject].active)
+    if (gEventObjects[gSelectedEventObject].active)
     {
-        FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject],
-          player_get_direction_lower_nybble());
+        EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject],
+          GetPlayerFacingDirection());
     }
     return FALSE;
 }
@@ -1128,7 +1128,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx)
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 direction = ScriptReadByte(ctx);
 
-    FieldObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction);
+    EventObjectTurnByLocalIdAndMap(localId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, direction);
     return FALSE;
 }
 
@@ -1137,7 +1137,7 @@ bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx)
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 movementType = ScriptReadByte(ctx);
 
-    Overworld_SetMapObjTemplateMovementType(localId, movementType);
+    Overworld_SetEventObjTemplateMovementType(localId, movementType);
     return FALSE;
 }
 
@@ -1156,10 +1156,10 @@ bool8 ScrCmd_createvobject(struct ScriptContext *ctx)
 
 bool8 ScrCmd_turnvobject(struct ScriptContext *ctx)
 {
-    u8 v1 = ScriptReadByte(ctx);
+    u8 eventObjectId = ScriptReadByte(ctx);
     u8 direction = ScriptReadByte(ctx);
 
-    sub_8064990(v1, direction);
+    TurnEventObject(eventObjectId, direction);
     return FALSE;
 }
 
@@ -1171,7 +1171,7 @@ bool8 ScrCmd_lockall(struct ScriptContext *ctx)
     }
     else
     {
-        ScriptFreezeMapObjects();
+        ScriptFreezeEventObjects();
         SetupNativeScript(ctx, sub_8064CFC);
         return TRUE;
     }
@@ -1185,14 +1185,14 @@ bool8 ScrCmd_lock(struct ScriptContext *ctx)
     }
     else
     {
-        if (gMapObjects[gSelectedMapObject].active)
+        if (gEventObjects[gSelectedEventObject].active)
         {
-            LockSelectedMapObject();
+            LockSelectedEventObject();
             SetupNativeScript(ctx, sub_8064DB4);
         }
         else
         {
-            ScriptFreezeMapObjects();
+            ScriptFreezeEventObjects();
             SetupNativeScript(ctx, sub_8064CFC);
         }
         return TRUE;
@@ -1204,10 +1204,10 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
     u8 objectId;
 
     HideFieldMessageBox();
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80A2178();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
@@ -1216,12 +1216,12 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
     u8 objectId;
 
     HideFieldMessageBox();
-    if (gMapObjects[gSelectedMapObject].active)
-        FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gSelectedMapObject]);
-    objectId = GetFieldObjectIdByLocalIdAndMap(0xFF, 0, 0);
-    FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[objectId]);
+    if (gEventObjects[gSelectedEventObject].active)
+        EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
+    objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
+    EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
     sub_80A2178();
-    UnfreezeMapObjects();
+    UnfreezeEventObjects();
     return FALSE;
 }
 
diff --git a/src/script_movement.c b/src/script_movement.c
index 653dffcbf..fec3da88e 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -18,25 +18,25 @@ static void sub_80A2490(u8, u8, u8, const u8 *);
 
 bool8 ScriptMovement_StartObjectMovementScript(u8 localId, u8 mapNum, u8 mapGroup, const u8 *movementScript)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &mapObjId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapGroup, &eventObjId))
         return TRUE;
     if (!FuncIsActiveTask(Task_80A244C))
         sub_80A2198(50);
-    return sub_80A21F4(sub_80A21E0(), mapObjId, movementScript);
+    return sub_80A21F4(sub_80A21E0(), eventObjId, movementScript);
 }
 
 bool8 ScriptMovement_IsObjectMovementFinished(u8 localId, u8 mapNum, u8 mapBank)
 {
-    u8 mapObjId;
+    u8 eventObjId;
     u8 r4;
     u8 r1;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &mapObjId))
+    if (TryGetEventObjectIdByLocalIdAndMap(localId, mapNum, mapBank, &eventObjId))
         return TRUE;
     r4 = sub_80A21E0();
-    r1 = sub_80A2260(r4, mapObjId);
+    r1 = sub_80A2260(r4, eventObjId);
     if (r1 == 16)
         return TRUE;
     return sub_80A2370(r4, r1);
@@ -69,11 +69,11 @@ static u8 sub_80A21E0(void)
     return FindTaskIdByFunc(Task_80A244C);
 }
 
-static bool8 sub_80A21F4(u8 taskId, u8 mapObjId, const u8 *movementScript)
+static bool8 sub_80A21F4(u8 taskId, u8 eventObjId, const u8 *movementScript)
 {
     u8 r4;
 
-    r4 = sub_80A2260(taskId, mapObjId);
+    r4 = sub_80A2260(taskId, eventObjId);
     if (r4 != 16)
     {
         if (sub_80A2370(taskId, r4) == 0)
@@ -82,7 +82,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 mapObjId, const u8 *movementScript)
         }
         else
         {
-            sub_80A23C8(taskId, r4, mapObjId, movementScript);
+            sub_80A23C8(taskId, r4, eventObjId, movementScript);
             return FALSE;
         }
     }
@@ -93,7 +93,7 @@ static bool8 sub_80A21F4(u8 taskId, u8 mapObjId, const u8 *movementScript)
     }
     else
     {
-        sub_80A23C8(taskId, r4, mapObjId, movementScript);
+        sub_80A23C8(taskId, r4, eventObjId, movementScript);
         return FALSE;
     }
 }
@@ -169,23 +169,23 @@ static const u8 *sub_80A23B8(u8 a)
     return gUnknown_020384F8[a];
 }
 
-static void sub_80A23C8(u8 taskId, u8 b, u8 mapObjId, const u8 *movementScript)
+static void sub_80A23C8(u8 taskId, u8 b, u8 eventObjId, const u8 *movementScript)
 {
     sub_80A2318(taskId, b);
     npc_obj_offscreen_culling_and_flag_update(b, movementScript);
-    sub_80A22D0(taskId, b, mapObjId);
+    sub_80A22D0(taskId, b, eventObjId);
 }
 
 static void UnfreezeObjects(u8 taskId)
 {
-    u8 *pMapObjId;
+    u8 *pEventObjId;
     u8 i;
 
-    pMapObjId = (u8 *)&gTasks[taskId].data[1];
-    for (i = 0; i < 16; i++, pMapObjId++)
+    pEventObjId = (u8 *)&gTasks[taskId].data[1];
+    for (i = 0; i < 16; i++, pEventObjId++)
     {
-        if (*pMapObjId != 0xFF)
-            UnfreezeMapObject(&gMapObjects[*pMapObjId]);
+        if (*pEventObjId != 0xFF)
+            UnfreezeEventObject(&gEventObjects[*pEventObjId]);
     }
 }
 
@@ -202,23 +202,23 @@ static void Task_80A244C(u8 taskId)
     }
 }
 
-static void sub_80A2490(u8 taskId, u8 b, u8 mapObjId, const u8 *d)
+static void sub_80A2490(u8 taskId, u8 b, u8 eventObjId, const u8 *d)
 {
     u8 var;
 
-    if (FieldObjectIsSpecialAnimActive(&gMapObjects[mapObjId])
-     && !FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[mapObjId]))
+    if (EventObjectIsHeldMovementActive(&gEventObjects[eventObjId])
+     && !EventObjectClearHeldMovementIfFinished(&gEventObjects[eventObjId]))
         return;
 
     var = *d;
     if (var == 0xFE)
     {
         sub_80A2348(taskId, b);
-        FreezeMapObject(&gMapObjects[mapObjId]);
+        FreezeEventObject(&gEventObjects[eventObjId]);
     }
     else
     {
-        if (!FieldObjectSetSpecialAnim(&gMapObjects[mapObjId], var))
+        if (!EventObjectSetHeldMovement(&gEventObjects[eventObjId], var))
         {
             d++;
             npc_obj_offscreen_culling_and_flag_update(b, d);
diff --git a/src/secret_base.c b/src/secret_base.c
index cf66db03b..deee1ade0 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -387,7 +387,7 @@ bool8 sub_80BBB24(void)
 
 void sub_80BBB50(u8 taskid)
 {
-    FieldObjectTurn(&(gMapObjects[gPlayerAvatar.mapObjectId]), 2);
+    EventObjectTurn(&(gEventObjects[gPlayerAvatar.eventObjectId]), 2);
     if (IsWeatherNotFadingIn() == 1)
     {
         EnableBothScriptContexts();
@@ -500,25 +500,25 @@ void sub_80BBDD0(void)
             permission = gDecorations[roomdecor[decidx]].permission;
             if (permission == DECORPERM_SOLID_MAT)
             {
-                for (objid = 0; objid < gMapHeader.events->mapObjectCount; objid++)
+                for (objid = 0; objid < gMapHeader.events->eventObjectCount; objid++)
                 {
-                    if (gMapHeader.events->mapObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE)
+                    if (gMapHeader.events->eventObjects[objid].flagId == gSpecialVar_0x8004 + 0xAE)
                         break;
                 }
-                if (objid != gMapHeader.events->mapObjectCount)
+                if (objid != gMapHeader.events->eventObjectCount)
                 {
                     gSpecialVar_0x8006 = roomdecorpos[decidx] >> 4;
                     gSpecialVar_0x8007 = roomdecorpos[decidx] & 0xF;
                     metatile = MapGridGetMetatileBehaviorAt(gSpecialVar_0x8006 + 7, gSpecialVar_0x8007 + 7);
                     if (sub_80572D8(metatile) == TRUE || sub_80572EC(metatile) == TRUE)
                     {
-                        gSpecialVar_Result = gMapHeader.events->mapObjects[objid].graphicsId + VAR_0x3F20;
+                        gSpecialVar_Result = gMapHeader.events->eventObjects[objid].graphicsId + VAR_0x3F20;
                         VarSet(gSpecialVar_Result, gDecorations[roomdecor[decidx]].tiles[0]);
-                        gSpecialVar_Result = gMapHeader.events->mapObjects[objid].localId;
+                        gSpecialVar_Result = gMapHeader.events->eventObjects[objid].localId;
                         FlagClear(gSpecialVar_0x8004 + 0xAE);
                         show_sprite(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
                         sub_805C0F8(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup, gSpecialVar_0x8006, gSpecialVar_0x8007);
-                        sub_805C78C(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+                        TryOverrideTemplateCoordsForEventObject(gSpecialVar_Result, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
                         gSpecialVar_0x8004 ++;
                     }
                 }
diff --git a/src/shop.c b/src/shop.c
index 62c8c9a87..88719e25e 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -447,25 +447,25 @@ static void Shop_LoadViewportObjects(void)
     GetXYCoordsOneStepInFrontOfPlayer(&facingX, &facingY);
     playerHeight = PlayerGetZCoord();
     for (y = 0; y < 16; y++)
-        gMartViewportObjects[y][MAP_OBJ_ID] = 16;
+        gMartViewportObjects[y][EVENT_OBJ_ID] = 16;
     for (y = 0; y < 5; y++)
     {
         for (x = 0; x < 7; x++)
         {
-            u8 mapObjId = GetFieldObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight);
+            u8 eventObjId = GetEventObjectIdByXYZ(facingX - 3 + x, facingY - 2 + y, playerHeight);
 
-            if (mapObjId != 16)
+            if (eventObjId != 16)
             {
-                gMartViewportObjects[r8][MAP_OBJ_ID] = mapObjId;
+                gMartViewportObjects[r8][EVENT_OBJ_ID] = eventObjId;
                 gMartViewportObjects[r8][X_COORD] = x;
                 gMartViewportObjects[r8][Y_COORD] = y;
-                if (gMapObjects[mapObjId].facingDirection == DIR_SOUTH)
+                if (gEventObjects[eventObjId].facingDirection == DIR_SOUTH)
                     gMartViewportObjects[r8][ANIM_NUM] = 0;
-                if (gMapObjects[mapObjId].facingDirection == DIR_NORTH)
+                if (gEventObjects[eventObjId].facingDirection == DIR_NORTH)
                     gMartViewportObjects[r8][ANIM_NUM] = 1;
-                if (gMapObjects[mapObjId].facingDirection == DIR_WEST)
+                if (gEventObjects[eventObjId].facingDirection == DIR_WEST)
                     gMartViewportObjects[r8][ANIM_NUM] = 2;
-                if (gMapObjects[mapObjId].facingDirection == DIR_EAST)
+                if (gEventObjects[eventObjId].facingDirection == DIR_EAST)
                     gMartViewportObjects[r8][ANIM_NUM] = 3;
                 r8++;
             }
@@ -479,11 +479,11 @@ static void Shop_AnimViewportObjects(void)
 
     for (i = 0; i < 16; i++) // max objects?
     {
-        if (gMartViewportObjects[i][MAP_OBJ_ID] == 16)
+        if (gMartViewportObjects[i][EVENT_OBJ_ID] == 16)
             continue;
 
-        StartSpriteAnim(&gSprites[AddPseudoFieldObject(
-            gMapObjects[gMartViewportObjects[i][MAP_OBJ_ID]].graphicsId,
+        StartSpriteAnim(&gSprites[AddPseudoEventObject(
+            gEventObjects[gMartViewportObjects[i][EVENT_OBJ_ID]].graphicsId,
             SpriteCallbackDummy,
             (u16)gMartViewportObjects[i][X_COORD] * 16 + 8,
             (u16)gMartViewportObjects[i][Y_COORD] * 16 + 32,
diff --git a/src/start_menu.c b/src/start_menu.c
index 4a9a0f0dd..2a07313a4 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -9,7 +9,7 @@
 #include "load_save.h"
 #include "m4a.h"
 #include "main.h"
-#include "map_obj_lock.h"
+#include "event_obj_lock.h"
 #include "menu.h"
 #include "new_game.h"
 #include "option_menu.h"
@@ -405,7 +405,7 @@ void sub_8071310(void)
 {
     if (!is_c1_link_related_active())
     {
-        FreezeMapObjects();
+        FreezeEventObjects();
         sub_80594C0();
         sub_80597F4();
     }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 7c7eb23e2..52be7b521 100644
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -49,7 +49,7 @@ struct Struct2000000
     /*0x9C*/ u8 language; // 0x9C
 };
 
-extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
+extern struct LinkPlayerEventObject gLinkPlayerEventObjects[];
 
 EWRAM_DATA struct TrainerCard gTrainerCards[4] = {0};
 
@@ -225,7 +225,7 @@ void TrainerCard_ShowLinkCard(u8 playerIndex, Callback arg2)
 #endif
     TrainerCard_InitScreenForLinkPlayer(playerIndex, arg2);
     SetMainCallback2(sub_8093174);
-    ewram0_2.language = gLinkPlayers[gLinkPlayerMapObjects[playerIndex].linkPlayerId].language;
+    ewram0_2.language = gLinkPlayers[gLinkPlayerEventObjects[playerIndex].linkPlayerId].language;
 }
 
 #if DEBUG
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 2501d2c7f..c03295540 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -13,21 +13,21 @@
 static bool8 CheckTrainer(u8);
 static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3);
 static void objc_exclamation_mark_probably(struct Sprite *sprite);
-static bool8 TrainerCanApproachPlayer(struct MapObject *);
-static void sub_80842C8(struct MapObject *, u8);
-static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction);
+static bool8 TrainerCanApproachPlayer(struct EventObject *);
+static void sub_80842C8(struct EventObject *, u8);
+static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction);
 static void RunTrainerSeeFuncList(u8 taskId);
 
 const u8 gSpriteImage_839B308[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/0.4bpp");
 const u8 gSpriteImage_839B388[] = INCBIN_U8("graphics/unknown_sprites/839B4E0/1.4bpp");
 const u8 gSpriteImage_839B408[] = INCBIN_U8("graphics/unknown_sprites/839B408.4bpp");
 
-static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
-static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
+static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y);
 
-static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16, s16, s16) =
+static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *, s16, s16, s16) =
 {
     GetTrainerApproachDistanceSouth,
     GetTrainerApproachDistanceNorth,
@@ -37,21 +37,21 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct MapObject *, s16,
 
 bool8 CheckTrainers(void)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
-    for (mapObjId = 0; mapObjId < 16; mapObjId++)
+    for (eventObjId = 0; eventObjId < 16; eventObjId++)
     {
-        if (gMapObjects[mapObjId].active
-         && (gMapObjects[mapObjId].trainerType == 1 ||  gMapObjects[mapObjId].trainerType == 3)
-         && CheckTrainer(mapObjId))
+        if (gEventObjects[eventObjId].active
+         && (gEventObjects[eventObjId].trainerType == 1 ||  gEventObjects[eventObjId].trainerType == 3)
+         && CheckTrainer(eventObjId))
             return TRUE;
     }
     return FALSE;
 }
 
-static bool8 CheckTrainer(u8 mapObjId)
+static bool8 CheckTrainer(u8 eventObjId)
 {
-    u8 *scriptPtr = GetFieldObjectScriptPointerByFieldObjectId(mapObjId);
+    u8 *scriptPtr = GetEventObjectScriptPointerByEventObjectId(eventObjId);
 
     if (GetTrainerFlagFromScriptPointer(scriptPtr))
     {
@@ -59,12 +59,12 @@ static bool8 CheckTrainer(u8 mapObjId)
     }
     else
     {
-        struct MapObject *trainerObj = &gMapObjects[mapObjId];
+        struct EventObject *trainerObj = &gEventObjects[eventObjId];
         bool8 canApproach = TrainerCanApproachPlayer(trainerObj);
 
         if (canApproach)
         {
-            TrainerWantsBattle(mapObjId, scriptPtr);
+            TrainerWantsBattle(eventObjId, scriptPtr);
             sub_80842C8(trainerObj, (canApproach - 1));
             return TRUE;
         }
@@ -75,7 +75,7 @@ static bool8 CheckTrainer(u8 mapObjId)
     }
 }
 
-static bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
+static bool8 TrainerCanApproachPlayer(struct EventObject *trainerObj)
 {
     s16 x, y;
     u8 i;
@@ -100,7 +100,7 @@ static bool8 TrainerCanApproachPlayer(struct MapObject *trainerObj)
 }
 
 // Returns how far south the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceSouth(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->currentCoords.x == x
      && y > trainerObj->currentCoords.y
@@ -111,7 +111,7 @@ static u8 GetTrainerApproachDistanceSouth(struct MapObject *trainerObj, s16 rang
 }
 
 // Returns how far north the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceNorth(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->currentCoords.x == x
      && y < trainerObj->currentCoords.y
@@ -122,7 +122,7 @@ static u8 GetTrainerApproachDistanceNorth(struct MapObject *trainerObj, s16 rang
 }
 
 // Returns how far west the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->currentCoords.y == y
      && x < trainerObj->currentCoords.x
@@ -133,7 +133,7 @@ static u8 GetTrainerApproachDistanceWest(struct MapObject *trainerObj, s16 range
 }
 
 // Returns how far east the player is from trainer. 0 if out of trainer's sight.
-static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range, s16 x, s16 y)
+static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y)
 {
     if (trainerObj->currentCoords.y == y
      && x > trainerObj->currentCoords.x
@@ -149,7 +149,7 @@ static u8 GetTrainerApproachDistanceEast(struct MapObject *trainerObj, s16 range
 #define COLLISION_MASK 1
 #endif
 
-static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 approachDistance, u8 direction)
+static bool8 CheckPathBetweenTrainerAndPlayer(struct EventObject *trainerObj, u8 approachDistance, u8 direction)
 {
     s16 x, y;
     u8 unk19_temp;
@@ -165,18 +165,18 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 a
 
     for (i = 0; i <= approachDistance - 1; i++, MoveCoords(direction, &x, &y))
     {
-        collision = sub_8060024(trainerObj, x, y, direction);
+        collision = GetCollisionFlagsAtCoords(trainerObj, x, y, direction);
         if (collision != 0 && (collision & COLLISION_MASK))
             return FALSE;
     }
 
-    // preserve mapobj_unk_19 before clearing.
+    // preserve trainer sight range before clearing.
     unk19_temp = trainerObj->range.as_nybbles.x;
     unk19b_temp = trainerObj->range.as_nybbles.y;
     trainerObj->range.as_nybbles.x = 0;
     trainerObj->range.as_nybbles.y = 0;
 
-    collision = npc_block_way((struct MapObject *)trainerObj, x, y, direction);
+    collision = GetCollisionAtCoords((struct EventObject *)trainerObj, x, y, direction);
 
     trainerObj->range.as_nybbles.x = unk19_temp;
     trainerObj->range.as_nybbles.y = unk19b_temp;
@@ -189,7 +189,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 a
 #define tTrainerObjHi   data[1]
 #define tTrainerObjLo   data[2]
 
-static void sub_80842C8(struct MapObject *trainerObj, u8 b)
+static void sub_80842C8(struct EventObject *trainerObj, u8 b)
 {
     u8 taskId = CreateTask(RunTrainerSeeFuncList, 0x50);
     struct Task *task = &gTasks[taskId];
@@ -209,20 +209,20 @@ static void sub_80842FC(TaskFunc followupFunc)
     taskFunc(taskId);
 }
 
-static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj);
-static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj);
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj);
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj);
 
-static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct MapObject *trainerObj) =
+static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
 {
     sub_8084394,
     sub_8084398,
@@ -241,7 +241,7 @@ static bool8 (*const gTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct
 static void RunTrainerSeeFuncList(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *trainerObj = (struct MapObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo));
+    struct EventObject *trainerObj = (struct EventObject *)((task->tTrainerObjHi << 16) | (task->tTrainerObjLo));
 
     if (!trainerObj->active)
     {
@@ -254,122 +254,122 @@ static void RunTrainerSeeFuncList(u8 taskId)
     }
 }
 
-static bool8 sub_8084394(u8 taskId, struct Task *task, struct MapObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments.
+static bool8 sub_8084394(u8 taskId, struct Task *task, struct EventObject *trainerObj) // cant be void because it is called with RunTrainerSeeFuncList with arguments.
 {
     return FALSE;
 }
 
-static bool8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084398(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     u8 direction;
 
-    FieldObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
-    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON_1);
-    direction = GetFaceDirectionAnimId(trainerObj->facingDirection);
-    FieldObjectSetSpecialAnim(trainerObj, direction);
+    EventObjectGetLocalIdAndMap(trainerObj, &gFieldEffectArguments[0], &gFieldEffectArguments[1], &gFieldEffectArguments[2]);
+    FieldEffectStart(FLDEFF_EXCLAMATION_MARK_ICON);
+    direction = GetFaceDirectionMovementAction(trainerObj->facingDirection);
+    EventObjectSetHeldMovement(trainerObj, direction);
     task->data[0]++;
     return TRUE;
 }
 
-static bool8 sub_80843DC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80843DC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldEffectActiveListContains(0))
+    if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
     {
         return FALSE;
     }
     else
     {
         task->data[0]++;
-        if (trainerObj->animPattern == 57 || trainerObj->animPattern == 58)
+        if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE)
             task->data[0] = 6;
-        if (trainerObj->animPattern == 63)
+        if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN)
             task->data[0] = 8;
         return TRUE;
     }
 }
 
-static bool8 sub_808441C(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_808441C(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!(FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)) || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
         if (task->data[3])
         {
-            FieldObjectSetSpecialAnim(trainerObj, GetGoSpeed0AnimId(trainerObj->facingDirection));
+            EventObjectSetHeldMovement(trainerObj, GetWalkNormalMovementAction(trainerObj->facingDirection));
             task->data[3]--;
         }
         else
         {
-            FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+            EventObjectSetHeldMovement(trainerObj, 0x3E);
             task->data[0]++;
         }
     }
     return FALSE;
 }
 
-static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084478(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    struct MapObject *playerObj;
+    struct EventObject *playerObj;
 
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (EventObjectIsMovementOverridden(trainerObj) && !EventObjectClearHeldMovementIfFinished(trainerObj))
         return FALSE;
 
-    npc_set_running_behaviour_etc(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection));
-    sub_805C774(trainerObj, npc_running_behaviour_by_direction(trainerObj->facingDirection));
-    sub_805C754(trainerObj);
+    SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+    OverrideMovementTypeForEventObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection));
+    OverrideTemplateCoordsForEventObject(trainerObj);
 
-    playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
-    if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj) && !FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+    playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
+    if (EventObjectIsMovementOverridden(playerObj) && !EventObjectClearHeldMovementIfFinished(playerObj))
         return FALSE;
 
     sub_80597E8();
-    FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], GetFaceDirectionAnimId(GetOppositeDirection(trainerObj->facingDirection)));
+    EventObjectSetHeldMovement(&gEventObjects[gPlayerAvatar.eventObjectId], GetFaceDirectionMovementAction(GetOppositeDirection(trainerObj->facingDirection)));
     task->data[0]++;
     return FALSE;
 }
 
-static bool8 sub_8084534(u8 taskId, struct Task *task, struct MapObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
+static bool8 sub_8084534(u8 taskId, struct Task *task, struct EventObject *trainerObj) // technically only 1 parameter, but needs all 3 for TrainerSeeFuncList call.
 {
-    struct MapObject *playerObj = &gMapObjects[gPlayerAvatar.mapObjectId];
+    struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
 
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(playerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(playerObj))
+    if (!EventObjectIsMovementOverridden(playerObj)
+     || EventObjectClearHeldMovementIfFinished(playerObj))
         SwitchTaskToFollowupFunc(taskId);
     return FALSE;
 }
 
-static bool8 sub_8084578(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084578(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!EventObjectIsMovementOverridden(trainerObj)
+     || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x59);
+        EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
         task->data[0]++;
     }
     return FALSE;
 }
 
-static bool8 sub_80845AC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845AC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (EventObjectClearHeldMovementIfFinished(trainerObj))
         task->data[0] = 3;
 
     return FALSE;
 }
 
-static bool8 sub_80845C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845C8(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(trainerObj)
-     || FieldObjectClearAnimIfSpecialAnimFinished(trainerObj))
+    if (!EventObjectIsMovementOverridden(trainerObj)
+     || EventObjectClearHeldMovementIfFinished(trainerObj))
     {
-        FieldObjectSetSpecialAnim(trainerObj, 0x3E);
+        EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACITON_FACE_PLAYER);
         task->data[0]++;
     }
     return FALSE;
 }
 
-static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80845FC(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
+    if (EventObjectCheckHeldMovementStatus(trainerObj))
     {
         gFieldEffectArguments[0] = trainerObj->currentCoords.x;
         gFieldEffectArguments[1] = trainerObj->currentCoords.y;
@@ -381,7 +381,7 @@ static bool8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainer
     return FALSE;
 }
 
-static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_8084654(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
     struct Sprite *sprite;
 
@@ -392,22 +392,22 @@ static bool8 sub_8084654(u8 taskId, struct Task *task, struct MapObject *trainer
 
         sprite = &gSprites[trainerObj->spriteId];
         sprite->oam.priority = 2;
-        FieldObjectClearAnimIfSpecialAnimFinished(trainerObj);
-        FieldObjectSetSpecialAnim(trainerObj, sub_806084C(trainerObj->facingDirection));
+        EventObjectClearHeldMovementIfFinished(trainerObj);
+        EventObjectSetHeldMovement(trainerObj, GetJumpInPlaceMovementAction(trainerObj->facingDirection));
         task->data[0]++;
     }
     return FALSE;
 }
 
-static bool8 sub_80846C8(u8 taskId, struct Task *task, struct MapObject *trainerObj)
+static bool8 sub_80846C8(u8 taskId, struct Task *task, struct EventObject *trainerObj)
 {
-    if (!FieldEffectActiveListContains(49))
+    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
         task->data[0] = 3;
 
     return FALSE;
 }
 
-static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject *) =
+static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct EventObject *) =
 {
     sub_80845C8,
     sub_80845FC,
@@ -418,29 +418,29 @@ static bool8 (*const gTrainerSeeFuncList2[])(u8, struct Task *, struct MapObject
 void sub_80846E4(u8 taskId)
 {
     struct Task *task = &gTasks[taskId];
-    struct MapObject *mapObj;
+    struct EventObject *eventObj;
 
-    // another mapObj loaded into by loadword?
-    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&mapObj);
+    // another eventObj loaded into by loadword?
+    LoadWordFromTwoHalfwords(&task->data[1], (u32 *)&eventObj);
     if (!task->data[7])
     {
-        FieldObjectClearAnim(mapObj);
+        EventObjectClearHeldMovement(eventObj);
         task->data[7]++;
     }
-    gTrainerSeeFuncList2[task->data[0]](taskId, task, mapObj);
-    if (task->data[0] == 3 && !FieldEffectActiveListContains(49))
+    gTrainerSeeFuncList2[task->data[0]](taskId, task, eventObj);
+    if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
     {
-        npc_set_running_behaviour_etc(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection));
-        sub_805C774(mapObj, npc_running_behaviour_by_direction(mapObj->facingDirection));
+        SetTrainerMovementType(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection));
+        OverrideMovementTypeForEventObject(eventObj, GetTrainerFacingDirectionMovementType(eventObj->facingDirection));
         DestroyTask(taskId);
     }
     else
     {
-        mapObj->specialAnimFinished = 0;
+        eventObj->heldMovementFinished = 0;
     }
 }
 
-void sub_8084794(struct MapObject *var)
+void sub_8084794(struct EventObject *var)
 {
     StoreWordInTwoHalfwords(&gTasks[CreateTask(sub_80846E4, 0)].data[1], (u32)var);
 }
@@ -493,7 +493,7 @@ static const struct SpriteTemplate gSpriteTemplate_839B528 = {
     0xffff, 4100, &gOamData_839B4D8, gSpriteAnimTable_839B508, gSpriteImageTable_839B4F0, gDummySpriteAffineAnimTable, objc_exclamation_mark_probably
 };
 
-u8 FldEff_ExclamationMarkIcon1(void)
+u8 FldEff_ExclamationMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_839B510, 0, 0, 0x53);
 
@@ -503,7 +503,7 @@ u8 FldEff_ExclamationMarkIcon1(void)
     return 0;
 }
 
-u8 FldEff_ExclamationMarkIcon2(void)
+u8 FldEff_QuestionMarkIcon(void)
 {
     u8 spriteId = CreateSpriteAtEnd(&gSpriteTemplate_839B510, 0, 0, 0x52);
 
@@ -539,21 +539,21 @@ static void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
 
 static void objc_exclamation_mark_probably(struct Sprite *sprite)
 {
-    u8 mapObjId;
+    u8 eventObjId;
 
-    if (TryGetFieldObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &mapObjId)
+    if (TryGetEventObjectIdByLocalIdAndMap(sprite->data[0], sprite->data[1], sprite->data[2], &eventObjId)
      || sprite->animEnded)
     {
         FieldEffectStop(sprite, (u8)sprite->data[7]);
     }
     else
     {
-        struct Sprite *mapObjSprite = &gSprites[gMapObjects[mapObjId].spriteId];
+        struct Sprite *eventObjSprite = &gSprites[gEventObjects[eventObjId].spriteId];
         sprite->data[4] += sprite->data[3];
-        sprite->pos1.x = mapObjSprite->pos1.x;
-        sprite->pos1.y = mapObjSprite->pos1.y - 16;
-        sprite->pos2.x = mapObjSprite->pos2.x;
-        sprite->pos2.y = mapObjSprite->pos2.y + sprite->data[4];
+        sprite->pos1.x = eventObjSprite->pos1.x;
+        sprite->pos1.y = eventObjSprite->pos1.y - 16;
+        sprite->pos2.x = eventObjSprite->pos2.x;
+        sprite->pos2.y = eventObjSprite->pos2.y + sprite->data[4];
         if (sprite->data[4])
             sprite->data[3]++;
         else
diff --git a/src/tv.c b/src/tv.c
index 87cecbefc..234091d58 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -736,7 +736,7 @@ u8 GabbyAndTyGetLastBattleTrivia(void)
     return 0;
 }
 
-void GabbyAndTySetScriptVarsToFieldObjectLocalIds(void)
+void GabbyAndTySetScriptVarsToEventObjectLocalIds(void)
 {
     switch (GabbyAndTyGetBattleNum())
     {
@@ -2201,7 +2201,7 @@ void GetMomOrDadStringForTVMessage(void)
 void sub_80BFD20(void)
 {
     VarSet(VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0);
-    RemoveFieldObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
+    RemoveEventObjectByLocalIdAndMap(5, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
 }
 
 typedef union ewramStruct_02007000
diff --git a/sym_common.txt b/sym_common.txt
index a743006c4..a282957f4 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -187,7 +187,7 @@ SYMBOL(gUnknown_03004898, 4)
 SYMBOL(gUnknown_0300489C, 4)
 
 // event_object_movement.c
-SYMBOL(gMapObjects, 576)
+SYMBOL(gEventObjects, 576)
 
 #if DEBUG
 gUnknown_Debug_03004BC0 = .;
@@ -195,7 +195,7 @@ gUnknown_Debug_03004BC0 = .;
 #endif
 
 // field_control_avatar.c
-SYMBOL(gSelectedMapObject, 4)
+SYMBOL(gSelectedEventObject, 4)
 
 // ???
 SYMBOL(gPokemonItemUseCallback, 4)