Merge pull request #780 from GriffinRichards/sync-scripts

Sync some scripts with pokeemerald

460 files changed, 9026 insertions, 9525 deletions

diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index ab83f2bf8..9a2714a0e 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -3,6 +3,7 @@
 #include "constants/hold_effects.h"
 #include "constants/items.h"
 #include "constants/moves.h"
+#include "constants/pokemon.h"
 	.include "include/macros.inc"
 	.include "constants/constants.inc"
 	.include "include/macros/battle_ai_script.inc"
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 00f0fd97b..a62b74fe5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -2,6 +2,7 @@
 #include "constants/battle.h"
 #include "constants/moves.h"
 #include "constants/songs.h"
+#include "constants/pokemon.h"
 	.include "include/macros.inc"
 	.include "include/macros/battle_script.inc"
 	.include "constants/constants.inc"
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 06ab16430..3cee4e1c8 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -3,6 +3,7 @@
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/species.h"
+#include "constants/pokemon.h"
 	.include "include/macros.inc"
 	.include "constants/constants.inc"
 
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s
index 6fa509c34..a64f8351d 100644
--- a/data/debug_mystery_event_scripts.s
+++ b/data/debug_mystery_event_scripts.s
@@ -175,7 +175,7 @@ _0845E329:
 	getpartysize
 	compare VAR_RESULT, 0x6
 	vgoto_if 0x1, _0845E34C
-	givemon SPECIES_LUVDISC, 15, ITEM_BERRY_JUICE, 0x0, 0x0, 0x0
+	givemon SPECIES_LUVDISC, 15, ITEM_BERRY_JUICE
 	setmysteryeventstatus 0x2
 	end
 
@@ -333,7 +333,7 @@ _0845E730:
 _0845E736:
 	setvaddress _0845E736
 	bufferdecorationname 0x0, DECOR_REGISTEEL_DOLL
-	givedecoration DECOR_REGISTEEL_DOLL
+	adddecoration DECOR_REGISTEEL_DOLL
 	compare VAR_RESULT, 0x0
 	vgoto_if 0x1, _0845E755
 	vloadptr _0845E75D
diff --git a/data/event_scripts.s b/data/event_scripts.s
index ac5507d51..83e558714 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,3 +1,4 @@
+#include "constants/global.h"
 #include "constants/decorations.h"
 #include "constants/field_effects.h"
 #include "constants/flags.h"
@@ -13,6 +14,12 @@
 #include "constants/heal_locations.h"
 #include "constants/vars.h"
 #include "constants/metatile_labels.h"
+#include "constants/battle_setup.h"
+#include "constants/map_scripts.h"
+#include "constants/pokemon.h"
+#include "constants/berry.h"
+#include "constants/script_menu.h"
+#include "constants/field_weather.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
 	.include "constants/constants.inc"
@@ -47,14 +54,14 @@ gSpecialVars::
 
 	.align 2
 gStdScripts::
-	.4byte Std_ObtainItem
-	.4byte Std_FindItem
-	.4byte Std_2
-	.4byte Std_3
-	.4byte Std_4
-	.4byte Std_5
-	.4byte Std_6
-	.4byte Std_ObtainDecoration
+	.4byte Std_ObtainItem              @ STD_OBTAIN_ITEM
+	.4byte Std_FindItem                @ STD_FIND_ITEM
+	.4byte Std_MsgboxNPC               @ MSGBOX_NPC
+	.4byte Std_MsgboxSign              @ MSGBOX_SIGN
+	.4byte Std_MsgboxDefault           @ MSGBOX_DEFAULT
+	.4byte Std_MsgboxYesNo             @ MSGBOX_YESNO
+	.4byte Std_MsgboxAutoclose         @ MSGBOX_AUTOCLOSE
+	.4byte Std_ObtainDecoration        @ STD_OBTAIN_DECORATION
 gStdScripts_End::
 
 	.include "data/maps/PetalburgCity/scripts.inc"
@@ -373,198 +380,7 @@ gStdScripts_End::
 	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
 	.include "data/maps/SkyPillar_5F/scripts.inc"
 	.include "data/maps/SkyPillar_Top/scripts.inc"
-	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
-	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
-	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
-	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
-	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
-	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
-	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
-	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
-	.include "data/maps/SecretBase_RedCave1/scripts.inc"
-	.include "data/maps/SecretBase_RedCave2/scripts.inc"
-	.include "data/maps/SecretBase_RedCave3/scripts.inc"
-	.include "data/maps/SecretBase_RedCave4/scripts.inc"
-	.include "data/maps/SecretBase_Shrub1/scripts.inc"
-	.include "data/maps/SecretBase_Shrub2/scripts.inc"
-	.include "data/maps/SecretBase_Shrub3/scripts.inc"
-	.include "data/maps/SecretBase_Shrub4/scripts.inc"
-	.include "data/maps/SecretBase_Tree1/scripts.inc"
-	.include "data/maps/SecretBase_Tree2/scripts.inc"
-	.include "data/maps/SecretBase_Tree3/scripts.inc"
-	.include "data/maps/SecretBase_Tree4/scripts.inc"
-	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
-	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
-	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
-	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
-
-gUnknown_0815F36C:: @ 815F36C
-	lockall
-	playse SE_PC_LOGON
-	message UnknownString_81A3A72
-	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
-	waitstate
-	waitmessage
-	waitbuttonpress
-	playse SE_SELECT
-	goto EventScript_15F384
-	end
-
-EventScript_15F384:
-	message UnknownString_81A3A87
-	waitmessage
-	goto_if_set FLAG_DECORATION_16, EventScript_15F3A0
-	goto EventScript_15F3E2
-	end
-
-gUnknown_0815F399:: @ 815F399
-	lockall
-	goto EventScript_15F384
-	end
-
-EventScript_15F3A0:
-	multichoice 0, 0, 6, 0
-	switch VAR_RESULT
-	case 0, EventScript_15F432
-	case 1, EventScript_15F419
-	case 2, EventScript_15F436
-	case 3, EventScript_15F51D
-	case 127, EventScript_15F51D
-	end
-
-EventScript_15F3E2:
-	multichoice 0, 0, 5, 0
-	switch VAR_RESULT
-	case 0, EventScript_15F432
-	case 1, EventScript_15F419
-	case 2, EventScript_15F51D
-	case 127, EventScript_15F51D
-	end
-
-EventScript_15F419:
-	msgbox UnknownString_81A38FB, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_15F384
-	closemessage
-	special SecretBasePC_PackUp
-	releaseall
-	end
-
-EventScript_15F432:
-	special SecretBasePC_Decoration
-	end
-
-EventScript_15F436:
-	special SecretBasePC_Registry
-	end
-
-gUnknown_0815F43A:: @ 815F43A
-	lockall
-	message UnknownString_81A3A72
-	playse SE_PC_LOGON
-	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
-	waitstate
-	waitmessage
-	waitbuttonpress
-	playse SE_SELECT
-	goto EventScript_15F452
-	end
-
-EventScript_15F452:
-	message UnknownString_81A3A87
-	waitmessage
-	multichoice 0, 0, 7, 0
-	switch VAR_RESULT
-	case 0, EventScript_15F4A1
-	case 1, EventScript_15F436
-	case 2, EventScript_15F511
-	case 3, EventScript_15F51D
-	case 127, EventScript_15F51D
-	end
-
-gUnknown_0815F49A:: @ 815F49A
-	lockall
-	goto EventScript_15F452
-	end
-
-EventScript_15F4A1:
-	special sub_80BC56C
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_15F4E0
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_15F503
-	special BufferSecretBaseOwnerName
-	msgbox UnknownString_81A3958, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_15F452
-	msgbox UnknownString_81A3A22, 3
-	special sub_80BC5BC
-	special DoSecretBasePCTurnOffEffect
-	releaseall
-	end
-
-EventScript_15F4E0:
-	msgbox UnknownString_81A3982, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_15F452
-	msgbox UnknownString_81A3A3A, 3
-	special sub_80BC5BC
-	special DoSecretBasePCTurnOffEffect
-	releaseall
-	end
-
-EventScript_15F503:
-	msgbox UnknownString_81A39C0, 3
-	special DoSecretBasePCTurnOffEffect
-	closemessage
-	releaseall
-	end
-
-EventScript_15F511:
-	message UnknownString_81A3AA2
-	waitmessage
-	goto EventScript_15F452
-	end
-
-EventScript_15F51D:
-	special DoSecretBasePCTurnOffEffect
-	closemessage
-	releaseall
-	end
-
-gUnknown_0815F523:: @ 815F523
-	dofieldeffect FLDEFF_SAND_PILLAR
-	waitstate
-	end
-
-gUnknown_0815F528:: @ 815F528
-	special GetShieldToyTVDecorationInfo
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_15F558
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_15F561
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_15F56A
-	compare VAR_RESULT, 3
-	goto_if_eq EventScript_15F573
-	end
-
-EventScript_15F558:
-	msgbox UnknownString_81A3B5B, 3
-	end
-
-EventScript_15F561:
-	msgbox UnknownString_81A3BA4, 3
-	end
-
-EventScript_15F56A:
-	msgbox UnknownString_81A3BE8, 3
-	end
-
-EventScript_15F573:
-	msgbox UnknownString_81A3C31, 3
-	end
-
+	.include "data/scripts/shared_secret_base.inc"
 	.include "data/maps/SingleBattleColosseum/scripts.inc"
 	.include "data/maps/TradeCenter/scripts.inc"
 	.include "data/maps/RecordCorner/scripts.inc"
@@ -898,459 +714,34 @@ UnknownString_819C21F: @ 819C21F
 	.include "data/maps/Route119_House/text.inc"
 	.include "data/maps/Route124_DivingTreasureHuntersHouse/text.inc"
 
+	.include "data/scripts/std_msgbox.inc"
+	.include "data/scripts/trainer_battle.inc"
+	.include "data/scripts/new_game.inc"
+	.include "data/scripts/hall_of_fame.inc"
 
-Std_2:
-	lock
-	faceplayer
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	release
-	return
-
-Std_3:
-	lockall
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	releaseall
-	return
-
-Std_4:
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	return
-
-Std_5:
-	message 0x0
-	waitmessage
-	yesnobox 20, 8
-	return
-
-@ 819F805
-	return
-
-S_DoSaveDialog:: @ 819F806
-	special ScrSpecial_DoSaveDialog
-	waitstate
-	return
-
-gUnknown_0819F80B:: @ 819F80B
-	lock
-	special PlayTrainerEncounterMusic
-	special ScrSpecial_EndTrainerApproach
-	waitstate
-	goto EventScript_19F8F2
-
-gUnknown_0819F818:: @ 819F818
-	lock
-	faceplayer
-	applymovement VAR_LAST_TALKED, Movement_19F8F0
-	waitmovement 0
-	specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_19F83F
-	special PlayTrainerEncounterMusic
-	special sub_8082524
-	goto EventScript_19F8F2
-
-EventScript_19F83F:
-	gotopostbattlescript
-
-gUnknown_0819F840:: @ 819F840
-	lock
-	faceplayer
-	call EventScript_19F8E5
-	specialvar VAR_RESULT, ScrSpecial_HasTrainerBeenFought
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_19F877
-	special CheckForAlivePartyMons
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_19F870
-	special PlayTrainerEncounterMusic
-	special sub_8082524
-	goto EventScript_19F8F2
-
-EventScript_19F870:
-	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EventScript_19F877:
-	gotopostbattlescript
-
-gUnknown_0819F878:: @ 819F878
-	applymovement VAR_LAST_TALKED, Movement_19F8F0
-	waitmovement 0
-	special PlayTrainerEncounterMusic
-	trainerbattlebegin
-	gotopostbattlescript
-
-gUnknown_0819F887:: @ 819F887
-	call EventScript_19F8E5
-	specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_19F8AD
-	special PlayTrainerEncounterMusic
-	special sub_8082524
-	special ScrSpecial_ShowTrainerIntroSpeech
-	waitmessage
-	waitbuttonpress
-	special ScrSpecial_StartTrainerEyeRematch
-	waitstate
-	releaseall
-	end
-
-EventScript_19F8AD:
-	gotopostbattlescript
-
-gUnknown_0819F8AE:: @ 819F8AE
-	specialvar VAR_RESULT, ScrSpecial_GetTrainerEyeRematchFlag
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_19F8DD
-	special CheckForAlivePartyMons
-	compare VAR_RESULT, 0
-	goto_if_ne EventScript_19F8DE
-	special PlayTrainerEncounterMusic
-	special sub_8082524
-	special ScrSpecial_ShowTrainerIntroSpeech
-	waitmessage
-	waitbuttonpress
-	special ScrSpecial_StartTrainerEyeRematch
-	waitstate
-	releaseall
-	end
-
-EventScript_19F8DD:
-	gotopostbattlescript
-
-EventScript_19F8DE:
-	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EventScript_19F8E5:
-	applymovement VAR_LAST_TALKED, Movement_19F8F0
-	waitmovement 0
-	return
-
-Movement_19F8F0::
-	reveal_trainer
-	end_movement
-
-EventScript_19F8F2:
-	special ScrSpecial_ShowTrainerIntroSpeech
-	waitmessage
-	waitbuttonpress
-	trainerbattlebegin
-	specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_19F934
-	compare VAR_RESULT, 2
-	goto_if_eq EventScript_19F936
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_19F936
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_19F936
-	compare VAR_RESULT, 8
-	goto_if_eq EventScript_19F936
-
-EventScript_19F934:
-	releaseall
+EventScript_WhiteOut:: @ 819FC74
+	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
+	call EventScript_TryReadyRivalForGoGoggles
+	goto EventScript_ResetMrBriney
 	end
 
-EventScript_19F936:
-	gotobeatenscript
-
-Std_6::
-	message 0x0
-	waitmessage
-	waitbuttonpress
-	release
-	return
-
-Event_ResetBerryTrees: @ 19F940
-	setberrytree 2, 7, 5
-	setberrytree 1, 3, 5
-	setberrytree 11, 7, 5
-	setberrytree 13, 3, 5
-	setberrytree 4, 7, 5
-	setberrytree 76, 1, 5
-	setberrytree 8, 1, 5
-	setberrytree 10, 6, 5
-	setberrytree 25, 20, 5
-	setberrytree 26, 2, 5
-	setberrytree 66, 2, 5
-	setberrytree 67, 20, 5
-	setberrytree 69, 22, 5
-	setberrytree 70, 22, 5
-	setberrytree 71, 22, 5
-	setberrytree 55, 17, 5
-	setberrytree 56, 17, 5
-	setberrytree 5, 1, 5
-	setberrytree 6, 6, 5
-	setberrytree 7, 1, 5
-	setberrytree 16, 18, 5
-	setberrytree 17, 18, 5
-	setberrytree 18, 18, 5
-	setberrytree 29, 19, 5
-	setberrytree 28, 19, 5
-	setberrytree 27, 19, 5
-	setberrytree 24, 4, 5
-	setberrytree 23, 3, 5
-	setberrytree 22, 3, 5
-	setberrytree 21, 4, 5
-	setberrytree 19, 16, 5
-	setberrytree 20, 16, 5
-	setberrytree 80, 7, 5
-	setberrytree 81, 7, 5
-	setberrytree 77, 8, 5
-	setberrytree 78, 8, 5
-	setberrytree 68, 8, 5
-	setberrytree 31, 10, 5
-	setberrytree 33, 10, 5
-	setberrytree 34, 21, 5
-	setberrytree 35, 21, 5
-	setberrytree 36, 21, 5
-	setberrytree 83, 24, 5
-	setberrytree 84, 24, 5
-	setberrytree 85, 10, 5
-	setberrytree 86, 6, 5
-	setberrytree 37, 5, 5
-	setberrytree 38, 5, 5
-	setberrytree 39, 5, 5
-	setberrytree 40, 3, 5
-	setberrytree 41, 3, 5
-	setberrytree 42, 3, 5
-	setberrytree 46, 19, 5
-	setberrytree 45, 20, 5
-	setberrytree 44, 18, 5
-	setberrytree 43, 16, 5
-	setberrytree 47, 8, 5
-	setberrytree 48, 5, 5
-	setberrytree 49, 4, 5
-	setberrytree 50, 2, 5
-	setberrytree 52, 18, 5
-	setberrytree 53, 18, 5
-	setberrytree 62, 6, 5
-	setberrytree 64, 6, 5
-	setberrytree 58, 21, 5
-	setberrytree 59, 21, 5
-	setberrytree 60, 25, 5
-	setberrytree 61, 25, 5
-	setberrytree 79, 23, 5
-	setberrytree 14, 23, 5
-	setberrytree 15, 21, 5
-	setberrytree 30, 21, 5
-	setberrytree 65, 25, 5
-	setberrytree 72, 25, 5
-	setberrytree 73, 23, 5
-	setberrytree 74, 23, 5
-	setberrytree 87, 3, 5
-	setberrytree 88, 10, 5
-	setberrytree 89, 4, 5
-	setberrytree 82, 36, 5
-	return
-
-gUnknown_0819FA81:: @ 819FA81
-	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
-	setflag FLAG_HIDE_VICTORIA_WINSTRATE
-	setflag FLAG_HIDE_VIVI_WINSTRATE
-	setflag FLAG_HIDE_VICKI_WINSTRATE
-	setflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	setflag FLAG_HIDE_WALLY_PETALBURG
-	setflag FLAG_UNKNOWN_363
-	setflag FLAG_HIDE_GRUNT_RUSTBORO
-	setflag FLAG_HIDE_DEVON_RUSTBORO
-	setflag FLAG_HIDE_RIVAL_RUSTBORO
-	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
-	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
-	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
-	setflag FLAG_UNKNOWN_2E1
-	setflag FLAG_UNKNOWN_2EB
-	setflag FLAG_UNKNOWN_2EC
-	setflag FLAG_UNKNOWN_2ED
-	setflag FLAG_UNKNOWN_2F4
-	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
-	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
-	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
-	setflag FLAG_UNKNOWN_30E
-	setflag FLAG_UNKNOWN_30F
-	setflag FLAG_HIDE_NORMAN_LITTLEROOT
-	setflag FLAG_HIDE_MAY_PICHU_DOLL
-	setflag FLAG_HIDE_FANCLUB_OLD_LADY
-	setflag FLAG_HIDE_FANCLUB_BOY
-	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
-	setflag FLAG_HIDE_FANCLUB_LADY
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
-	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
-	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
-	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
-	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
-	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
-	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
-	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
-	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
-	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	setflag FLAG_UNKNOWN_337
-	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
-	setflag FLAG_UNKNOWN_34B
-	setflag FLAG_UNKNOWN_34C
-	setflag FLAG_UNKNOWN_34F
-	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
-	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
-	setflag FLAG_HIDE_STERN_SLATEPORT
-	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
-	setflag FLAG_HIDE_RIVAL_ROUTE119
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
-	setflag FLAG_HIDE_LANETTE
-	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
-	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
-	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BRINEY_ROUTE116
-	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
-	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
-	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
-	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	setflag FLAG_HIDE_MOM_LITTLEROOT
-	setflag FLAG_HIDE_MOM_UPSTAIRS
-	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
-	setflag FLAG_UNKNOWN_BIRCH_380
-	setflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_ROUTE103
-	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
-	setflag FLAG_UNKNOWN_393
-	setflag FLAG_HIDE_WATTSON_MAUVILLE
-	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
-	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
-	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
-	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
-	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
-	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
-	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
-	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
-	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
-	setflag FLAG_HIDE_STEVEN_ROUTE128
-	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
-	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
-	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
-	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
-	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
-	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
-	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
-	setflag FLAG_HIDE_STEVENS_LETTER
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
-	setflag FLAG_HIDE_BOY_ROUTE101
-	call Event_ResetBerryTrees
-	end
-
-EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13
-	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
-	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
-	clearflag FLAG_HIDE_STEVENS_LETTER
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
-	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
-	special sub_810FAA0
-	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_19FC62
-	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_19FC70
-	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_19FC5A
-	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_19FC5E
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC5A:: @ 819FC5A
-	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC5E:: @ 819FC5E
-	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
-	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
-	return
-
-EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70
-	setflag FLAG_SYS_TV_LATI
-	return
-
-S_WhiteOut:: @ 819FC74
-	call EverGrandeCity_HallOfFame_EventScript_19FD09
-	call EventScript_19FC84
-	goto gUnknown_0819FC9F
-	end
-
-EventScript_19FC84:
-	goto_if_set FLAG_RECEIVED_GO_GOGGLES, Route101_EventScript_1A14DC
-	goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Route101_EventScript_1A14DC
+EventScript_TryReadyRivalForGoGoggles:
+	goto_if_set FLAG_RECEIVED_GO_GOGGLES, Common_EventScript_Return
+	goto_if_unset FLAG_DEFEATED_LAVARIDGE_GYM, Common_EventScript_Return
 	clearflag FLAG_HIDE_RIVAL_LAVARIDGE_1
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
 	return
 
-gUnknown_0819FC9F:: @ 819FC9F
+EventScript_ResetMrBriney:: @ 819FC9F
 	compare VAR_BRINEY_LOCATION, 1
-	goto_if_eq EventScript_19FCC1
+	goto_if_eq EventScript_MoveMrBrineyToHouse
 	compare VAR_BRINEY_LOCATION, 2
-	goto_if_eq EventScript_19FCD7
+	goto_if_eq EventScript_MoveMrBrineyToDewford
 	compare VAR_BRINEY_LOCATION, 3
-	goto_if_eq EventScript_19FCF0
+	goto_if_eq EventScript_MoveMrBrineyToRoute109
 	end
 
-EventScript_19FCC1:
+EventScript_MoveMrBrineyToHouse:
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
@@ -1360,7 +751,7 @@ EventScript_19FCC1:
 	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	end
 
-EventScript_19FCD7:
+EventScript_MoveMrBrineyToDewford:
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
@@ -1371,7 +762,7 @@ EventScript_19FCD7:
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	end
 
-EventScript_19FCF0:
+EventScript_MoveMrBrineyToRoute109:
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
@@ -1382,7 +773,7 @@ EventScript_19FCF0:
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	end
 
-EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
+EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 819FD09
 	clearflag FLAG_DEFEATED_ELITE_4_SYDNEY
 	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
@@ -1390,693 +781,84 @@ EverGrandeCity_HallOfFame_EventScript_19FD09:: @ 819FD09
 	setvar VAR_ELITE_4_STATE, 0
 	return
 
-DewfordTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-FallarborTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-MauvilleCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-OldaleTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B
-	goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_1A14DC
-	goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, OldaleTown_PokemonCenter_1F_EventScript_19FD49
-	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_19FD4F
-	goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, OldaleTown_PokemonCenter_1F_EventScript_19FD55
+Common_EventScript_UpdateBrineyLocation:: @ 819FD1B
+	goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_Return
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_Return
+	goto_if_unset FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, EventScript_SetBrineyLocation_House
+	goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, EventScript_SetBrineyLocation_Dewford
+	goto_if_unset FLAG_HIDE_MR_BRINEY_ROUTE109, EventScript_SetBrineyLocation_Route109
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FD49:: @ 819FD49
+EventScript_SetBrineyLocation_House:: @ 819FD49
 	setvar VAR_BRINEY_LOCATION, 1
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FD4F:: @ 819FD4F
+EventScript_SetBrineyLocation_Dewford:: @ 819FD4F
 	setvar VAR_BRINEY_LOCATION, 2
 	return
 
-OldaleTown_PokemonCenter_1F_EventScript_19FD55:: @ 819FD55
+EventScript_SetBrineyLocation_Route109:: @ 819FD55
 	setvar VAR_BRINEY_LOCATION, 3
 	return
 
-DewfordTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-EverGrandeCity_PokemonLeague_EventScript_19FD5B:: @ 819FD5B
-FallarborTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-FortreeCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-LilycoveCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-MauvilleCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-MossdeepCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-OldaleTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-PetalburgCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-RustboroCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-SlateportCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-SootopolisCity_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
-	lock
-	faceplayer
-	msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq do_heal_party
-	compare VAR_RESULT, NO
-	goto_if_eq dont_heal_party
-	end
+	.include "data/scripts/pkmn_center_nurse.inc"
+	.include "data/scripts/obtain_item.inc"
+	.include "data/scripts/record_mix.inc"
+	.include "data/scripts/pc.inc"
 
-do_heal_party:: @ 819FD7C
-	incrementgamestat GAME_STAT_USED_POKECENTER
-	message gText_NurseJoy_OkayIllTakeYourPokemon
-	waitmessage
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A083F
-	waitmovement 0
-	dofieldeffect FLDEFF_POKECENTER_HEAL
-	waitfieldeffect FLDEFF_POKECENTER_HEAL
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_1A0845
-	waitmovement 0
-	special ScrSpecial_HealPlayerParty
-	goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_19FDCE
-	goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0
+Common_EventScript_PokemartSign:: @ 81A00E1
+	msgbox Text_PokemartSign, MSGBOX_SIGN
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
-	message gText_NurseJoy_ThankYouForWaiting
-	waitmessage
-	applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_19FDF4
-	waitmovement 0
-	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waitmessage
-	return
-
-dont_heal_party:: @ 819FDC7
-	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waitmessage
-	return
-
-OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
-	specialvar VAR_RESULT, IsPokerusInParty
-	compare VAR_RESULT, 1
-	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDEA
-	compare VAR_RESULT, 0
-	goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_19FDB0
-	end
-
-OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
-	message gText_NurseJoy_Pokerus
-	waitmessage
-	setflag FLAG_POKERUS_EXPLAINED
-	return
-
-OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
-	nurse_joy_bow
-	delay_4
-	end_movement
-
-Std_ObtainItem: @ 819FDF7
-	giveitem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainItem_
-	return
-
-Std_ObtainItem_: @ 819FE07
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 0x1
-	call_if_eq Std_ObtainItem_Success
-	compare VAR_0x8007, 0x0
-	call_if_eq Std_ObtainItem_Fail
-	return
-
-GetItem_HandlePocket:
-	switch VAR_RESULT
-	case POCKET_ITEMS,      GetItem_HandlePocket_Items
-	case POCKET_KEY_ITEMS,  GetItem_HandlePocket_KeyItems
-	case POCKET_POKE_BALLS, GetItem_HandlePocket_PokeBalls
-	case POCKET_TM_HM,      GetItem_HandlePocket_TMsHMs
-	case POCKET_BERRIES,    GetItem_HandlePocket_Berries
-	end
-
-GetItem_HandlePocket_Items:
-	bufferstdstring 2, 0xE
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_KeyItems:
-	bufferstdstring 2, 0xF
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_PokeBalls:
-	bufferstdstring 2, 0x10
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-GetItem_HandlePocket_TMsHMs:
-	bufferstdstring 2, 0x11
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetTMHMFanfare
-	return
-
-GetItem_HandlePocket_Berries:
-	bufferstdstring 2, 0x12
-	compare VAR_0x8007, 1
-	call_if_eq PlayGetItemFanfare
-	return
-
-Std_ObtainItem_Success: @ 819FEB7
-	message Message_ObtainedItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainItem_Fail: @ 819FECC
-	setvar VAR_RESULT, 0
-	return
-
-PlayGetItemFanfare:
-	playfanfare MUS_FANFA4
-	return
-
-PlayGetTMHMFanfare:
-	playfanfare MUS_ME_WAZA
-	return
-
-Std_ObtainDecoration: @ 819FEDA
-	givedecoration VAR_0x8000
-	copyvar VAR_0x8007, VAR_RESULT
-	call Std_ObtainDecoration_
-	return
-
-Std_ObtainDecoration_: @ 819FEE8
-	bufferdecorationname 1, VAR_0x8000
-	compare VAR_0x8007, 1
-	call_if_eq Std_ObtainDecoration_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_ObtainDecoration_Fail
-	return
-
-Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare MUS_FANFA4
-	message Message_ObtainedDecoration
-	waitfanfare
-	waitmessage
-	msgbox Message_TransferredToPC
-	setvar VAR_RESULT, 1
-	return
-
-Std_ObtainDecoration_Fail: @ 819FF1B
-	setvar VAR_RESULT, 0
-	return
-
-Std_FindItem: @ 819FF21
-	lock
-	faceplayer
-	waitse
-	giveitem VAR_0x8000, VAR_0x8001
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 1, VAR_0x8000
-	checkitemtype VAR_0x8000
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	call_if_eq Std_FindItem_Success
-	compare VAR_0x8007, 0
-	call_if_eq Std_FindItem_Fail
-	release
-	return
-
-Std_FindItem_Success: @ 819FF52
-	removeobject VAR_LAST_TALKED
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	return
-
-Std_FindItem_Fail: @ 819FF65
-	msgbox Message_ObtainedItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	return
-
-HiddenItemScript:: @ 819FF7B
-	lockall
-	waitse
-	giveitem VAR_0x8005, 1
-	copyvar VAR_0x8007, VAR_RESULT
-	bufferitemname 0x1, VAR_0x8005
-	checkitemtype VAR_0x8005
-	call GetItem_HandlePocket
-	compare VAR_0x8007, 1
-	goto_if_eq HiddenItemScript_Success
-	compare VAR_0x8007, 0
-	goto_if_eq HiddenItemScript_Fail
-	end
-
-HiddenItemScript_Success:
-	message Message_FoundOneItem
-	waitfanfare
-	waitmessage
-	msgbox Message_PutAwayItem
-	special SetFlagInVar
-	releaseall
-	end
-
-HiddenItemScript_Fail:
-	msgbox Message_FoundOneItem
-	msgbox Message_BagFull
-	setvar VAR_RESULT, 0
-	releaseall
-	end
-
-UnusedMixRecordsScript: @ 819FFD5
-	lock
-	faceplayer
-	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq UnusedMixRecordsScript_Yes
-	compare VAR_RESULT, NO
-	goto_if_eq UnusedMixRecordsScript_Done
-	goto UnusedMixRecordsScript_Done
-UnusedMixRecordsScript_Yes: @ 819FFFA
-	special sub_80B929C
-	waitstate
-	lock
-	faceplayer
-UnusedMixRecordsScript_Done: @ 81A0000
-	message UnusedMixRecordsSeeYouAgainText
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-gUnknown_081A0009:: @ 81A0009
-	lockall
-	setvar VAR_0x8004, 0
-	special DoPCTurnOnEffect
-	playse SE_PC_ON
-	msgbox UnknownString_81A09EC, 4
-	goto EventScript_1A0023
-	end
-
-EventScript_1A0023:
-	message gPCText_WhichPCShouldBeAccessed
-	waitmessage
-	special ScrSpecial_CreatePCMenu
-	waitstate
-	goto EventScript_1A0033
-	end
-
-EventScript_1A0033:
-	switch VAR_RESULT
-	case 0, EventScript_1A0085
-	case 1, EventScript_1A0070
-	case 2, EventScript_1A00CB
-	case 3, EventScript_1A00BE
-	case 127, EventScript_1A00BE
-	end
-
-EventScript_1A0070:
-	playse SE_PC_LOGON
-	msgbox UnknownString_81A0A54, 4
-	special PlayerPC
-	waitstate
-	goto EventScript_1A0023
-	end
-
-EventScript_1A0085:
-	playse SE_PC_LOGON
-	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_1A00AC
-	call_if_set FLAG_SYS_PC_LANETTE, EventScript_1A00B5
-	msgbox UnknownString_81A0A35, 4
-	special ShowPokemonStorageSystem
-	waitstate
-	goto EventScript_1A0023
-	end
-
-EventScript_1A00AC:
-	msgbox UnknownString_81A0A1E, 4
-	return
-
-EventScript_1A00B5:
-	msgbox UnknownString_81A0A66, 4
-	return
-
-EventScript_1A00BE:
-	setvar VAR_0x8004, 0
-	playse SE_PC_OFF
-	special DoPCTurnOffEffect
-	releaseall
+Common_EventScript_PokemonCenterSign:: @ 81A00EA
+	msgbox Text_PokemonCenterSign, MSGBOX_SIGN
 	end
 
-EventScript_1A00CB:
-	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_1A00BE
-	playse SE_PC_LOGON
-	special AccessHallOfFamePC
-	waitstate
-	goto EventScript_1A0033
-	end
-
-FallarborTown_EventScript_1A00E1:: @ 81A00E1
-FortreeCity_EventScript_1A00E1:: @ 81A00E1
-LavaridgeTown_EventScript_1A00E1:: @ 81A00E1
-MauvilleCity_EventScript_1A00E1:: @ 81A00E1
-MossdeepCity_EventScript_1A00E1:: @ 81A00E1
-OldaleTown_EventScript_1A00E1:: @ 81A00E1
-PetalburgCity_EventScript_1A00E1:: @ 81A00E1
-RustboroCity_EventScript_1A00E1:: @ 81A00E1
-SlateportCity_EventScript_1A00E1:: @ 81A00E1
-SootopolisCity_EventScript_1A00E1:: @ 81A00E1
-VerdanturfTown_EventScript_1A00E1:: @ 81A00E1
-	msgbox PetalburgCity_Text_1A0D41, 3
-	end
-
-DewfordTown_EventScript_1A00EA:: @ 81A00EA
-EverGrandeCity_EventScript_1A00EA:: @ 81A00EA
-FallarborTown_EventScript_1A00EA:: @ 81A00EA
-FortreeCity_EventScript_1A00EA:: @ 81A00EA
-LavaridgeTown_EventScript_1A00EA:: @ 81A00EA
-LilycoveCity_EventScript_1A00EA:: @ 81A00EA
-MauvilleCity_EventScript_1A00EA:: @ 81A00EA
-MossdeepCity_EventScript_1A00EA:: @ 81A00EA
-OldaleTown_EventScript_1A00EA:: @ 81A00EA
-PacifidlogTown_EventScript_1A00EA:: @ 81A00EA
-PetalburgCity_EventScript_1A00EA:: @ 81A00EA
-RustboroCity_EventScript_1A00EA:: @ 81A00EA
-SlateportCity_EventScript_1A00EA:: @ 81A00EA
-SootopolisCity_EventScript_1A00EA:: @ 81A00EA
-VerdanturfTown_EventScript_1A00EA:: @ 81A00EA
-	msgbox PetalburgCity_Text_1A0D75, 3
-	end
-
-BattleTower_Lobby_EventScript_1A00F3:: @ 81A00F3
-DewfordTown_EventScript_1A00F3:: @ 81A00F3
-FallarborTown_ContestLobby_EventScript_1A00F3:: @ 81A00F3
-MauvilleCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3
-PetalburgCity_PokemonCenter_1F_EventScript_1A00F3:: @ 81A00F3
-Route111_EventScript_1A00F3:: @ 81A00F3
-Route123_BerryMastersHouse_EventScript_1A00F3:: @ 81A00F3
-SlateportCity_OceanicMuseum_1F_EventScript_1A00F3:: @ 81A00F3
-SlateportCity_PokemonFanClub_EventScript_1A00F3:: @ 81A00F3
-	fadescreen 1
-	special sub_80E60D8
-	fadescreen 0
+Common_EventScript_ShowEasyChatScreen:: @ 81A00F3
+	fadescreen FADE_TO_BLACK
+	special ShowEasyChatScreen
+	fadescreen FADE_FROM_BLACK
 	return
 
-DewfordTown_Gym_EventScript_1A00FB:: @ 81A00FB
-LavaridgeTown_Gym_1F_EventScript_1A00FB:: @ 81A00FB
-MauvilleCity_Gym_EventScript_1A00FB:: @ 81A00FB
-RustboroCity_Gym_EventScript_1A00FB:: @ 81A00FB
+Common_EventScript_ReadyPetalburgGymForBattle:: @ 81A00FB
 	clearflag FLAG_HIDE_PETALBURG_GYM_GUIDE
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
-DewfordTown_EventScript_1A0102:: @ 81A0102
-DewfordTown_Hall_EventScript_1A0102:: @ 81A0102
-	dodailyevents
+Common_EventScript_BufferTrendyPhrase:: @ 81A0102
+	dotimebasedevents
 	setvar VAR_0x8004, 0
 	special BufferTrendyPhraseString
 	return
 
-DewfordTown_EventScript_1A010C:: @ 81A010C
-Route104_MrBrineysHouse_EventScript_1A010C:: @ 81A010C
-Route109_EventScript_1A010C:: @ 81A010C
+EventScript_BackupMrBrineyLocation:: @ 81A010C
 	copyvar VAR_0x8008, VAR_BRINEY_LOCATION
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-UseSurfScript:: @ 81A0117
-	checkpartymove MOVE_SURF
-	compare VAR_RESULT, 6
-	goto_if_eq UseSurfScript_NoMon
-	bufferpartymonnick 0, VAR_RESULT
-	setfieldeffectargument 0, VAR_RESULT
-	lockall
-	msgbox UseSurfPromptText, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq UseSurfScript_No
-	msgbox UsedSurfText, 4
-	dofieldeffect FLDEFF_USE_SURF
-UseSurfScript_No: @ 81A014C
-	releaseall
-UseSurfScript_NoMon: @ 81A014D
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_1A014E:: @ 81A014E
-LavaridgeTown_EventScript_1A014E:: @ 81A014E
-LilycoveCity_EventScript_1A014E:: @ 81A014E
-LittlerootTown_ProfessorBirchsLab_EventScript_1A014E:: @ 81A014E
-OldaleTown_EventScript_1A014E:: @ 81A014E
-Route103_EventScript_1A014E:: @ 81A014E
-Route110_EventScript_1A014E:: @ 81A014E
-Route119_EventScript_1A014E:: @ 81A014E
-RustboroCity_EventScript_1A014E:: @ 81A014E
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_EventScript_1A0166
-	compare VAR_RESULT, 1
-	goto_if_eq RustboroCity_EventScript_1A016C
-	end
-
-RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
-	return
-
-RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-LavaridgeTown_EventScript_1A0172:: @ 81A0172
-Route110_EventScript_1A0172:: @ 81A0172
-Route119_EventScript_1A0172:: @ 81A0172
-	checkplayergender
-	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_1A018A
-	compare VAR_RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_1A0190
-	end
-
-LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE
-	return
-
-LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE
-	return
-
-AquaHideout_1F_EventScript_1A0196:: @ 81A0196
-AquaHideout_B1F_EventScript_1A0196:: @ 81A0196
-AquaHideout_B2F_EventScript_1A0196:: @ 81A0196
-LilycoveCity_EventScript_1A0196:: @ 81A0196
-MeteorFalls_1F_1R_EventScript_1A0196:: @ 81A0196
-MtChimney_EventScript_1A0196:: @ 81A0196
-MtPyre_Summit_EventScript_1A0196:: @ 81A0196
-PetalburgWoods_EventScript_1A0196:: @ 81A0196
-Route110_EventScript_1A0196:: @ 81A0196
-Route112_EventScript_1A0196:: @ 81A0196
-Route113_EventScript_1A0196:: @ 81A0196
-Route119_EventScript_1A0196:: @ 81A0196
-Route119_WeatherInstitute_1F_EventScript_1A0196:: @ 81A0196
-Route119_WeatherInstitute_2F_EventScript_1A0196:: @ 81A0196
-Route121_EventScript_1A0196:: @ 81A0196
-Route128_EventScript_1A0196:: @ 81A0196
-RustboroCity_EventScript_1A0196:: @ 81A0196
-RusturfTunnel_EventScript_1A0196:: @ 81A0196
-SeafloorCavern_Room1_EventScript_1A0196:: @ 81A0196
-SeafloorCavern_Room3_EventScript_1A0196:: @ 81A0196
-SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
-SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
-SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_ARCHIE
-	setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_MAXIE
-	.else
-	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_MAXIE
-	setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_ARCHIE
-	.endif
-	return
-
-CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
-SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_KYOGRE_1
-	setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_KYOGRE_2
-	.else
-	setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_GROUDON_1
-	setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_GROUDON_2
-	.endif
-	return
-
-DewfordTown_Gym_EventScript_1A01C0:: @ 81A01C0
-FortreeCity_Gym_EventScript_1A01C0:: @ 81A01C0
-LavaridgeTown_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-MauvilleCity_Gym_EventScript_1A01C0:: @ 81A01C0
-MossdeepCity_Gym_EventScript_1A01C0:: @ 81A01C0
-PetalburgCity_Gym_EventScript_1A01C0:: @ 81A01C0
-RustboroCity_Gym_EventScript_1A01C0:: @ 81A01C0
-SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0
-	switch VAR_0x8008
-	case 1, DewfordTown_Gym_EventScript_1A021E
-	case 2, DewfordTown_Gym_EventScript_1A0225
-	case 3, DewfordTown_Gym_EventScript_1A022F
-	case 4, DewfordTown_Gym_EventScript_1A023C
-	case 5, DewfordTown_Gym_EventScript_1A024C
-	case 6, DewfordTown_Gym_EventScript_1A0262
-	case 7, DewfordTown_Gym_EventScript_1A026F
-	case 8, DewfordTown_Gym_EventScript_1A0282
-	end
-
-DewfordTown_Gym_EventScript_1A021E:: @ 81A021E
-	settrainerflag TRAINER_JOSH
-	settrainerflag TRAINER_TOMMY
-	return
-
-DewfordTown_Gym_EventScript_1A0225:: @ 81A0225
-	settrainerflag TRAINER_HIDEKI
-	settrainerflag TRAINER_TESSA
-	settrainerflag TRAINER_LAURA
-	return
-
-DewfordTown_Gym_EventScript_1A022F:: @ 81A022F
-	settrainerflag TRAINER_KIRK
-	settrainerflag TRAINER_SHAWN
-	settrainerflag TRAINER_BEN
-	settrainerflag TRAINER_VIVIAN
-	return
-
-DewfordTown_Gym_EventScript_1A023C:: @ 81A023C
-	settrainerflag TRAINER_COLE
-	settrainerflag TRAINER_AXLE
-	settrainerflag TRAINER_ANDY
-	settrainerflag TRAINER_ZANE
-	settrainerflag TRAINER_SADIE
-	return
-
-DewfordTown_Gym_EventScript_1A024C:: @ 81A024C
-	settrainerflag TRAINER_RANDALL
-	settrainerflag TRAINER_PARKER
-	settrainerflag TRAINER_GEORGE
-	settrainerflag TRAINER_BERKE
-	settrainerflag TRAINER_MARY
-	settrainerflag TRAINER_LORI
-	settrainerflag TRAINER_JODY
-	return
-
-DewfordTown_Gym_EventScript_1A0262:: @ 81A0262
-	settrainerflag TRAINER_JARED
-	settrainerflag TRAINER_TERRELL
-	settrainerflag TRAINER_KYLEE
-	settrainerflag TRAINER_WILL
-	return
+	.include "data/scripts/surf.inc"
+	.include "data/scripts/dynamic_npc_graphics.inc"
+	.include "data/scripts/set_gym_trainers.inc"
 
-DewfordTown_Gym_EventScript_1A026F:: @ 81A026F
-	settrainerflag TRAINER_PRESTON
-	settrainerflag TRAINER_VIRGIL
-	settrainerflag TRAINER_FRITZ
-	settrainerflag TRAINER_HANNAH
-	settrainerflag TRAINER_SAMANTHA
-	settrainerflag TRAINER_MAURA
-	return
-
-DewfordTown_Gym_EventScript_1A0282:: @ 81A0282
-	settrainerflag TRAINER_ANDREA
-	settrainerflag TRAINER_CRISSY
-	settrainerflag TRAINER_BRIANNA_2
-	settrainerflag TRAINER_CONNIE
-	settrainerflag TRAINER_BRIDGET
-	settrainerflag TRAINER_OLIVIA
-	settrainerflag TRAINER_TIFFANY
-	settrainerflag TRAINER_MARISSA
-	return
-
-DewfordTown_Gym_EventScript_1A029B:: @ 81A029B
-DewfordTown_Hall_EventScript_1A029B:: @ 81A029B
-FallarborTown_House1_EventScript_1A029B:: @ 81A029B
-FortreeCity_Gym_EventScript_1A029B:: @ 81A029B
-FortreeCity_House2_EventScript_1A029B:: @ 81A029B
-FortreeCity_House4_EventScript_1A029B:: @ 81A029B
-LavaridgeTown_Gym_1F_EventScript_1A029B:: @ 81A029B
-LavaridgeTown_HerbShop_EventScript_1A029B:: @ 81A029B
-LilycoveCity_EventScript_1A029B:: @ 81A029B
-LilycoveCity_House2_EventScript_1A029B:: @ 81A029B
-LittlerootTown_BrendansHouse_1F_EventScript_1A029B:: @ 81A029B
-MauvilleCity_EventScript_1A029B:: @ 81A029B
-MauvilleCity_Gym_EventScript_1A029B:: @ 81A029B
-MossdeepCity_EventScript_1A029B:: @ 81A029B
-MossdeepCity_Gym_EventScript_1A029B:: @ 81A029B
-MossdeepCity_SpaceCenter_1F_EventScript_1A029B:: @ 81A029B
-MtPyre_1F_EventScript_1A029B:: @ 81A029B
-PacifidlogTown_House2_EventScript_1A029B:: @ 81A029B
-PetalburgCity_Gym_EventScript_1A029B:: @ 81A029B
-PetalburgWoods_EventScript_1A029B:: @ 81A029B
-Route104_EventScript_1A029B:: @ 81A029B
-Route104_PrettyPetalFlowerShop_EventScript_1A029B:: @ 81A029B
-Route109_EventScript_1A029B:: @ 81A029B
-Route111_EventScript_1A029B:: @ 81A029B
-Route111_WinstrateFamilysHouse_EventScript_1A029B:: @ 81A029B
-Route114_EventScript_1A029B:: @ 81A029B
-Route114_FossilManiacsHouse_EventScript_1A029B:: @ 81A029B
-Route120_EventScript_1A029B:: @ 81A029B
-Route123_BerryMastersHouse_EventScript_1A029B:: @ 81A029B
-Route123_EventScript_1A029B:: @ 81A029B
-RustboroCity_DevonCorp_3F_EventScript_1A029B:: @ 81A029B
-RustboroCity_Flat2_2F_EventScript_1A029B:: @ 81A029B
-RustboroCity_Gym_EventScript_1A029B:: @ 81A029B
-RustboroCity_PokemonSchool_EventScript_1A029B:: @ 81A029B
-SSTidalRooms_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideEntranceRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideInnerRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideLowerRoom_EventScript_1A029B:: @ 81A029B
-ShoalCave_LowTideStairsRoom_EventScript_1A029B:: @ 81A029B
-SlateportCity_ContestHall_EventScript_1A029B:: @ 81A029B
-SlateportCity_Harbor_EventScript_1A029B:: @ 81A029B
-SlateportCity_PokemonFanClub_EventScript_1A029B:: @ 81A029B
-SootopolisCity_EventScript_1A029B:: @ 81A029B
-SootopolisCity_Gym_1F_EventScript_1A029B:: @ 81A029B
-VerdanturfTown_ContestLobby_EventScript_1A029B:: @ 81A029B
-	msgbox MauvilleCity_Text_1A0CC2, 4
+Common_EventScript_ShowBagIsFull:: @ 81A029B
+	msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_1A02A5:: @ 81A02A5
-Route110_TrickHouseEnd_EventScript_1A02A5:: @ 81A02A5
-Route110_TrickHouseEntrance_EventScript_1A02A5:: @ 81A02A5
-Route113_GlassWorkshop_EventScript_1A02A5:: @ 81A02A5
-	msgbox MauvilleCity_GameCorner_Text_1A0CC2, 4
+Common_EventScript_BagIsFull:: @ 81A02A5
+	msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
-Route114_LanettesHouse_EventScript_1A02AE:: @ 81A02AE
-	msgbox Route114_LanettesHouse_Text_1A0CEF, 4
+Common_EventScript_ShowNoRoomForDecor:: @ 81A02AE
+	msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8:: @ 81A02B8
-MauvilleCity_GameCorner_EventScript_1A02B8:: @ 81A02B8
-Route110_TrickHouseEnd_EventScript_1A02B8:: @ 81A02B8
-Route110_TrickHouseEntrance_EventScript_1A02B8:: @ 81A02B8
-Route113_GlassWorkshop_EventScript_1A02B8:: @ 81A02B8
-	msgbox MauvilleCity_GameCorner_Text_1A0CEF, 4
+Common_EventScript_NoRoomForDecor:: @ 81A02B8
+	msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_EventScript_1A02C1:: @ 81A02C1
-LilycoveCity_EventScript_1A02C1:: @ 81A02C1
-MossdeepCity_EventScript_1A02C1:: @ 81A02C1
-Route124_EventScript_1A02C1:: @ 81A02C1
-Route125_EventScript_1A02C1:: @ 81A02C1
-Route126_EventScript_1A02C1:: @ 81A02C1
-Route127_EventScript_1A02C1:: @ 81A02C1
-Route128_EventScript_1A02C1:: @ 81A02C1
-SootopolisCity_EventScript_1A02C1:: @ 81A02C1
+Common_EventScript_SetLegendaryWeather:: @ 81A02C1
 	.ifdef SAPPHIRE
 	setweather WEATHER_RAIN_HEAVY
 	.else
@@ -2084,152 +866,47 @@ SootopolisCity_EventScript_1A02C1:: @ 81A02C1
 	.endif
 	return
 
-DewfordTown_Gym_EventScript_1A02C5:: @ 81A02C5
-FortreeCity_Gym_EventScript_1A02C5:: @ 81A02C5
-LavaridgeTown_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5:: @ 81A02C5
-MauvilleCity_Gym_EventScript_1A02C5:: @ 81A02C5
-MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
-PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
-RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
-SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
+Common_EventScript_PlayGymBadgeFanfare:: @ 81A02C5
 	playfanfare MUS_ME_BACHI
 	waitfanfare
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_1A02CA:: @ 81A02CA
-Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
-Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
-SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
-	fadescreen 1
+Common_EventScript_OutOfCenterPartyHeal:: @ 81A02CA
+	fadescreen FADE_TO_BLACK
 	playfanfare MUS_ME_ASA
 	waitfanfare
 	special ScrSpecial_HealPlayerParty
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	return
 
-Event_WorldMap:: @ 81A02D6
+EventScript_RegionMap:: @ 81A02D6
 	lockall
-	msgbox UnknownString_817303D, 4
-	fadescreen 1
+	msgbox Text_LookCloserAtMap, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	special FieldShowRegionMap
 	waitstate
 	releaseall
 	end
 
-DewfordTown_EventScript_1A02E7:: @ 81A02E7
-Route104_EventScript_1A02E7:: @ 81A02E7
-Route109_EventScript_1A02E7:: @ 81A02E7
-	setflag FLAG_SPECIAL_FLAG_1
+Common_EventScript_PlayBrineysBoatMusic:: @ 81A02E7
+	setflag FLAG_DONT_TRANSITION_MUSIC
 	playbgm MUS_M_BOAT, FALSE
 	return
 
-DewfordTown_EventScript_1A02EF:: @ 81A02EF
-Route104_EventScript_1A02EF:: @ 81A02EF
-Route109_EventScript_1A02EF:: @ 81A02EF
-	clearflag FLAG_SPECIAL_FLAG_1
+Common_EventScript_StopBrineysBoatMusic:: @ 81A02EF
+	clearflag FLAG_DONT_TRANSITION_MUSIC
 	fadedefaultbgm
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4:: @ 81A02F4
-Route101_EventScript_1A02F4:: @ 81A02F4
-Route103_EventScript_1A02F4:: @ 81A02F4
-	compare VAR_PETALBURG_GYM_STATE, 0
-	goto_if_eq Route101_EventScript_1A14DC
-	compare VAR_BIRCH_STATE, 0
-	call_if_eq Route101_EventScript_1A0358
-	compare VAR_BIRCH_STATE, 1
-	call_if_eq Route101_EventScript_1A0358
-	compare VAR_BIRCH_STATE, 2
-	call_if_eq Route101_EventScript_1A0365
-	compare VAR_BIRCH_STATE, 3
-	call_if_eq Route101_EventScript_1A0365
-	compare VAR_BIRCH_STATE, 4
-	call_if_eq Route101_EventScript_1A0372
-	compare VAR_BIRCH_STATE, 5
-	call_if_eq Route101_EventScript_1A0372
-	compare VAR_BIRCH_STATE, 6
-	call_if_eq Route101_EventScript_1A0358
-	compare VAR_BIRCH_STATE, 7
-	call_if_eq Route101_EventScript_1A0358
-	return
+	.include "data/scripts/prof_birch.inc"
 
-Route101_EventScript_1A0358:: @ 81A0358
-	clearflag FLAG_HIDE_BIRCH_IN_LAB
-	clearflag FLAG_UNKNOWN_BIRCH_380
-	setflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_ROUTE103
-	return
-
-Route101_EventScript_1A0365:: @ 81A0365
-	clearflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_UNKNOWN_BIRCH_380
-	setflag FLAG_HIDE_BIRCH_ROUTE103
-	return
-
-Route101_EventScript_1A0372:: @ 81A0372
-	clearflag FLAG_HIDE_BIRCH_ROUTE103
-	setflag FLAG_HIDE_BIRCH_ROUTE101
-	setflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_UNKNOWN_BIRCH_380
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_1A037F:: @ 81A037F
-Route101_EventScript_1A037F:: @ 81A037F
-Route103_EventScript_1A037F:: @ 81A037F
-	lock
-	faceplayer
-	msgbox Route101_Text_1C4449, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq Route101_EventScript_1A039B
-	call Route101_EventScript_1A03B0
-	release
-	end
-
-Route101_EventScript_1A039B:: @ 81A039B
-	msgbox Route101_Text_1C449B, 4
-	release
-	end
-
-Route101_EventScript_1A03A5:: @ 81A03A5
-	copyvar VAR_0x8004, VAR_0x8009
-	special ShowPokedexRatingMessage
-	waitmessage
-	waitbuttonpress
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_1A03B0:: @ 81A03B0
-Route101_EventScript_1A03B0:: @ 81A03B0
-	setvar VAR_0x8004, 0
-	specialvar VAR_RESULT, ScriptGetPokedexInfo
-	copyvar VAR_0x8008, VAR_0x8005
-	copyvar VAR_0x8009, VAR_0x8006
-	copyvar VAR_0x800A, VAR_RESULT
-	buffernumberstring 0, VAR_0x8008
-	buffernumberstring 1, VAR_0x8009
-	msgbox Route101_Text_1C44DC, 4
-	call Route101_EventScript_1A03A5
-	compare VAR_0x800A, 0
-	goto_if_eq Route101_EventScript_1A14DC
-	setvar VAR_0x8004, 1
-	specialvar VAR_RESULT, ScriptGetPokedexInfo
-	copyvar VAR_0x8008, VAR_0x8005
-	copyvar VAR_0x8009, VAR_0x8006
-	buffernumberstring 0, VAR_0x8008
-	buffernumberstring 1, VAR_0x8009
-	msgbox Route101_Text_1C4B05, 4
-	return
-
-BattleTower_Outside_EventScript_1A040E:: @ 81A040E
-LilycoveCity_Harbor_EventScript_1A040E:: @ 81A040E
-SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
+Common_EventScript_FerryDepart:: @ 81A040E
 	delay 60
-	applymovement VAR_0x8004, SlateportCity_Harbor_Movement_1A041C
+	applymovement VAR_0x8004, Movement_FerryDepart
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
+Movement_FerryDepart:: @ 81A041C
 	walk_slow_right
 	walk_slow_right
 	walk_slow_right
@@ -2237,9 +914,9 @@ SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
-PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
+EventScript_HideMrBriney:: @ 81A0424
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
@@ -2251,7 +928,7 @@ PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-RusturfTunnel_EventScript_1A0442:: @ 81A0442
+RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 81A0442
 	removeobject 1
 	removeobject 10
 	clearflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
@@ -2260,846 +937,64 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442
 	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
-EventScript_1A0457: @ unreferenced?
+EventScript_UnusedBoardFerry:
 	delay 30
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	showobjectat 255, MAP_PETALBURG_CITY
+	showobjectat OBJ_EVENT_ID_PLAYER, 0
 	delay 30
-	applymovement 255, Movement_1A047A
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_UnusedBoardFerry
 	waitmovement 0
 	delay 30
 	return
 
-Movement_1A047A:
+Movement_UnusedBoardFerry:
 	walk_up
-	end_movement
-
-BattleTower_Outside_EventScript_1A047C:: @ 81A047C
-SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
-	compare VAR_FACING, 1
-	call_if_eq BattleTower_Outside_EventScript_160B2F
-	compare VAR_FACING, 3
-	call_if_eq BattleTower_Outside_EventScript_160B3A
-	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
-	call BattleTower_Outside_EventScript_1A040E
-	return
-
-CaveOfOrigin_B4F_EventScript_1A04A0:: @ 81A04A0
-	lockall
-	waitse
-	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
-	waitmoncry
-	setvar VAR_TEMP_5, 1
-	releaseall
-	end
-
-CaveOfOrigin_1F_EventScript_1A04AF:: @ 81A04AF
-CaveOfOrigin_B1F_EventScript_1A04AF:: @ 81A04AF
-CaveOfOrigin_B2F_EventScript_1A04AF:: @ 81A04AF
-CaveOfOrigin_B3F_EventScript_1A04AF:: @ 81A04AF
-	lockall
-	setvar VAR_TEMP_1, 1
-	goto CaveOfOrigin_1F_EventScript_1A04D3
-	end
-
-CaveOfOrigin_B2F_EventScript_1A04BB:: @ 81A04BB
-CaveOfOrigin_B3F_EventScript_1A04BB:: @ 81A04BB
-	lockall
-	setvar VAR_TEMP_2, 1
-	goto CaveOfOrigin_B2F_EventScript_1A04D3
-	end
-
-@ 81A04C7
-	lockall
-	setvar VAR_TEMP_3, 1
-	goto CaveOfOrigin_B2F_EventScript_1A04D3
-	end
-
-CaveOfOrigin_1F_EventScript_1A04D3:: @ 81A04D3
-CaveOfOrigin_B2F_EventScript_1A04D3:: @ 81A04D3
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 1
-	special sub_810F758
-	waitstate
-	releaseall
-	end
-
-CaveOfOrigin_1F_EventScript_1A04E3:: @ 81A04E3
-CaveOfOrigin_B1F_EventScript_1A04E3:: @ 81A04E3
-CaveOfOrigin_B2F_EventScript_1A04E3:: @ 81A04E3
-CaveOfOrigin_B3F_EventScript_1A04E3:: @ 81A04E3
-CaveOfOrigin_B4F_EventScript_1A04E3:: @ 81A04E3
-	setvar VAR_TEMP_1, 1
-	setvar VAR_TEMP_2, 1
-	setvar VAR_TEMP_3, 1
-	setvar VAR_TEMP_4, 1
-	setvar VAR_TEMP_5, 1
-	return
-
-AquaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
-MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD
-	lock
-	faceplayer
-	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
-	waitse
-	playmoncry SPECIES_ELECTRODE, 2
-	delay 40
-	waitmoncry
-	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	release
-	end
-
-AquaHideout_B1F_EventScript_1A051B:: @ 81A051B
-MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B
-	lock
-	faceplayer
-	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
-	waitse
-	playmoncry SPECIES_ELECTRODE, 2
-	delay 40
-	waitmoncry
-	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	release
-	end
-
-Route120_EventScript_1A0539:: @ 81A0539
-	lock
-	faceplayer
-	setvar VAR_0x8004, 1
-	goto Route120_EventScript_1A0594
-	end
+	step_end
 
-Route120_EventScript_1A0546:: @ 81A0546
-	lock
-	faceplayer
-	setvar VAR_0x8004, 2
-	goto Route120_EventScript_1A0594
-	end
-
-Route120_EventScript_1A0553:: @ 81A0553
-	lock
-	faceplayer
-	setvar VAR_0x8004, 3
-	goto Route120_EventScript_1A0594
-	end
-
-Route120_EventScript_1A0560:: @ 81A0560
-	lock
-	faceplayer
-	setvar VAR_0x8004, 4
-	goto Route120_EventScript_1A0594
-	end
-
-Route120_EventScript_1A056D:: @ 81A056D
-	lock
-	faceplayer
-	setvar VAR_0x8004, 5
-	goto Route120_EventScript_1A0594
-	end
-
-Route119_EventScript_1A057A:: @ 81A057A
-	lock
-	faceplayer
-	setvar VAR_0x8004, 6
-	goto Route119_EventScript_1A0594
-	end
-
-Route119_EventScript_1A0587:: @ 81A0587
-	lock
-	faceplayer
-	setvar VAR_0x8004, 7
-	goto Route119_EventScript_1A0594
-	end
-
-Route119_EventScript_1A0594:: @ 81A0594
-Route120_EventScript_1A0594:: @ 81A0594
-	checkitem ITEM_DEVON_SCOPE, 1
-	compare VAR_RESULT, 1
-	goto_if_eq Route119_EventScript_1A05AE
-	msgbox Route119_Text_171B93, 4
-	release
-	end
-
-Route119_EventScript_1A05AE:: @ 81A05AE
-	msgbox Route119_Text_171BB6, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq Route119_EventScript_1A05C3
-	release
-	end
-
-Route119_EventScript_1A05C3:: @ 81A05C3
-	msgbox Route119_Text_171BF6, 4
-	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_1A0839
-	waitmovement 0
-	applymovement VAR_LAST_TALKED, Route119_Movement_1A0662
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KECLEON, 2
-	delay 40
-	waitmoncry
-	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
-	compare VAR_0x8004, 1
-	call_if_eq Route119_EventScript_1A0646
-	compare VAR_0x8004, 2
-	call_if_eq Route119_EventScript_1A064A
-	compare VAR_0x8004, 3
-	call_if_eq Route119_EventScript_1A064E
-	compare VAR_0x8004, 4
-	call_if_eq Route119_EventScript_1A0652
-	compare VAR_0x8004, 5
-	call_if_eq Route119_EventScript_1A0656
-	compare VAR_0x8004, 6
-	call_if_eq Route119_EventScript_1A065A
-	compare VAR_0x8004, 7
-	call_if_eq Route119_EventScript_1A065E
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	release
-	end
-
-Route119_EventScript_1A0646:: @ 81A0646
-	setflag FLAG_HIDE_KECLEON_ROUTE120_3
-	return
-
-Route119_EventScript_1A064A:: @ 81A064A
-	setflag FLAG_HIDE_KECLEON_ROUTE120_4
-	return
-
-Route119_EventScript_1A064E:: @ 81A064E
-	setflag FLAG_HIDE_KECLEON_ROUTE120_5
-	return
-
-Route119_EventScript_1A0652:: @ 81A0652
-	setflag FLAG_HIDE_KECLEON_ROUTE120_6
-	return
-
-Route119_EventScript_1A0656:: @ 81A0656
-	setflag FLAG_HIDE_KECLEON_ROUTE120_7
-	return
-
-Route119_EventScript_1A065A:: @ 81A065A
-	setflag FLAG_HIDE_KECLEON_ROUTE119_1
+Common_EventScript_FerryDepartIsland:: @ 81A047C
+	compare VAR_FACING, DIR_SOUTH
+	call_if_eq Ferry_EventScript_DepartIslandSouth
+	compare VAR_FACING, DIR_WEST
+	call_if_eq Ferry_EventScript_DepartIslandWest
+	delay 30
+	hideobjectat OBJ_EVENT_ID_PLAYER, 0
+	call Common_EventScript_FerryDepart
 	return
 
-Route119_EventScript_1A065E:: @ 81A065E
-	setflag FLAG_HIDE_KECLEON_ROUTE119_2
-	return
+	.include "data/scripts/cave_of_origin.inc"
+	.include "data/scripts/static_pokemon.inc"
 
-FortreeCity_Movement_1A0662:: @ 81A0662
-Route119_Movement_1A0662:: @ 81A0662
-Route120_Movement_1A0662:: @ 81A0662
-	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
-RustboroCity_DevonCorp_2F_EventScript_1A0678:: @ 81A0678
-SlateportCity_House1_EventScript_1A0678:: @ 81A0678
-	fadescreen 1
+Common_EventScript_NameReceivedPartyMon:: @ 81A0678
+	fadescreen FADE_TO_BLACK
 	special ChangePokemonNickname
 	waitstate
 	return
 
-FallarborTown_House1_EventScript_1A067F:: @ 81A067F
-GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
-MtPyre_Summit_EventScript_1A067F:: @ 81A067F
-SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
+Common_EventScript_PlayerHandedOverTheItem:: @ 81A067F
 	bufferitemname 0, VAR_0x8004
 	playfanfare MUS_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
-	takeitem VAR_0x8004, 1
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_GlaciasRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_PhoebesRoom_EventScript_1A0693:: @ 81A0693
-EverGrandeCity_SidneysRoom_EventScript_1A0693:: @ 81A0693
-	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0853
-	waitmovement 0
-	playse SE_DOOR
-	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
-	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
-	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	special DrawWholeMapView
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_GlaciasRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_PhoebesRoom_EventScript_1A0710:: @ 81A0710
-EverGrandeCity_SidneysRoom_EventScript_1A0710:: @ 81A0710
-	applymovement 255, EverGrandeCity_SidneysRoom_Movement_1A0847
-	waitmovement 0
-	playse SE_TRACK_DOOR
-	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	special DrawWholeMapView
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_GlaciasRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_PhoebesRoom_EventScript_1A0757:: @ 81A0757
-EverGrandeCity_SidneysRoom_EventScript_1A0757:: @ 81A0757
-	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
-	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
-	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
-	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_GlaciasRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_PhoebesRoom_EventScript_1A07FA:: @ 81A07FA
-EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
-	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
-	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
-	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	removeitem VAR_0x8004, 1
 	return
 
-SlateportCity_Movement_1A0831:: @ 81A0831
-	emote_question_mark
-	end_movement
-
-AquaHideout_B2F_Movement_1A0833:: @ 81A0833
-EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833
-LavaridgeTown_Movement_1A0833:: @ 81A0833
-LilycoveCity_ContestLobby_Movement_1A0833:: @ 81A0833
-LilycoveCity_CoveLilyMotel_1F_Movement_1A0833:: @ 81A0833
-LittlerootTown_BrendansHouse_1F_Movement_1A0833:: @ 81A0833
-LittlerootTown_BrendansHouse_2F_Movement_1A0833:: @ 81A0833
-LittlerootTown_MaysHouse_1F_Movement_1A0833:: @ 81A0833
-MauvilleCity_House2_Movement_1A0833:: @ 81A0833
-MauvilleCity_Movement_1A0833:: @ 81A0833
-MeteorFalls_1F_1R_Movement_1A0833:: @ 81A0833
-MossdeepCity_StevensHouse_Movement_1A0833:: @ 81A0833
-MtChimney_Movement_1A0833:: @ 81A0833
-PetalburgCity_Movement_1A0833:: @ 81A0833
-Route103_Movement_1A0833:: @ 81A0833
-Route110_Movement_1A0833:: @ 81A0833
-Route110_TrickHouseEnd_Movement_1A0833:: @ 81A0833
-Route110_TrickHouseEntrance_Movement_1A0833:: @ 81A0833
-Route110_TrickHousePuzzle5_Movement_1A0833:: @ 81A0833
-RustboroCity_DevonCorp_2F_Movement_1A0833:: @ 81A0833
-RustboroCity_Movement_1A0833:: @ 81A0833
-RusturfTunnel_Movement_1A0833:: @ 81A0833
-SeafloorCavern_Room9_Movement_1A0833:: @ 81A0833
-SlateportCity_Movement_1A0833:: @ 81A0833
-SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833
-SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833
-SootopolisCity_Movement_1A0833:: @ 81A0833
-	emote_exclamation_mark
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835
-LavaridgeTown_Movement_1A0835:: @ 81A0835
-LilycoveCity_CoveLilyMotel_1F_Movement_1A0835:: @ 81A0835
-LittlerootTown_BrendansHouse_1F_Movement_1A0835:: @ 81A0835
-LittlerootTown_BrendansHouse_2F_Movement_1A0835:: @ 81A0835
-LittlerootTown_MaysHouse_1F_Movement_1A0835:: @ 81A0835
-MauvilleCity_House2_Movement_1A0835:: @ 81A0835
-MauvilleCity_Movement_1A0835:: @ 81A0835
-MeteorFalls_1F_1R_Movement_1A0835:: @ 81A0835
-MossdeepCity_StevensHouse_Movement_1A0835:: @ 81A0835
-MtChimney_Movement_1A0835:: @ 81A0835
-PetalburgCity_Movement_1A0835:: @ 81A0835
-Route103_Movement_1A0835:: @ 81A0835
-Route110_Movement_1A0835:: @ 81A0835
-Route110_TrickHouseEntrance_Movement_1A0835:: @ 81A0835
-Route110_TrickHousePuzzle5_Movement_1A0835:: @ 81A0835
-RustboroCity_DevonCorp_2F_Movement_1A0835:: @ 81A0835
-RustboroCity_Movement_1A0835:: @ 81A0835
-RusturfTunnel_Movement_1A0835:: @ 81A0835
-SeafloorCavern_Room9_Movement_1A0835:: @ 81A0835
-SlateportCity_Movement_1A0835:: @ 81A0835
-SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835
-SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835
-SootopolisCity_Movement_1A0835:: @ 81A0835
-	delay_16
-	delay_16
-	delay_16
-	end_movement
-
-AquaHideout_B2F_Movement_1A0839:: @ 81A0839
-EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839
-FallarborTown_House2_Movement_1A0839:: @ 81A0839
-FortreeCity_House4_Movement_1A0839:: @ 81A0839
-LilycoveCity_ContestHall_Movement_1A0839:: @ 81A0839
-LilycoveCity_CoveLilyMotel_1F_Movement_1A0839:: @ 81A0839
-LilycoveCity_DepartmentStore_1F_Movement_1A0839:: @ 81A0839
-LilycoveCity_Harbor_Movement_1A0839:: @ 81A0839
-LilycoveCity_LilycoveMuseum_1F_Movement_1A0839:: @ 81A0839
-LilycoveCity_LilycoveMuseum_2F_Movement_1A0839:: @ 81A0839
-LilycoveCity_MoveDeletersHouse_Movement_1A0839:: @ 81A0839
-LilycoveCity_Movement_1A0839:: @ 81A0839
-LittlerootTown_BrendansHouse_1F_Movement_1A0839:: @ 81A0839
-LittlerootTown_BrendansHouse_2F_Movement_1A0839:: @ 81A0839
-MauvilleCity_Movement_1A0839:: @ 81A0839
-MtChimney_Movement_1A0839:: @ 81A0839
-MtPyre_Summit_Movement_1A0839:: @ 81A0839
-OldaleTown_Movement_1A0839:: @ 81A0839
-PetalburgCity_Gym_Movement_1A0839:: @ 81A0839
-PetalburgCity_Movement_1A0839:: @ 81A0839
-Route103_Movement_1A0839:: @ 81A0839
-Route110_TrickHouseEnd_Movement_1A0839:: @ 81A0839
-Route110_TrickHouseEntrance_Movement_1A0839:: @ 81A0839
-Route110_TrickHousePuzzle5_Movement_1A0839:: @ 81A0839
-Route119_Movement_1A0839:: @ 81A0839
-RusturfTunnel_Movement_1A0839:: @ 81A0839
-SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839
-SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839
-SlateportCity_Movement_1A0839:: @ 81A0839
-SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839
-	face_player
-	end_movement
-
-@ 81A083B
-	face_away_player
-	end_movement
-
-EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D
-LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D
-LilycoveCity_ContestLobby_Movement_1A083D:: @ 81A083D
-LilycoveCity_CoveLilyMotel_1F_Movement_1A083D:: @ 81A083D
-LilycoveCity_House3_Movement_1A083D:: @ 81A083D
-LilycoveCity_LilycoveMuseum_1F_Movement_1A083D:: @ 81A083D
-LilycoveCity_Movement_1A083D:: @ 81A083D
-LittlerootTown_Movement_1A083D:: @ 81A083D
-MauvilleCity_GameCorner_Movement_1A083D:: @ 81A083D
-MauvilleCity_Movement_1A083D:: @ 81A083D
-MossdeepCity_Movement_1A083D:: @ 81A083D
-MossdeepCity_SpaceCenter_1F_Movement_1A083D:: @ 81A083D
-MtChimney_Movement_1A083D:: @ 81A083D
-OldaleTown_Movement_1A083D:: @ 81A083D
-PetalburgCity_Movement_1A083D:: @ 81A083D
-Route109_Movement_1A083D:: @ 81A083D
-Route110_Movement_1A083D:: @ 81A083D
-Route111_WinstrateFamilysHouse_Movement_1A083D:: @ 81A083D
-Route119_Movement_1A083D:: @ 81A083D
-RustboroCity_DevonCorp_3F_Movement_1A083D:: @ 81A083D
-RustboroCity_Movement_1A083D:: @ 81A083D
-RusturfTunnel_Movement_1A083D:: @ 81A083D
-SlateportCity_ContestHall_Movement_1A083D:: @ 81A083D
-SlateportCity_ContestLobby_Movement_1A083D:: @ 81A083D
-SlateportCity_Harbor_Movement_1A083D:: @ 81A083D
-SlateportCity_Movement_1A083D:: @ 81A083D
-SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D
-SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D
-VerdanturfTown_Movement_1A083D:: @ 81A083D
-	face_original_direction
-	end_movement
-
-Movement_1A083F:: @ 81A083F
-DewfordTown_Hall_Movement_1A083F:: @ 81A083F
-EverGrandeCity_ChampionsRoom_Movement_1A083F:: @ 81A083F
-EverGrandeCity_HallOfFame_Movement_1A083F:: @ 81A083F
-LavaridgeTown_Movement_1A083F:: @ 81A083F
-LilycoveCity_PokemonTrainerFanClub_Movement_1A083F:: @ 81A083F
-LittlerootTown_BrendansHouse_1F_Movement_1A083F:: @ 81A083F
-LittlerootTown_BrendansHouse_2F_Movement_1A083F:: @ 81A083F
-LittlerootTown_MaysHouse_1F_Movement_1A083F:: @ 81A083F
-LittlerootTown_Movement_1A083F:: @ 81A083F
-MeteorFalls_1F_1R_Movement_1A083F:: @ 81A083F
-MossdeepCity_StevensHouse_Movement_1A083F:: @ 81A083F
-MtChimney_Movement_1A083F:: @ 81A083F
-MtPyre_Summit_Movement_1A083F:: @ 81A083F
-OldaleTown_PokemonCenter_1F_Movement_1A083F:: @ 81A083F
-PetalburgCity_Gym_Movement_1A083F:: @ 81A083F
-PetalburgCity_Movement_1A083F:: @ 81A083F
-PetalburgWoods_Movement_1A083F:: @ 81A083F
-Route101_Movement_1A083F:: @ 81A083F
-Route110_TrickHouseEnd_Movement_1A083F:: @ 81A083F
-Route111_Movement_1A083F:: @ 81A083F
-Route116_Movement_1A083F:: @ 81A083F
-Route120_Movement_1A083F:: @ 81A083F
-Route128_Movement_1A083F:: @ 81A083F
-RustboroCity_Movement_1A083F:: @ 81A083F
-SeafloorCavern_Room9_Movement_1A083F:: @ 81A083F
-SlateportCity_Movement_1A083F:: @ 81A083F
-SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F
-SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F
-SootopolisCity_Movement_1A083F:: @ 81A083F
-VictoryRoad_1F_Movement_1A083F:: @ 81A083F
-	walk_in_place_fastest_left
-	end_movement
-
-AquaHideout_B2F_Movement_1A0841:: @ 81A0841
-CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841
-DewfordTown_Hall_Movement_1A0841:: @ 81A0841
-EverGrandeCity_ChampionsRoom_Movement_1A0841:: @ 81A0841
-EverGrandeCity_HallOfFame_Movement_1A0841:: @ 81A0841
-LilycoveCity_Harbor_Movement_1A0841:: @ 81A0841
-LittlerootTown_BrendansHouse_1F_Movement_1A0841:: @ 81A0841
-LittlerootTown_Movement_1A0841:: @ 81A0841
-MeteorFalls_1F_1R_Movement_1A0841:: @ 81A0841
-MossdeepCity_GameCorner_1F_Movement_1A0841:: @ 81A0841
-MtPyre_Summit_Movement_1A0841:: @ 81A0841
-NewMauville_Entrance_Movement_1A0841:: @ 81A0841
-PetalburgCity_Gym_Movement_1A0841:: @ 81A0841
-PetalburgCity_Movement_1A0841:: @ 81A0841
-PetalburgWoods_Movement_1A0841:: @ 81A0841
-Route110_TrickHouseEnd_Movement_1A0841:: @ 81A0841
-Route110_TrickHouseEntrance_Movement_1A0841:: @ 81A0841
-Route111_Movement_1A0841:: @ 81A0841
-Route118_Movement_1A0841:: @ 81A0841
-Route120_Movement_1A0841:: @ 81A0841
-Route121_SafariZoneEntrance_Movement_1A0841:: @ 81A0841
-Route128_Movement_1A0841:: @ 81A0841
-RustboroCity_Movement_1A0841:: @ 81A0841
-RusturfTunnel_Movement_1A0841:: @ 81A0841
-SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841
-SlateportCity_Harbor_Movement_1A0841:: @ 81A0841
-SlateportCity_Movement_1A0841:: @ 81A0841
-SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841
-	walk_in_place_fastest_up
-	end_movement
-
-AquaHideout_B2F_Movement_1A0843:: @ 81A0843
-DewfordTown_Hall_Movement_1A0843:: @ 81A0843
-EverGrandeCity_ChampionsRoom_Movement_1A0843:: @ 81A0843
-EverGrandeCity_HallOfFame_Movement_1A0843:: @ 81A0843
-LavaridgeTown_Movement_1A0843:: @ 81A0843
-LilycoveCity_DepartmentStore_1F_Movement_1A0843:: @ 81A0843
-LilycoveCity_PokemonTrainerFanClub_Movement_1A0843:: @ 81A0843
-LittlerootTown_BrendansHouse_1F_Movement_1A0843:: @ 81A0843
-LittlerootTown_BrendansHouse_2F_Movement_1A0843:: @ 81A0843
-LittlerootTown_MaysHouse_1F_Movement_1A0843:: @ 81A0843
-LittlerootTown_Movement_1A0843:: @ 81A0843
-LittlerootTown_ProfessorBirchsLab_Movement_1A0843:: @ 81A0843
-MauvilleCity_Movement_1A0843:: @ 81A0843
-MtPyre_Summit_Movement_1A0843:: @ 81A0843
-OldaleTown_Movement_1A0843:: @ 81A0843
-PetalburgCity_Gym_Movement_1A0843:: @ 81A0843
-PetalburgCity_Movement_1A0843:: @ 81A0843
-Route101_Movement_1A0843:: @ 81A0843
-Route110_Movement_1A0843:: @ 81A0843
-Route110_TrickHouseEnd_Movement_1A0843:: @ 81A0843
-Route116_Movement_1A0843:: @ 81A0843
-Route120_Movement_1A0843:: @ 81A0843
-Route128_Movement_1A0843:: @ 81A0843
-RustboroCity_Movement_1A0843:: @ 81A0843
-SlateportCity_Harbor_Movement_1A0843:: @ 81A0843
-SlateportCity_Movement_1A0843:: @ 81A0843
-SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843
-SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843
-SootopolisCity_Movement_1A0843:: @ 81A0843
-	walk_in_place_fastest_right
-	end_movement
-
-BattleTower_Outside_Movement_1A0845:: @ 81A0845
-DewfordTown_Hall_Movement_1A0845:: @ 81A0845
-EverGrandeCity_ChampionsRoom_Movement_1A0845:: @ 81A0845
-LilycoveCity_CoveLilyMotel_1F_Movement_1A0845:: @ 81A0845
-LilycoveCity_DepartmentStoreElevator_Movement_1A0845:: @ 81A0845
-LilycoveCity_Movement_1A0845:: @ 81A0845
-LilycoveCity_PokemonTrainerFanClub_Movement_1A0845:: @ 81A0845
-LittlerootTown_Movement_1A0845:: @ 81A0845
-MauvilleCity_Movement_1A0845:: @ 81A0845
-MeteorFalls_1F_1R_Movement_1A0845:: @ 81A0845
-MtPyre_Summit_Movement_1A0845:: @ 81A0845
-OldaleTown_PokemonCenter_1F_Movement_1A0845:: @ 81A0845
-PetalburgCity_Gym_Movement_1A0845:: @ 81A0845
-PetalburgCity_Movement_1A0845:: @ 81A0845
-PetalburgWoods_Movement_1A0845:: @ 81A0845
-Route110_Movement_1A0845:: @ 81A0845
-Route110_TrickHouseEnd_Movement_1A0845:: @ 81A0845
-Route119_Movement_1A0845:: @ 81A0845
-Route120_Movement_1A0845:: @ 81A0845
-Route128_Movement_1A0845:: @ 81A0845
-RustboroCity_Movement_1A0845:: @ 81A0845
-RustboroCity_PokemonSchool_Movement_1A0845:: @ 81A0845
-RusturfTunnel_Movement_1A0845:: @ 81A0845
-SeafloorCavern_Room9_Movement_1A0845:: @ 81A0845
-SlateportCity_Harbor_Movement_1A0845:: @ 81A0845
-SlateportCity_Movement_1A0845:: @ 81A0845
-SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845
-SootopolisCity_Movement_1A0845:: @ 81A0845
-SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845
-	walk_in_place_fastest_down
-	end_movement
-
-EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
-
-EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E
-	walk_up
-	walk_up
-	walk_up
-	walk_up
-	end_movement
+	.include "data/scripts/elite_four.inc"
+	.include "data/scripts/movement.inc"
+	.include "data/scripts/check_furniture.inc"
+	.include "data/text/sample_message.inc"
+	.include "data/text/record_mix.inc"
+	.include "data/text/pc.inc"
+	.include "data/text/pkmn_center_nurse.inc"
+	.include "data/text/mart_clerk.inc"
+	.include "data/text/obtain_item.inc"
 
-EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853
-	delay_16
-	delay_16
-	end_movement
-
-Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856
-	walk_up
-	end_movement
-
-@ 81A0858
-	walk_up
-	walk_up
-	end_movement
-
-PictureBookShelfScript:: @ 81A085B
-	msgbox PictureBookShelfText, 3
-	end
-
-BookshelfScript:: @ 81A0864
-	msgbox BookshelfText, 3
-	end
-
-PokemonCenterBookshelfScript:: @ 81A086D
-	msgbox PokemonCenterBookshelfText, 3
-	end
-
-VaseScript:: @ 81A0876
-	msgbox VaseText, 3
-	end
-
-TrashCanScript:: @ 81A087F
-	msgbox TrashCanText, 3
-	end
-
-ShopShelfScript:: @ 81A0888
-	msgbox ShopShelfText, 3
-	end
-
-BlueprintScript:: @ 81A0891
-	msgbox BlueprintText, 3
-	end
-
-SampleMessage1:: @ 81A089A
-	.string "This is sample message 1.\p"
-	.string "Welcome to the world of\n"
-	.string "POKéMON AGB!\l"
-	.string "We hope you enjoy this!$"
-
-SampleMessage2:: @ 81A08F1
-	.string "This is sample message 2.\p"
-	.string "Welcome to the world of\n"
-	.string "POKéMON AGB!\l"
-	.string "We hope you enjoy this!$"
-
-SampleMessage3:: @ 81A0948
-	.string "This is sample message 3.\p"
-	.string "Welcome to the world of\n"
-	.string "POKéMON AGB!\l"
-	.string "We hope you enjoy this!$"
-
-UnusedMixRecordsPromptText: @ 81A099F
-	.string "Would you like to mix records with other\n"
-	.string "TRAINERS?$"
-
-UnusedMixRecordsSeeYouAgainText: @ 81A09D2
-	.string "We hope to see you again!$"
-
-UnknownString_81A09EC: @ 81A09EC
-	.string "{PLAYER} booted up the PC.$"
-
-gPCText_WhichPCShouldBeAccessed:: @ 81A0A01
-	.string "Which PC should be accessed?$"
-
-UnknownString_81A0A1E: @ 81A0A1E
-	.string "Accessed someone's PC.$"
-
-UnknownString_81A0A35: @ 81A0A35
-	.string "POKéMON Storage System opened.$"
-
-UnknownString_81A0A54: @ 81A0A54
-	.string "Accessed {PLAYER}'s PC.$"
-
-UnknownString_81A0A66: @ 81A0A66
-	.string "Accessed LANETTE's PC.$"
-
-gText_NurseJoy_Welcome:: @ 81A0A7D
-	.string "Hello, and welcome to the POKéMON\n"
-	.string "CENTER.\p"
-	.string "We restore your tired POKéMON to\n"
-	.string "full health.\p"
-	.string "Would you like to rest your POKéMON?$"
-
-gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
-	.string "We hope to see you again!$"
-
-gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
-	.string "Thank you for waiting.\p"
-	.string "We've restored your POKéMON to\n"
-	.string "full health.$"
-
-UnknownString_81A0B57: @ 81A0B57
-	.string "Welcome to the POKéMON CABLE CLUB\n"
-	.string "TRADE CENTER.$"
-
-UnknownString_81A0B87: @ 81A0B87
-	.string "Welcome to the POKéMON CABLE CLUB\n"
-	.string "COLOSSEUM.$"
-
-UnknownString_81A0BB4: @ 81A0BB4
-	.string "Welcome to the POKéMON CABLE CLUB\n"
-	.string "TIME CAPSULE.$"
-
-EverGrandeCity_PokemonLeague_Text_1A0BE4:: @ 81A0BE4
-FallarborTown_Mart_Text_1A0BE4:: @ 81A0BE4
-FortreeCity_DecorationShop_Text_1A0BE4:: @ 81A0BE4
-FortreeCity_Mart_Text_1A0BE4:: @ 81A0BE4
-LavaridgeTown_Mart_Text_1A0BE4:: @ 81A0BE4
-LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4:: @ 81A0BE4
-LilycoveCity_DepartmentStore_2F_Text_1A0BE4:: @ 81A0BE4
-LilycoveCity_DepartmentStore_3F_Text_1A0BE4:: @ 81A0BE4
-LilycoveCity_DepartmentStore_4F_Text_1A0BE4:: @ 81A0BE4
-LilycoveCity_DepartmentStore_5F_Text_1A0BE4:: @ 81A0BE4
-MauvilleCity_Mart_Text_1A0BE4:: @ 81A0BE4
-MossdeepCity_Mart_Text_1A0BE4:: @ 81A0BE4
-OldaleTown_Mart_Text_1A0BE4:: @ 81A0BE4
-PetalburgCity_Mart_Text_1A0BE4:: @ 81A0BE4
-RustboroCity_Mart_Text_1A0BE4:: @ 81A0BE4
-SlateportCity_Mart_Text_1A0BE4:: @ 81A0BE4
-SlateportCity_Text_1A0BE4:: @ 81A0BE4
-SootopolisCity_Mart_Text_1A0BE4:: @ 81A0BE4
-VerdanturfTown_Mart_Text_1A0BE4:: @ 81A0BE4
-	.string "Welcome!\p"
-	.string "How may I serve you?$"
-
-EverGrandeCity_PokemonLeague_Text_1A0C02:: @ 81A0C02
-FallarborTown_Mart_Text_1A0C02:: @ 81A0C02
-FortreeCity_DecorationShop_Text_1A0C02:: @ 81A0C02
-FortreeCity_Mart_Text_1A0C02:: @ 81A0C02
-LavaridgeTown_HerbShop_Text_1A0C02:: @ 81A0C02
-LavaridgeTown_Mart_Text_1A0C02:: @ 81A0C02
-LilycoveCity_DepartmentStoreRooftop_Text_1A0C02:: @ 81A0C02
-LilycoveCity_DepartmentStore_2F_Text_1A0C02:: @ 81A0C02
-LilycoveCity_DepartmentStore_3F_Text_1A0C02:: @ 81A0C02
-LilycoveCity_DepartmentStore_4F_Text_1A0C02:: @ 81A0C02
-LilycoveCity_DepartmentStore_5F_Text_1A0C02:: @ 81A0C02
-MauvilleCity_Mart_Text_1A0C02:: @ 81A0C02
-MossdeepCity_Mart_Text_1A0C02:: @ 81A0C02
-OldaleTown_Mart_Text_1A0C02:: @ 81A0C02
-PetalburgCity_Mart_Text_1A0C02:: @ 81A0C02
-Route104_PrettyPetalFlowerShop_Text_1A0C02:: @ 81A0C02
-RustboroCity_Mart_Text_1A0C02:: @ 81A0C02
-SlateportCity_Mart_Text_1A0C02:: @ 81A0C02
-SlateportCity_Text_1A0C02:: @ 81A0C02
-SootopolisCity_Mart_Text_1A0C02:: @ 81A0C02
-VerdanturfTown_Mart_Text_1A0C02:: @ 81A0C02
-	.string "Please come again!$"
-
-UnknownString_81A0C15: @ 81A0C15
-	.string "Welcome!\p"
-	.string "We're having a discount sale today!$"
-
-Route104_PrettyPetalFlowerShop_Text_1A0C42:: @ 81A0C42
-	.string "{PLAYER}{KUN}, welcome!\p"
-	.string "What can I do for you?$"
-
-Message_ObtainedItem: @ 81A0C68
-	.string "Obtained the {STR_VAR_2}.$"
-
-LilycoveCity_DepartmentStoreRooftop_Text_1A0C79:: @ 81A0C79
-	.string "The BAG is full...$"
-
-LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C:: @ 81A0C8C
-Message_PutAwayItem:
-	.string "{PLAYER} put away the {STR_VAR_2}\n"
-	.string "in the {STR_VAR_3} POCKET.$"
-
-Message_FoundOneItem:
-	.string "{PLAYER} found one {STR_VAR_2}!$"
-
-MauvilleCity_GameCorner_Text_1A0CC2:: @ 81A0CC2
-MauvilleCity_Text_1A0CC2:: @ 81A0CC2
-MtChimney_Text_1A0CC2:: @ 81A0CC2
-OldaleTown_Text_1A0CC2:: @ 81A0CC2
-Route109_SeashoreHouse_Text_1A0CC2:: @ 81A0CC2
-Message_BagFull:
-	.string "Too bad!\n"
-	.string "The BAG is full...$"
-
-Message_ObtainedDecoration: @ 81A0CDE
-	.string "Obtained the {STR_VAR_2}.$"
-
-BattleTower_Lobby_Text_1A0CEF:: @ 81A0CEF
-MauvilleCity_GameCorner_Text_1A0CEF:: @ 81A0CEF
-Route114_LanettesHouse_Text_1A0CEF:: @ 81A0CEF
-SootopolisCity_House6_Text_1A0CEF:: @ 81A0CEF
-	.string "Too bad! There's no room left for\n"
-	.string "another {STR_VAR_2}...$"
-
-Message_TransferredToPC: @ 81A0D1F
-	.string "The {STR_VAR_2} was transferred\n"
-	.string "to the PC.$"
-
-PetalburgCity_Text_1A0D41:: @ 81A0D41
+Text_PokemartSign:: @ 81A0D41
 	.string "“Selected items for your convenience!”\n"
 	.string "POKéMON MART$"
 
-PetalburgCity_Text_1A0D75:: @ 81A0D75
+Text_PokemonCenterSign:: @ 81A0D75
 	.string "“Rejuvenate your tired partners!”\n"
 	.string "POKéMON CENTER$"
 
@@ -3244,7 +1139,7 @@ FallarborTown_House1_Text_1A1498:: @ 81A1498
 	.string "{STR_VAR_1}.$"
 
 Event_NoRegisteredItem:: @ 81A14AF
-	msgbox Text_NoRegisteredItem, 3
+	msgbox Text_NoRegisteredItem, MSGBOX_SIGN
 	end
 
 gUnknown_081A14B8:: @ 81A14B8
@@ -3262,1099 +1157,26 @@ EventScript_1A14CA::
 	waitbuttonpress
 	special sub_8081924
 	waitstate
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sp0C8_whiteout_maybe
 	waitstate
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_1A14DC:: @ 81A14DC
-PacifidlogTown_House2_EventScript_1A14DC:: @ 81A14DC
-Route101_EventScript_1A14DC:: @ 81A14DC
+Common_EventScript_Return:: @ 81A14DC
 	return
 
 	.include "data/scripts/debug.inc"
 	.include "data/scripts/berry_tree.inc"
 	.include "data/text/berry_tree.inc"
-
-UnknownString_81A1948: @ 81A1948
-	.string "If some vines drop down, this tree can\n"
-	.string "be climbed.$"
-
-UnknownString_81A197B: @ 81A197B
-	.string "If some vines drop down, this tree can\n"
-	.string "be climbed.\p"
-	.string "Use the SECRET POWER?$"
-
-UnknownString_81A19C4: @ 81A19C4
-	.string "A thick vine dropped down!$"
-
-UnknownString_81A19DF: @ 81A19DF
-	.string "Want to make your SECRET BASE here?$"
-
-UnknownString_81A1A03: @ 81A1A03
-	.string "If this clump of grass can be moved,\n"
-	.string "it might be possible to go inside.$"
-
-UnknownString_81A1A4B: @ 81A1A4B
-	.string "If this clump of grass can be moved,\n"
-	.string "it might be possible to go inside.\p"
-	.string "Use the SECRET POWER?$"
-
-UnknownString_81A1AA9: @ 81A1AA9
-	.string "Discovered a small entrance!$"
-
-UnknownString_81A1AC6: @ 81A1AC6
-	.string "Want to make your SECRET BASE here?$"
-
-SecretBase_RedCave1_Text_1A1AEA:: @ 81A1AEA
-	.string "Have you made a SECRET BASE already?\p"
-	.string "I went here, there, everywhere before\n"
-	.string "choosing this place.\p"
-	.string "Since you're already here, how would\n"
-	.string "you like to battle?$"
-
-SecretBase_RedCave1_Text_1A1B83:: @ 81A1B83
-	.string "Okay!\n"
-	.string "Here we come!$"
-
-SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97
-	.string "Hunh?\n"
-	.string "Oh, you can't now...$"
-
-UnknownString_81A1BB2:: @ 81A1BB2
-	.string "Waaargh! You're too strong!\n"
-	.string "About me losing... Please keep it secret!$"
-
-SecretBase_RedCave1_Text_1A1BF8:: @ 81A1BF8
-	.string "What do you think of my SECRET BASE?\n"
-	.string "Come visit me again tomorrow.$"
-
-SecretBase_RedCave1_Text_1A1C3B:: @ 81A1C3B
-	.string "Have you made a SECRET BASE already?\p"
-	.string "I went here, there, everywhere before\n"
-	.string "choosing this place.\p"
-	.string "Feel free to hang out!$"
-
-SecretBase_RedCave1_Text_1A1CB2:: @ 81A1CB2
-	.string "There're a lot of places where you can\n"
-	.string "make a SECRET BASE.\p"
-	.string "But I like this spot best.\n"
-	.string "Don't you think it's nice?\p"
-	.string "Oh, would you like to have a battle?$"
-
-SecretBase_RedCave1_Text_1A1D48:: @ 81A1D48
-	.string "Okay, here goes!$"
-
-SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59
-	.string "Oh...\n"
-	.string "You can't now, okay.$"
-
-UnknownString_81A1D74:: @ 81A1D74
-	.string "Hmmm... It's our loss...\n"
-	.string "But don't tell anyone!\l"
-	.string "It's a confidential secret!$"
-
-SecretBase_RedCave1_Text_1A1DC0:: @ 81A1DC0
-	.string "If you're in this area again, I hope\n"
-	.string "you'll visit me.$"
-
-SecretBase_RedCave1_Text_1A1DF6:: @ 81A1DF6
-	.string "There're a lot of places where you can\n"
-	.string "make a SECRET BASE.\p"
-	.string "But I like this spot best.\n"
-	.string "Don't you think it's nice?$"
-
-SecretBase_RedCave1_Text_1A1E67:: @ 81A1E67
-	.string "This is a popular spot.\n"
-	.string "It's always taken.\p"
-	.string "Oh! Were you thinking about taking this\n"
-	.string "spot, too?\p"
-	.string "I'll tell you what, you can have this\n"
-	.string "spot if you can beat me.$"
-
-SecretBase_RedCave1_Text_1A1F04:: @ 81A1F04
-	.string "Okay!\n"
-	.string "I'm going to defend my SECRET BASE!$"
-
-SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E
-	.string "Hunh? Is that right?\n"
-	.string "You're not interested in this spot?$"
-
-UnknownString_81A1F67:: @ 81A1F67
-	.string "I can't keep going!\n"
-	.string "I surrender!$"
-
-SecretBase_RedCave1_Text_1A1F88:: @ 81A1F88
-	.string "Okay, when I move one day, this place\n"
-	.string "will be yours!$"
-
-SecretBase_RedCave1_Text_1A1FBD:: @ 81A1FBD
-	.string "This is a popular spot.\n"
-	.string "It's always taken.\p"
-	.string "I waited a long time for it to open.\n"
-	.string "I finally got to use it!$"
-
-SecretBase_RedCave1_Text_1A2026:: @ 81A2026
-	.string "Welcome to my POKéMON LAB.\p"
-	.string "I carry out research on battling in\n"
-	.string "secrecy.\p"
-	.string "Would you like to see how strong I am?$"
-
-SecretBase_RedCave1_Text_1A2095:: @ 81A2095
-	.string "I'm going to go all out!$"
-
-SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE
-	.string "Oh.\n"
-	.string "Some other time, then!$"
-
-UnknownString_81A20C9:: @ 81A20C9
-	.string "Hmm... I've still got lots to learn.\n"
-	.string "I have to study some more.$"
-
-SecretBase_RedCave1_Text_1A2109:: @ 81A2109
-	.string "Thanks for battling with me.\n"
-	.string "Please come back again tomorrow.$"
-
-SecretBase_RedCave1_Text_1A2147:: @ 81A2147
-	.string "Welcome to my POKéMON LAB.\p"
-	.string "I carry out research on battling in\n"
-	.string "secrecy.$"
-
-SecretBase_RedCave1_Text_1A218F:: @ 81A218F
-	.string "A big mansion is nice, but I like this\n"
-	.string "sort of place more.\p"
-	.string "I like it because all kinds of people\n"
-	.string "come visit me.\p"
-	.string "So, how would you like a battle?$"
-
-SecretBase_RedCave1_Text_1A2220:: @ 81A2220
-	.string "That's the way!$"
-
-SecretBase_RedCave1_Text_1A2230:: @ 81A2230
-	.string "When you're ready, give me a shout!$"
-
-UnknownString_81A2254:: @ 81A2254
-	.string "Aww! Done in!\n"
-	.string "But it's still fun to battle!$"
-
-SecretBase_RedCave1_Text_1A2280:: @ 81A2280
-	.string "Well, anyway, I should go buy some\n"
-	.string "decorations and furniture.\p"
-	.string "I want my SECRET BASE to be a place\n"
-	.string "other people can enjoy.$"
-
-SecretBase_RedCave1_Text_1A22FA:: @ 81A22FA
-	.string "A big mansion is nice, but I like this\n"
-	.string "sort of place more.\p"
-	.string "I like it because all kinds of people\n"
-	.string "come visit me.$"
-
-SecretBase_RedCave1_Text_1A236A:: @ 81A236A
-	.string "I simply adore shopping for decorations\n"
-	.string "and furniture.\p"
-	.string "I also love raising POKéMON just\n"
-	.string "as much.\p"
-	.string "If you would be so kind, will you battle\n"
-	.string "with my POKéMON?$"
-
-SecretBase_RedCave1_Text_1A2405:: @ 81A2405
-	.string "Thank you.\n"
-	.string "Shall we begin?$"
-
-SecretBase_RedCave1_Text_1A2420:: @ 81A2420
-	.string "Oh.\n"
-	.string "How disappointing...$"
-
-UnknownString_81A2439:: @ 81A2439
-	.string "I concede...$"
-
-SecretBase_RedCave1_Text_1A2446:: @ 81A2446
-	.string "That was all in good fun!\n"
-	.string "I should go enjoy shopping now.$"
-
-SecretBase_RedCave1_Text_1A2480:: @ 81A2480
-	.string "I simply adore shopping for decorations\n"
-	.string "and furniture.\p"
-	.string "I also love raising POKéMON just\n"
-	.string "as much.$"
-
-SecretBase_RedCave1_Text_1A24E1:: @ 81A24E1
-	.string "Some people make their SECRET BASES in\n"
-	.string "hard-to-find places.\l"
-	.string "Do they want to just lie low?\p"
-	.string "But since you found me, how about we\n"
-	.string "have a battle?$"
-
-SecretBase_RedCave1_Text_1A256F:: @ 81A256F
-	.string "I'm not going down easily!$"
-
-SecretBase_RedCave1_Text_1A258A:: @ 81A258A
-	.string "Oh... Are you maybe tired from searching\n"
-	.string "for this place?$"
-
-UnknownString_81A25C3:: @ 81A25C3
-	.string "I went down...$"
-
-SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2
-	.string "Where's your SECRET BASE?\n"
-	.string "I should go visit you there.$"
-
-SecretBase_RedCave1_Text_1A2609:: @ 81A2609
-	.string "Some people make their SECRET BASES in\n"
-	.string "hard-to-find places.\l"
-	.string "Do they want to just lie low?$"
-
-SecretBase_RedCave1_Text_1A2663:: @ 81A2663
-	.string "People have told me that you can get\n"
-	.string "decorations in several ways.\p"
-	.string "We should have a race to see who can\n"
-	.string "get nicer decorations and furniture!\p"
-	.string "In the meantime, want to battle?$"
-
-SecretBase_RedCave1_Text_1A2710:: @ 81A2710
-	.string "This is my SECRET BASE.\n"
-	.string "I can't lose!$"
-
-SecretBase_RedCave1_Text_1A2736:: @ 81A2736
-	.string "I'll battle with you anytime.$"
-
-UnknownString_81A2754:: @ 81A2754
-	.string "Huh?\n"
-	.string "Did I just lose?$"
-
-SecretBase_RedCave1_Text_1A276A:: @ 81A276A
-	.string "I won't lose at collecting decorations.\n"
-	.string "Come visit again!$"
-
-SecretBase_RedCave1_Text_1A27A4:: @ 81A27A4
-	.string "People have told me that you can get\n"
-	.string "decorations in several ways.\p"
-	.string "We should have a race to see who can\n"
-	.string "get nicer decorations and furniture!$"
-
-SecretBase_RedCave1_Text_1A2830:: @ 81A2830
-	.string "I found a spot I liked, and I did it up\n"
-	.string "with my favorite decorations.\p"
-	.string "I raise my favorite POKéMON and grow\n"
-	.string "stronger with it.\p"
-	.string "That's what I do.\n"
-	.string "Want to battle with me?$"
-
-SecretBase_RedCave1_Text_1A28D7:: @ 81A28D7
-	.string "Show me what you're made of!$"
-
-SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4
-	.string "I guess there are times when you're not\n"
-	.string "into it.$"
-
-UnknownString_81A2925:: @ 81A2925
-	.string "I know exactly what you're made of now.$"
-
-SecretBase_RedCave1_Text_1A294D:: @ 81A294D
-	.string "We can both become stronger.\n"
-	.string "Let's keep at it!$"
-
-SecretBase_RedCave1_Text_1A297C:: @ 81A297C
-	.string "I found a spot I liked, and I did it up\n"
-	.string "with my favorite decorations.\p"
-	.string "I raise my favorite POKéMON and grow\n"
-	.string "stronger with it.\p"
-	.string "Every day is a great day.$"
-
-SecretBase_RedCave1_Text_1A2A13:: @ 81A2A13
-	.string "You can learn a lot about the taste\n"
-	.string "and sense of people by the kinds of\l"
-	.string "decorations they have, and how they\l"
-	.string "display them.\p"
-	.string "What do you think of my taste?\n"
-	.string "Are you speechless?\p"
-	.string "Want to see my taste in battling?$"
-
-SecretBase_RedCave1_Text_1A2AE2:: @ 81A2AE2
-	.string "There's no holding back!$"
-
-SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB
-	.string "I'll be happy to demonstrate my style\n"
-	.string "anytime.$"
-
-UnknownString_81A2B2A:: @ 81A2B2A
-	.string "You're supremely talented!\n"
-	.string "Your power seems to be limitless...$"
-
-SecretBase_RedCave1_Text_1A2B69:: @ 81A2B69
-	.string "What did you think of my style?\n"
-	.string "I'll keep on polishing it!$"
-
-SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
-	.string "You can learn a lot about the taste\n"
-	.string "and sense of people by the kinds of\l"
-	.string "decorations they have, and how they\l"
-	.string "display them.\p"
-	.string "What do you think of my taste?\n"
-	.string "Are you speechless?$"
-
-gUnknown_081A2C51:: @ 81A2C51
-	special sub_80BB70C
-	special CheckPlayerHasSecretBase
-	compare VAR_RESULT, 1
-	goto_if_eq AskToMoveSecretBase
-	checkpartymove MOVE_SECRET_POWER
-	setfieldeffectargument 0, VAR_RESULT
-	buffermovename 1, MOVE_SECRET_POWER
-	compare VAR_0x8007, 1
-	goto_if_eq EventScript_1A2CB0
-	compare VAR_0x8007, 2
-	goto_if_eq EventScript_1A2CB0
-	compare VAR_0x8007, 3
-	goto_if_eq EventScript_1A2CB0
-	compare VAR_0x8007, 4
-	goto_if_eq EventScript_1A2CB0
-	compare VAR_0x8007, 5
-	goto_if_eq EventScript_1A2D08
-	compare VAR_0x8007, 6
-	goto_if_eq EventScript_1A2D60
-	end
-
-EventScript_1A2CB0:
-	lockall
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_1A2CF1
-	bufferpartymonnick 0, VAR_RESULT
-	msgbox UnknownString_8198F34, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	msgbox UsedCutRockSmashText, 4
-	closemessage
-	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
-	waitstate
-	goto EventScript_1A2CFA
-	end
-
-DoSecretBaseCaveFieldEffectScript:: @ 81A2CE6
-	lockall
-	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
-	waitstate
-	goto EventScript_1A2CFA
-	end
-
-EventScript_1A2CF1:
-	msgbox UnknownString_8198F10, 3
-	end
-
-EventScript_1A2CFA:
-	msgbox UnknownString_8198F6E, 4
-	goto EventScript_1A2DB8
-	end
-
-EventScript_1A2D08:
-	lockall
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_1A2D49
-	bufferpartymonnick 0, VAR_RESULT
-	msgbox UnknownString_81A197B, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	msgbox UsedCutRockSmashText, 4
-	closemessage
-	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
-	waitstate
-	goto EventScript_1A2D52
-	end
-
-DoSecretBaseTreeFieldEffectScript:: @ 81A2D3E
-	lockall
-	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
-	waitstate
-	goto EventScript_1A2D52
-	end
-
-EventScript_1A2D49:
-	msgbox UnknownString_81A1948, 3
-	end
-
-EventScript_1A2D52:
-	msgbox UnknownString_81A19C4, 4
-	goto EventScript_1A2DB8
-	end
-
-EventScript_1A2D60:
-	lockall
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_1A2DA1
-	bufferpartymonnick 0, VAR_RESULT
-	msgbox UnknownString_81A1A4B, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	msgbox UsedCutRockSmashText, 4
-	closemessage
-	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
-	waitstate
-	goto EventScript_1A2DAA
-	end
-
-DoSecretBaseShrubFieldEffectScript:: @ 81A2D96
-	lockall
-	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
-	waitstate
-	goto EventScript_1A2DAA
-	end
-
-EventScript_1A2DA1:
-	msgbox UnknownString_81A1A03, 3
-	end
-
-EventScript_1A2DAA:
-	msgbox UnknownString_81A1AA9, 4
-	goto EventScript_1A2DB8
-	end
-
-EventScript_1A2DB8:
-	closemessage
-	playse SE_KAIDAN
-	setvar VAR_0x4097, 0
-	setflag FLAG_DECORATION_1
-	special sub_80BB8CC
-	special sub_80BBAF0
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	special sub_80BBDD0
-	setvar VAR_0x4089, 1
-	waitstate
-	end
-
-SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
-	applymovement 255, SecretBase_RedCave1_Movement_1A2E11
-	waitmovement 0
-	setvar VAR_0x4097, 1
-	msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
-	closemessage
-	playse SE_KAIDAN
-	special sub_80BC440
-	end
-
-SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
-	closemessage
-	setflag FLAG_RECEIVED_SECRET_POWER
-	special sub_80BBC78
-	waitstate
-	end
-
-SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
-	walk_up
-	walk_up
-	end_movement
-
-gUnknown_081A2E14:: @ 81A2E14
-	lockall
-	setvar VAR_0x4097, 1
-	playse SE_KAIDAN
-	special sub_80BC114
-	compare VAR_RESULT, 0
-	goto_if_eq EventScript_1A2E38
-	clearflag FLAG_DECORATION_1
-	special sub_80BBAF0
-	setvar VAR_0x4089, 0
-	waitstate
-	end
-
-EventScript_1A2E38:
-	setflag FLAG_DECORATION_1
-	special sub_80BBAF0
-	setvar VAR_0x4089, 0
-	waitstate
-	end
-
-AskToMoveSecretBase:
-	checkpartymove MOVE_SECRET_POWER
-	compare VAR_RESULT, 6
-	goto_if_eq EventScript_1A2EF7
-	setfieldeffectargument 0, VAR_RESULT
-	setorcopyvar VAR_0x8004, VAR_RESULT
-	lockall
-	special GetSecretBaseNearbyMapName
-	msgbox UnknownString_81A3C71, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	msgbox UnknownString_81A38FB, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	fadescreen 1
-	special MoveSecretBase
-	closemessage
-	fadescreen 0
-	msgbox UnknownString_81A3CC9, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq EventScript_1A2F3A
-	bufferpartymonnick 0, VAR_0x8004
-	buffermovename 1, MOVE_SECRET_POWER
-	msgbox UsedCutRockSmashText, 4
-	closemessage
-	closemessage
-	compare VAR_0x8007, 1
-	goto_if_eq DoSecretBaseCaveFieldEffectScript
-	compare VAR_0x8007, 2
-	goto_if_eq DoSecretBaseCaveFieldEffectScript
-	compare VAR_0x8007, 3
-	goto_if_eq DoSecretBaseCaveFieldEffectScript
-	compare VAR_0x8007, 4
-	goto_if_eq DoSecretBaseCaveFieldEffectScript
-	compare VAR_0x8007, 5
-	goto_if_eq DoSecretBaseTreeFieldEffectScript
-	compare VAR_0x8007, 6
-	goto_if_eq DoSecretBaseShrubFieldEffectScript
-	releaseall
-	end
-
-EventScript_1A2EF7::
-	compare VAR_0x8007, 1
-	goto_if_eq EventScript_1A2CF1
-	compare VAR_0x8007, 2
-	goto_if_eq EventScript_1A2CF1
-	compare VAR_0x8007, 3
-	goto_if_eq EventScript_1A2CF1
-	compare VAR_0x8007, 4
-	goto_if_eq EventScript_1A2CF1
-	compare VAR_0x8007, 5
-	goto_if_eq EventScript_1A2D49
-	compare VAR_0x8007, 6
-	goto_if_eq EventScript_1A2DA1
-	end
-
-EventScript_1A2F3A::
-	closemessage
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
-LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D
-SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D
-	setflag FLAG_DECORATION_2
-	setflag FLAG_DECORATION_3
-	setflag FLAG_DECORATION_4
-	setflag FLAG_DECORATION_5
-	setflag FLAG_DECORATION_6
-	setflag FLAG_DECORATION_7
-	setflag FLAG_DECORATION_8
-	setflag FLAG_DECORATION_9
-	setflag FLAG_DECORATION_10
-	setflag FLAG_DECORATION_11
-	setflag FLAG_DECORATION_12
-	setflag FLAG_DECORATION_13
-	setflag FLAG_DECORATION_14
-	setflag FLAG_DECORATION_15
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68
-LittlerootTown_MaysHouse_2F_EventScript_1A2F68:: @ 81A2F68
-SecretBase_RedCave1_EventScript_1A2F68:: @ 81A2F68
-	setvar VAR_0x8004, 0
-	setvar VAR_0x8005, 0
-	special sub_80BBDD0
-	setvar VAR_0x4089, 1
-	end
-
-gUnknown_081A2F7B:: @ 81A2F7B
-	setvar VAR_0x8005, 0
-	goto EventScript_1A2F86
-	end
-
-EventScript_1A2F86:
-	special sub_80FF474
-	end
-
-gUnknown_081A2F8A:: @ 81A2F8A
-	setvar VAR_0x8004, 0
-	goto EventScript_1A2F95
-	end
-
-EventScript_1A2F95:
-	special sub_8100A7C
-	compare VAR_RESULT, 1
-	goto_if_eq EventScript_1A2FBF
-	addvar VAR_0x8004, 1
-	compare VAR_0x8005, 0
-	goto_if_eq EventScript_1A2F95
-	removeobject VAR_0x8006
-	setflag VAR_0x8005
-	goto EventScript_1A2F95
-	end
-
-EventScript_1A2FBF:
-	end
-
-SecretBase_BlueCave1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BlueCave2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BlueCave3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BlueCave4_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BrownCave1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BrownCave2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BrownCave3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_BrownCave4_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_RedCave1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_RedCave2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_RedCave3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_RedCave4_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Shrub1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Shrub2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Shrub3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Shrub4_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Tree1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Tree2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Tree3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_Tree4_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_YellowCave1_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0
-SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
-	special sub_80BCE90
-	compare VAR_0x8004, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3032
-	compare VAR_0x8004, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A30AE
-	compare VAR_0x8004, 2
-	goto_if_eq SecretBase_RedCave1_EventScript_1A312A
-	compare VAR_0x8004, 3
-	goto_if_eq SecretBase_RedCave1_EventScript_1A31A6
-	compare VAR_0x8004, 4
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3222
-	compare VAR_0x8004, 5
-	goto_if_eq SecretBase_RedCave1_EventScript_1A329E
-	compare VAR_0x8004, 6
-	goto_if_eq SecretBase_RedCave1_EventScript_1A331A
-	compare VAR_0x8004, 7
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3396
-	compare VAR_0x8004, 8
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3412
-	compare VAR_0x8004, 9
-	goto_if_eq SecretBase_RedCave1_EventScript_1A348E
-	end
-
-SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1B83, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
-	msgbox SecretBase_RedCave1_Text_1A1C3B, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1B97, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
-	msgbox SecretBase_RedCave1_Text_1A1BF8, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1F04, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
-	msgbox SecretBase_RedCave1_Text_1A1FBD, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1F2E, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
-	msgbox SecretBase_RedCave1_Text_1A1F88, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2220, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
-	msgbox SecretBase_RedCave1_Text_1A22FA, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2230, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
-	msgbox SecretBase_RedCave1_Text_1A2280, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A256F, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
-	msgbox SecretBase_RedCave1_Text_1A2609, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A258A, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
-	msgbox SecretBase_RedCave1_Text_1A25D2, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A28D7, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
-	msgbox SecretBase_RedCave1_Text_1A297C, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A28F4, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
-	msgbox SecretBase_RedCave1_Text_1A294D, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1D48, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
-	msgbox SecretBase_RedCave1_Text_1A1DF6, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A1D59, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
-	msgbox SecretBase_RedCave1_Text_1A1DC0, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2095, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
-	msgbox SecretBase_RedCave1_Text_1A2147, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A20AE, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
-	msgbox SecretBase_RedCave1_Text_1A2109, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2405, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
-	msgbox SecretBase_RedCave1_Text_1A2480, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2420, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
-	msgbox SecretBase_RedCave1_Text_1A2446, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2710, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
-	msgbox SecretBase_RedCave1_Text_1A27A4, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2736, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
-	msgbox SecretBase_RedCave1_Text_1A276A, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2
-	compare VAR_RESULT, 1
-	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
-	lock
-	faceplayer
-	msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO
-	compare VAR_RESULT, NO
-	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
-	setvar VAR_RESULT, 1
-	special sub_80BCE4C
-	call S_DoSaveDialog
-	compare VAR_RESULT, 0
-	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2AE2, 4
-	goto SecretBase_RedCave1_EventScript_1A350A
-	end
-
-SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
-	msgbox SecretBase_RedCave1_Text_1A2BA4, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
-	setvar VAR_RESULT, 0
-	special sub_80BCE4C
-	erasebox 0, 0, 15, 10
-	msgbox SecretBase_RedCave1_Text_1A2AFB, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501
-	msgbox SecretBase_RedCave1_Text_1A2B69, 2
-	end
-
-SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
-	special sub_80BCE1C
-	setvar VAR_0x8004, 1
-	setvar VAR_0x8005, 0
-	special StartSpecialBattle
-	waitstate
-	special ScrSpecial_HealPlayerParty
-	release
-	end
-
+	.include "data/text/secret_base_trainers.inc"
+	.include "data/scripts/secret_base.inc"
 	.include "data/text/secret_power_tm.inc"
 	.include "data/scripts/secret_power_tm.inc"
-
-UnknownString_81A38FB: @ 81A38FB
-	.string "All decorations and furniture in your\n"
-	.string "SECRET BASE will be returned to your PC.\p"
-	.string "Is that okay?$"
-
-UnknownString_81A3958: @ 81A3958
-	.string "Do you want to register\n"
-	.string "{STR_VAR_1}'s SECRET BASE?$"
-
-UnknownString_81A3982: @ 81A3982
-	.string "This data is already registered.\n"
-	.string "Would you like to delete it?$"
-
-UnknownString_81A39C0: @ 81A39C0
-	.string "Up to 10 locations can be registered.\p"
-	.string "Delete a location if you want to\n"
-	.string "register another location.$"
-
-UnknownString_81A3A22: @ 81A3A22
-	.string "Registration completed.$"
-
-UnknownString_81A3A3A: @ 81A3A3A
-	.string "Data has been unregistered.$"
-
-UnknownString_81A3A56: @ 81A3A56
-	.string "There are no decorations...$"
-
-UnknownString_81A3A72: @ 81A3A72
-	.string "{PLAYER} booted up the PC.$"
-
-UnknownString_81A3A87: @ 81A3A87
-	.string "What would you like to do?$"
-
-UnknownString_81A3AA2: @ 81A3AA2
-	.string "The registered SECRET BASE will remain\n"
-	.string "unless the owner moves away.\p"
-	.string "If it is removed from the registry,\n"
-	.string "another SECRET BASE may take its place.\p"
-	.string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$"
-
-UnknownString_81A3B5B: @ 81A3B5B
-	.string "A shield of {STR_VAR_2} that marks winning\n"
-	.string "{STR_VAR_1} times in a row at the BATTLE TOWER.$"
-
-UnknownString_81A3BA4: @ 81A3BA4
-	.string "A realistic toy TV. It could be easily\n"
-	.string "mistaken for the real thing.$"
-
-UnknownString_81A3BE8: @ 81A3BE8
-	.string "A toy TV shaped like a SEEDOT.\n"
-	.string "It looks ready to roll away on its own...$"
-
-UnknownString_81A3C31: @ 81A3C31
-	.string "A toy TV shaped like a SKITTY.\n"
-	.string "It looks ready to stroll away...$"
-
-UnknownString_81A3C71: @ 81A3C71
-	.string "You may only make one SECRET BASE.\p"
-	.string "Would you like to move from the SECRET\n"
-	.string "BASE near {STR_VAR_1}?$"
-
-UnknownString_81A3CC9: @ 81A3CC9
-	.string "Moving completed.\p"
-	.string "Would you like to use the SECRET POWER?$"
-
+	.include "data/text/secret_base.inc"
 	.include "data/scripts/cable_club.inc"
 	.include "data/text/cable_club.inc"
-
 	.include "data/scripts/contest_hall.inc"
 	.include "data/text/contest_hall.inc"
-
 	.include "data/scripts/tv.inc"
 	.include "data/text/tv.inc"
 
@@ -4381,11 +1203,11 @@ SlateportCity_PokemonFanClub_EventScript_1ADE4D:: @ 81ADE4D
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84
-	msgbox SlateportCity_PokemonFanClub_Text_1A87CA, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A87CA, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 5
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 1
-	call SlateportCity_PokemonFanClub_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4395,18 +1217,18 @@ SlateportCity_PokemonFanClub_EventScript_1ADE84:: @ 81ADE84
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADEB9:: @ 81ADEB9
-	msgbox SlateportCity_PokemonFanClub_Text_1A8667, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A8667, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADEC3:: @ 81ADEC3
-	msgbox SlateportCity_PokemonFanClub_Text_1A8818, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A8818, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 1
 	goto SlateportCity_PokemonFanClub_EventScript_1ADE46
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADED6:: @ 81ADED6
-	msgbox SlateportCity_PokemonFanClub_Text_1A86B5, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A86B5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -4436,11 +1258,11 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF25:: @ 81ADF25
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A93D1, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 5
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
-	call SlateportCity_OceanicMuseum_1F_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4450,18 +1272,18 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADF44:: @ 81ADF44
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF79:: @ 81ADF79
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A9446, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A9446, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF83:: @ 81ADF83
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A949A, MSGBOX_DEFAULT
 	setvar VAR_0x8005, 2
 	goto SlateportCity_OceanicMuseum_1F_EventScript_1ADE46
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_1ADF96:: @ 81ADF96
-	msgbox SlateportCity_OceanicMuseum_1F_Text_1A952E, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_1A952E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -4484,7 +1306,7 @@ SlateportCity_PokemonFanClub_EventScript_1ADFA0:: @ 81ADFA0
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
-	msgbox SlateportCity_PokemonFanClub_Text_1A83D0, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A83D0, MSGBOX_DEFAULT
 	random 3
 	copyvar VAR_0x800A, VAR_RESULT
 	switch VAR_RESULT
@@ -4494,17 +1316,17 @@ SlateportCity_PokemonFanClub_EventScript_1ADFE9:: @ 81ADFE9
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE020:: @ 81AE020
-	msgbox SlateportCity_PokemonFanClub_Text_1A8414, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A8414, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE02E:: @ 81AE02E
-	msgbox SlateportCity_PokemonFanClub_Text_1A8470, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A8470, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE03C:: @ 81AE03C
-	msgbox SlateportCity_PokemonFanClub_Text_1A84D5, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A84D5, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_1AE04A
 	end
 
@@ -4512,31 +1334,31 @@ SlateportCity_PokemonFanClub_EventScript_1AE04A:: @ 81AE04A
 	setvar VAR_0x8004, 7
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
-	call SlateportCity_PokemonFanClub_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
-	msgbox SlateportCity_PokemonFanClub_Text_1A852D, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A852D, MSGBOX_DEFAULT
 	setvar VAR_0x8006, 1
-	call SlateportCity_PokemonFanClub_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1AE0A2
-	msgbox SlateportCity_PokemonFanClub_Text_1A85A6, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A85A6, MSGBOX_DEFAULT
 	copyvar VAR_0x8007, VAR_0x800A
 	setvar VAR_0x8005, 3
 	goto SlateportCity_PokemonFanClub_EventScript_1ADE46
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE0A2:: @ 81AE0A2
-	msgbox SlateportCity_PokemonFanClub_Text_1A8667, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A8667, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1AE0AC:: @ 81AE0AC
-	msgbox SlateportCity_PokemonFanClub_Text_1A86B5, 4
+	msgbox SlateportCity_PokemonFanClub_Text_1A86B5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -4560,11 +1382,11 @@ VerdanturfTown_ContestLobby_EventScript_1AE0B6:: @ 81AE0B6
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8
-	msgbox FallarborTown_ContestLobby_Text_1A704E, 4
+	msgbox FallarborTown_ContestLobby_Text_1A704E, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 11
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
-	call FallarborTown_ContestLobby_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4574,30 +1396,30 @@ FallarborTown_ContestLobby_EventScript_1AE0F8:: @ 81AE0F8
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE12D:: @ 81AE12D
-	msgbox FallarborTown_ContestLobby_Text_1A7256, 4
+	msgbox FallarborTown_ContestLobby_Text_1A7256, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE137:: @ 81AE137
 	setvar VAR_0x8004, 24
 	special SetContestCategoryStringVarForInterview
-	msgbox FallarborTown_ContestLobby_Text_1A70A5, 4
+	msgbox FallarborTown_ContestLobby_Text_1A70A5, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 11
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 1
-	call FallarborTown_ContestLobby_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1AE12D
-	msgbox FallarborTown_ContestLobby_Text_1A7153, 4
+	msgbox FallarborTown_ContestLobby_Text_1A7153, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	setvar VAR_0x8005, 6
 	goto FallarborTown_ContestLobby_EventScript_1ADE46
 	end
 
 FallarborTown_ContestLobby_EventScript_1AE17E:: @ 81AE17E
-	msgbox FallarborTown_ContestLobby_Text_1A72A8, 4
+	msgbox FallarborTown_ContestLobby_Text_1A72A8, MSGBOX_DEFAULT
 	release
 	end
 
@@ -4664,10 +1486,10 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	call_if_eq BattleTower_Lobby_EventScript_1AE2A1
 	compare VAR_RESULT, 1
 	call_if_eq BattleTower_Lobby_EventScript_1AE2AA
-	msgbox BattleTower_Lobby_Text_1A79EB, 4
+	msgbox BattleTower_Lobby_Text_1A79EB, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 12
 	copyvar VAR_0x8005, VAR_0x8009
-	call BattleTower_Lobby_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -4677,22 +1499,22 @@ BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	end
 
 BattleTower_Lobby_EventScript_1AE297:: @ 81AE297
-	msgbox BattleTower_Lobby_Text_1A78B7, 4
+	msgbox BattleTower_Lobby_Text_1A78B7, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_1AE2A1:: @ 81AE2A1
-	msgbox BattleTower_Lobby_Text_1A791B, 4
+	msgbox BattleTower_Lobby_Text_1A791B, MSGBOX_DEFAULT
 	return
 
 BattleTower_Lobby_EventScript_1AE2AA:: @ 81AE2AA
-	msgbox BattleTower_Lobby_Text_1A7990, 4
+	msgbox BattleTower_Lobby_Text_1A7990, MSGBOX_DEFAULT
 	return
 
 BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
 	compare VAR_RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1AE2D9
-	msgbox BattleTower_Lobby_Text_1A7A6E, 4
+	msgbox BattleTower_Lobby_Text_1A7A6E, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	copyvar VAR_0x8004, VAR_0x8008
 	setvar VAR_0x8005, 7
@@ -4700,12 +1522,12 @@ BattleTower_Lobby_EventScript_1AE2B3:: @ 81AE2B3
 	end
 
 BattleTower_Lobby_EventScript_1AE2D9:: @ 81AE2D9
-	msgbox BattleTower_Lobby_Text_1A7AE0, 4
+	msgbox BattleTower_Lobby_Text_1A7AE0, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_1AE2E3:: @ 81AE2E3
-	msgbox BattleTower_Lobby_Text_1A7B66, 4
+	msgbox BattleTower_Lobby_Text_1A7B66, MSGBOX_DEFAULT
 	release
 	end
 
@@ -4756,7 +1578,7 @@ gUnknown_081B694A:: @ 81B694A
 	.include "data/scripts/players_house.inc"
 
 S_RunningShoesManual:: @ 81B6E5A
-	msgbox UnknownString_81728E3, 3
+	msgbox UnknownString_81728E3, MSGBOX_SIGN
 	end
 
 	.include "data/text/pokeblocks.inc"
@@ -4765,7 +1587,7 @@ S_RunningShoesManual:: @ 81B6E5A
 	.include "data/text/trainers.inc"
 
 S_RepelWoreOff:: @ 81C33E6
-	msgbox Text_RepelWoreOff, 3
+	msgbox Text_RepelWoreOff, MSGBOX_SIGN
 	end
 
 Text_RepelWoreOff: @ 81C33EF
@@ -4811,88 +1633,22 @@ MauvilleCity_GameCorner_EventScript_1C40DA:: @ 81C40DA
 	.include "data/text/braille.inc"
 	.include "data/text/berries.inc"
 	.include "data/text/shoal_cave.inc"
-
-PictureBookShelfText: @ 81C6A69
-	.string "There's a set of POKéMON picture books.$"
-
-BookshelfText: @ 81C6A91
-	.string "It's filled with all sorts of books.$"
-
-PokemonCenterBookshelfText: @ 81C6AB6
-	.string "POKéMON magazines!\n"
-	.string "POKéMON PAL...\p"
-	.string "POKéMON HANDBOOK...\n"
-	.string "ADORABLE POKéMON...$"
-
-VaseText: @ 81C6B00
-	.string "This vase looks expensive...\n"
-	.string "Peered inside...\p"
-	.string "But, it was empty.$"
-
-TrashCanText: @ 81C6B41
-	.string "It's empty.$"
-
-ShopShelfText: @ 81C6B4D
-	.string "The shelves brim with all sorts of\n"
-	.string "POKéMON merchandise.$"
-
-BlueprintText: @ 81C6B85
-	.string "A blueprint of some sort?\n"
-	.string "It's too complicated!$"
-
-GraniteCave_B1F_MapScript2_1C6BB5:: @ 81C6BB5
-MtPyre_2F_MapScript2_1C6BB5:: @ 81C6BB5
-SkyPillar_2F_MapScript2_1C6BB5:: @ 81C6BB5
-SkyPillar_4F_MapScript2_1C6BB5:: @ 81C6BB5
-	map_script_2 VAR_ICE_STEP_COUNT, 0, S_FallDownHole
-	.2byte 0
-
-GraniteCave_B1F_MapScript1_1C6BBF:: @ 81C6BBF
-MtPyre_2F_MapScript1_1C6BBF:: @ 81C6BBF
-SkyPillar_2F_MapScript1_1C6BBF:: @ 81C6BBF
-SkyPillar_4F_MapScript1_1C6BBF:: @ 81C6BBF
-	copyvar VAR_ICE_STEP_COUNT, 0x1
-	end
-
-S_FallDownHole:: @ 81C6BC5
-	lockall
-	delay 20
-	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
-	waitmovement 0
-	playse SE_RU_HYUU
-	delay 60
-	warphole MAP_UNDEFINED
-	waitstate
-	end
-
-gUnknown_081C6BDE:: @ 81C6BDE
-	lockall
-	delay 20
-	applymovement 255, GraniteCave_B1F_Movement_1C6BF7
-	waitmovement 0
-	playse SE_RU_HYUU
-	delay 60
-	special sp13F_fall_to_last_warp
-	waitstate
-	end
-
-GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
-	set_invisible
-	end_movement
+	.include "data/text/check_furniture.inc"
+	.include "data/scripts/cave_hole.inc"
 
 @ 81C6BF9
-	msgbox Text_1C6C2B, 2
+	msgbox Text_1C6C2B, MSGBOX_NPC
 	end
 
 gUnknown_081C6C02:: @ 81C6C02
-	msgbox Text_1C6C4B, 3
+	msgbox Text_1C6C4B, MSGBOX_SIGN
 	end
 
 @ 81C6C0B
 	end
 
 @ 81C6C0C
-	msgbox Text_1C6C62, 3
+	msgbox Text_1C6C62, MSGBOX_SIGN
 	end
 
 @ 81C6C15
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index b4a8af413..a0ba1cf66 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -10,7 +10,7 @@ S_CuttableTree:: @ 81B0DCC
 	msgbox UseCutPromptText, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Cut_ChoseNo
-	msgbox UsedCutRockSmashText, 4
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
@@ -33,10 +33,10 @@ DoTreeCutMovement: @ 81B0E21
 
 TreeCutMovement: @ 81B0E30
 	cut_tree
-	end_movement
+	step_end
 
 CannotUseCut: @ 81B0E32
-	msgbox CannotUseCutText, 3
+	msgbox CannotUseCutText, MSGBOX_SIGN
 	releaseall
 	end
 
@@ -67,7 +67,7 @@ S_BreakableRock:: @ 81B0EB7
 	msgbox UseRockSmashPromptText, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq RockSmash_ChoseNo
-	msgbox UsedCutRockSmashText, 4
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
 	closemessage
 	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
@@ -101,10 +101,10 @@ DoRockSmashMovement_Done: @ 81B0F3A
 
 RockSmashMovement: @ 81B0F3C
 	rock_smash_break
-	end_movement
+	step_end
 
 CannotUseRockSmash: @ 81B0F3E
-	msgbox CannotUseRockSmashText, 3
+	msgbox CannotUseRockSmashText, MSGBOX_SIGN
 	releaseall
 	end
 
@@ -147,17 +147,17 @@ S_UseStrength:: @ 81B100E
 
 UsedStrength: @ 81B1019
 	setflag FLAG_SYS_USE_STRENGTH
-	msgbox UsedStrengthText, 3
+	msgbox UsedStrengthText, MSGBOX_SIGN
 	releaseall
 	end
 
 CannotUseStrength: @ 81B1026
-	msgbox CannotUseStrengthText, 3
+	msgbox CannotUseStrengthText, MSGBOX_SIGN
 	releaseall
 	end
 
 AlreadyUsedStrength: @ 81B1030
-	msgbox AlreadyUsedStrengthText, 3
+	msgbox AlreadyUsedStrengthText, MSGBOX_SIGN
 	releaseall
 	end
 
@@ -194,14 +194,14 @@ S_UseWaterfall:: @ 81B115A
 	msgbox UseWaterfallPromptText, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Waterfall_Done
-	msgbox UsedWaterfallText, 4
+	msgbox UsedWaterfallText, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_WATERFALL
 	goto Waterfall_Done
 
 S_CannotUseWaterfall:: @ 81B1194
 	lockall
 Waterfall_NoMonKnows: @ 81B1195
-	msgbox CannotUseWaterfallText, 4
+	msgbox CannotUseWaterfallText, MSGBOX_DEFAULT
 Waterfall_Done:  @ 81B119D
 	releaseall
 	end
@@ -228,13 +228,13 @@ UseDiveScript:: @ 81B1220
 	msgbox UseDivePromptText, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Dive_Done
-	msgbox UsedDiveText, 4
+	msgbox UsedDiveText, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
 	goto Dive_Done
 	lockall
 
 CannotUseDive: @ 81B125F
-	msgbox CannotUseDiveText, 4
+	msgbox CannotUseDiveText, MSGBOX_DEFAULT
 
 Dive_Done: @ 81B1267
 	releaseall
@@ -251,19 +251,19 @@ S_UseDiveUnderwater:: @ 81B1269
 	msgbox UnderwaterUseDivePromptText, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq UnderwaterDive_Done
-	msgbox UsedDiveText, 4
+	msgbox UsedDiveText, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_DIVE
 	goto UnderwaterDive_Done
 
 UnderwaterCannotUseDive: @ 81B12A7
 	lockall
-	msgbox UnderwaterCannotUseDiveText, 4
+	msgbox UnderwaterCannotUseDiveText, MSGBOX_DEFAULT
 	goto UnderwaterDive_Done
 
 @ not used
 SurfacingBlocked: @ 81B12B5
 	lockall
-	msgbox SurfacingBlockedText, 4
+	msgbox SurfacingBlockedText, MSGBOX_DEFAULT
 
 UnderwaterDive_Done: @ 81B12BE
 	releaseall
@@ -293,7 +293,7 @@ SurfacingBlockedText: @ 81B13CE
 	.string "DIVE can't be used here.$"
 
 SweetScentNothingHereScript:: @ 81B140C
-	msgbox SweetScentNothingHereText, 3
+	msgbox SweetScentNothingHereText, MSGBOX_SIGN
 	end
 
 SweetScentNothingHereText: @ 81B1415
diff --git a/data/item_ball_scripts.inc b/data/item_ball_scripts.inc
index 02acdeca4..4e8f253e4 100644
--- a/data/item_ball_scripts.inc
+++ b/data/item_ball_scripts.inc
@@ -1,539 +1,539 @@
 Route102_EventScript_1B1439:: @ 81B1439
-	giveitem_std ITEM_POTION, 1, 1
+	finditem ITEM_POTION
 	end
 
 Route103_EventScript_1B1446:: @ 81B1446
-	giveitem_std ITEM_GUARD_SPEC, 1, 1
+	finditem ITEM_GUARD_SPEC
 	end
 
 Route104_EventScript_1B1453:: @ 81B1453
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem ITEM_PP_UP
 	end
 
 Route104_EventScript_1B1460:: @ 81B1460
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem ITEM_POKE_BALL
 	end
 
 Route104_EventScript_1B146D:: @ 81B146D
-	giveitem_std ITEM_X_ACCURACY, 1, 1
+	finditem ITEM_X_ACCURACY
 	end
 
 Route104_EventScript_1B147A:: @ 81B147A
-	giveitem_std ITEM_POTION, 1, 1
+	finditem ITEM_POTION
 	end
 
 Route105_EventScript_1B1487:: @ 81B1487
-	giveitem_std ITEM_IRON, 1, 1
+	finditem ITEM_IRON
 	end
 
 Route106_EventScript_1B1494:: @ 81B1494
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem ITEM_PROTEIN
 	end
 
 Route109_EventScript_1B14A1:: @ 81B14A1
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem ITEM_PP_UP
 	end
 
 Route110_EventScript_1B14AE:: @ 81B14AE
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 Route110_EventScript_1B14BB:: @ 81B14BB
-	giveitem_std ITEM_DIRE_HIT, 1, 1
+	finditem ITEM_DIRE_HIT
 	end
 
 Route111_EventScript_1B14C8:: @ 81B14C8
-	giveitem_std ITEM_TM37_SANDSTORM, 1, 1
+	finditem ITEM_TM37_SANDSTORM
 	end
 
 Route111_EventScript_1B14D5:: @ 81B14D5
-	giveitem_std ITEM_STARDUST, 1, 1
+	finditem ITEM_STARDUST
 	end
 
 Route111_EventScript_1B14E2:: @ 81B14E2
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem ITEM_HP_UP
 	end
 
 Route112_EventScript_1B14EF:: @ 81B14EF
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem ITEM_NUGGET
 	end
 
 Route113_EventScript_1B14FC:: @ 81B14FC
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem ITEM_MAX_ETHER
 	end
 
 Route113_EventScript_1B1509:: @ 81B1509
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem ITEM_SUPER_REPEL
 	end
 
 Route114_EventScript_1B1516:: @ 81B1516
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 Route114_EventScript_1B1523:: @ 81B1523
-	giveitem_std ITEM_PROTEIN, 1, 1
+	finditem ITEM_PROTEIN
 	end
 
 Route115_EventScript_1B1530:: @ 81B1530
-	giveitem_std ITEM_SUPER_POTION, 1, 1
+	finditem ITEM_SUPER_POTION
 	end
 
 Route115_EventScript_1B153D:: @ 81B153D
-	giveitem_std ITEM_TM01_FOCUS_PUNCH, 1, 1
+	finditem ITEM_TM01_FOCUS_PUNCH
 	end
 
 Route115_EventScript_1B154A:: @ 81B154A
-	giveitem_std ITEM_IRON, 1, 1
+	finditem ITEM_IRON
 	end
 
 Route115_EventScript_1B1557:: @ 81B1557
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem ITEM_GREAT_BALL
 	end
 
 Route116_EventScript_1B1564:: @ 81B1564
-	giveitem_std ITEM_X_SPECIAL, 1, 1
+	finditem ITEM_X_SPECIAL
 	end
 
 Route116_EventScript_1B1571:: @ 81B1571
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem ITEM_ETHER
 	end
 
 Route116_EventScript_1B157E:: @ 81B157E
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem ITEM_REPEL
 	end
 
 Route116_EventScript_1B158B:: @ 81B158B
-	giveitem_std ITEM_HP_UP, 1, 1
+	finditem ITEM_HP_UP
 	end
 
 Route117_EventScript_1B1598:: @ 81B1598
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem ITEM_GREAT_BALL
 	end
 
 Route117_EventScript_1B15A5:: @ 81B15A5
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem ITEM_REVIVE
 	end
 
 Route118_EventScript_1B15B2:: @ 81B15B2
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_1B15BF:: @ 81B15BF
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem ITEM_SUPER_REPEL
 	end
 
 Route119_EventScript_1B15CC:: @ 81B15CC
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem ITEM_ZINC
 	end
 
 Route119_EventScript_1B15D9:: @ 81B15D9
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem ITEM_ELIXIR
 	end
 
 Route119_EventScript_1B15E6:: @ 81B15E6
-	giveitem_std ITEM_LEAF_STONE, 1, 1
+	finditem ITEM_LEAF_STONE
 	end
 
 Route119_EventScript_1B15F3:: @ 81B15F3
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 Route119_EventScript_1B1600:: @ 81B1600
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem ITEM_HYPER_POTION
 	end
 
 Route119_EventScript_1B160D:: @ 81B160D
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem ITEM_HYPER_POTION
 	end
 
 Route120_EventScript_1B161A:: @ 81B161A
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem ITEM_NUGGET
 	end
 
 Route120_EventScript_1B1627:: @ 81B1627
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem ITEM_FULL_HEAL
 	end
 
 Route120_EventScript_1B1634:: @ 81B1634
-	giveitem_std ITEM_HYPER_POTION, 1, 1
+	finditem ITEM_HYPER_POTION
 	end
 
 Route120_EventScript_1B1641:: @ 81B1641
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem ITEM_NEST_BALL
 	end
 
 Route121_EventScript_1B164E:: @ 81B164E
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem ITEM_CARBOS
 	end
 
 Route123_EventScript_1B165B:: @ 81B165B
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem ITEM_CALCIUM
 	end
 
 Route123_EventScript_1B1668:: @ 81B1668
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 Route123_EventScript_1B1675:: @ 81B1675
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem ITEM_ULTRA_BALL
 	end
 
 Route123_EventScript_1B1682:: @ 81B1682
-	giveitem_std ITEM_ELIXIR, 1, 1
+	finditem ITEM_ELIXIR
 	end
 
 Route124_EventScript_1B168F:: @ 81B168F
-	giveitem_std ITEM_RED_SHARD, 1, 1
+	finditem ITEM_RED_SHARD
 	end
 
 Route124_EventScript_1B169C:: @ 81B169C
-	giveitem_std ITEM_BLUE_SHARD, 1, 1
+	finditem ITEM_BLUE_SHARD
 	end
 
 Route124_EventScript_1B16A9:: @ 81B16A9
-	giveitem_std ITEM_YELLOW_SHARD, 1, 1
+	finditem ITEM_YELLOW_SHARD
 	end
 
 Route126_EventScript_1B16B6:: @ 81B16B6
-	giveitem_std ITEM_GREEN_SHARD, 1, 1
+	finditem ITEM_GREEN_SHARD
 	end
 
 Route127_EventScript_1B16C3:: @ 81B16C3
-	giveitem_std ITEM_ZINC, 1, 1
+	finditem ITEM_ZINC
 	end
 
 Route127_EventScript_1B16D0:: @ 81B16D0
-	giveitem_std ITEM_CARBOS, 1, 1
+	finditem ITEM_CARBOS
 	end
 
 Route132_EventScript_1B16DD:: @ 81B16DD
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 Route133_EventScript_1B16EA:: @ 81B16EA
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem ITEM_BIG_PEARL
 	end
 
 Route133_EventScript_1B16F7:: @ 81B16F7
-	giveitem_std ITEM_STAR_PIECE, 1, 1
+	finditem ITEM_STAR_PIECE
 	end
 
 PetalburgCity_EventScript_1B1704:: @ 81B1704
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem ITEM_MAX_REVIVE
 	end
 
 PetalburgCity_EventScript_1B1711:: @ 81B1711
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem ITEM_ETHER
 	end
 
 MauvilleCity_EventScript_1B171E:: @ 81B171E
-	giveitem_std ITEM_X_SPEED, 1, 1
+	finditem ITEM_X_SPEED
 	end
 
 RustboroCity_EventScript_1B172B:: @ 81B172B
-	giveitem_std ITEM_X_DEFEND, 1, 1
+	finditem ITEM_X_DEFEND
 	end
 
 LilycoveCity_EventScript_1B1738:: @ 81B1738
-	giveitem_std ITEM_MAX_REPEL, 1, 1
+	finditem ITEM_MAX_REPEL
 	end
 
 MossdeepCity_EventScript_1B1745:: @ 81B1745
-	giveitem_std ITEM_NET_BALL, 1, 1
+	finditem ITEM_NET_BALL
 	end
 
 PetalburgWoods_EventScript_1B1752:: @ 81B1752
-	giveitem_std ITEM_X_ATTACK, 1, 1
+	finditem ITEM_X_ATTACK
 	end
 
 PetalburgWoods_EventScript_1B175F:: @ 81B175F
-	giveitem_std ITEM_GREAT_BALL, 1, 1
+	finditem ITEM_GREAT_BALL
 	end
 
 PetalburgWoods_EventScript_1B176C:: @ 81B176C
-	giveitem_std ITEM_ETHER, 1, 1
+	finditem ITEM_ETHER
 	end
 
 PetalburgWoods_EventScript_1B1779:: @ 81B1779
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem ITEM_PARALYZE_HEAL
 	end
 
 RusturfTunnel_EventScript_1B1786:: @ 81B1786
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem ITEM_POKE_BALL
 	end
 
 RusturfTunnel_EventScript_1B1793:: @ 81B1793
-	giveitem_std ITEM_MAX_ETHER, 1, 1
+	finditem ITEM_MAX_ETHER
 	end
 
 GraniteCave_1F_EventScript_1B17A0:: @ 81B17A0
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 GraniteCave_B1F_EventScript_1B17AD:: @ 81B17AD
-	giveitem_std ITEM_POKE_BALL, 1, 1
+	finditem ITEM_POKE_BALL
 	end
 
 GraniteCave_B2F_EventScript_1B17BA:: @ 81B17BA
-	giveitem_std ITEM_REPEL, 1, 1
+	finditem ITEM_REPEL
 	end
 
 GraniteCave_B2F_EventScript_1B17C7:: @ 81B17C7
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 JaggedPass_EventScript_1B17D4:: @ 81B17D4
-	giveitem_std ITEM_BURN_HEAL, 1, 1
+	finditem ITEM_BURN_HEAL
 	end
 
 FieryPath_EventScript_1B17E1:: @ 81B17E1
-	giveitem_std ITEM_FIRE_STONE, 1, 1
+	finditem ITEM_FIRE_STONE
 	end
 
 FieryPath_EventScript_1B17EE:: @ 81B17EE
-	giveitem_std ITEM_TM06_TOXIC, 1, 1
+	finditem ITEM_TM06_TOXIC
 	end
 
 MeteorFalls_1F_1R_EventScript_1B17FB:: @ 81B17FB
-	giveitem_std ITEM_TM23_IRON_TAIL, 1, 1
+	finditem ITEM_TM23_IRON_TAIL
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1808:: @ 81B1808
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem ITEM_FULL_HEAL
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1815:: @ 81B1815
-	giveitem_std ITEM_MOON_STONE, 1, 1
+	finditem ITEM_MOON_STONE
 	end
 
 MeteorFalls_1F_1R_EventScript_1B1822:: @ 81B1822
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem ITEM_PP_UP
 	end
 
 MeteorFalls_B1F_2R_EventScript_1B182F:: @ 81B182F
-	giveitem_std ITEM_TM02_DRAGON_CLAW, 1, 1
+	finditem ITEM_TM02_DRAGON_CLAW
 	end
 
 NewMauville_Inside_EventScript_1B183C:: @ 81B183C
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem ITEM_ULTRA_BALL
 	end
 
 NewMauville_Inside_EventScript_1B1849:: @ 81B1849
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 NewMauville_Inside_EventScript_1B1856:: @ 81B1856
-	giveitem_std ITEM_THUNDER_STONE, 1, 1
+	finditem ITEM_THUNDER_STONE
 	end
 
 NewMauville_Inside_EventScript_1B1863:: @ 81B1863
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem ITEM_FULL_HEAL
 	end
 
 NewMauville_Inside_EventScript_1B1870:: @ 81B1870
-	giveitem_std ITEM_PARALYZE_HEAL, 1, 1
+	finditem ITEM_PARALYZE_HEAL
 	end
 
 AbandonedShip_Rooms_1F_EventScript_1B187D:: @ 81B187D
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem ITEM_HARBOR_MAIL
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_1B188A:: @ 81B188A
-	giveitem_std ITEM_ESCAPE_ROPE, 1, 1
+	finditem ITEM_ESCAPE_ROPE
 	end
 
 AbandonedShip_Rooms2_B1F_EventScript_1B1897:: @ 81B1897
-	giveitem_std ITEM_DIVE_BALL, 1, 1
+	finditem ITEM_DIVE_BALL
 	end
 
 AbandonedShip_Room_B1F_EventScript_1B18A4:: @ 81B18A4
-	giveitem_std ITEM_TM13_ICE_BEAM, 1, 1
+	finditem ITEM_TM13_ICE_BEAM
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_1B18B1:: @ 81B18B1
-	giveitem_std ITEM_REVIVE, 1, 1
+	finditem ITEM_REVIVE
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_1B18BE:: @ 81B18BE
-	giveitem_std ITEM_STORAGE_KEY, 1, 1
+	finditem ITEM_STORAGE_KEY
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18CB:: @ 81B18CB
-	giveitem_std ITEM_LUXURY_BALL, 1, 1
+	finditem ITEM_LUXURY_BALL
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18D8:: @ 81B18D8
-	giveitem_std ITEM_SCANNER, 1, 1
+	finditem ITEM_SCANNER
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18E5:: @ 81B18E5
-	giveitem_std ITEM_WATER_STONE, 1, 1
+	finditem ITEM_WATER_STONE
 	end
 
 AbandonedShip_HiddenFloorRooms_EventScript_1B18F2:: @ 81B18F2
-	giveitem_std ITEM_TM18_RAIN_DANCE, 1, 1
+	finditem ITEM_TM18_RAIN_DANCE
 	end
 
 ScorchedSlab_EventScript_1B18FF:: @ 81B18FF
-	giveitem_std ITEM_TM11_SUNNY_DAY, 1, 1
+	finditem ITEM_TM11_SUNNY_DAY
 	end
 
 SafariZone_Northwest_EventScript_1B190C:: @ 81B190C
-	giveitem_std ITEM_TM22_SOLARBEAM, 1, 1
+	finditem ITEM_TM22_SOLARBEAM
 	end
 
 SafariZone_Northeast_EventScript_1B1919:: @ 81B1919
-	giveitem_std ITEM_CALCIUM, 1, 1
+	finditem ITEM_CALCIUM
 	end
 
 SafariZone_Southwest_EventScript_1B1926:: @ 81B1926
-	giveitem_std ITEM_MAX_REVIVE, 1, 1
+	finditem ITEM_MAX_REVIVE
 	end
 
 MtPyre_2F_EventScript_1B1933:: @ 81B1933
-	giveitem_std ITEM_ULTRA_BALL, 1, 1
+	finditem ITEM_ULTRA_BALL
 	end
 
 MtPyre_3F_EventScript_1B1940:: @ 81B1940
-	giveitem_std ITEM_SUPER_REPEL, 1, 1
+	finditem ITEM_SUPER_REPEL
 	end
 
 MtPyre_4F_EventScript_1B194D:: @ 81B194D
-	giveitem_std ITEM_SEA_INCENSE, 1, 1
+	finditem ITEM_SEA_INCENSE
 	end
 
 MtPyre_5F_EventScript_1B195A:: @ 81B195A
-	giveitem_std ITEM_LAX_INCENSE, 1, 1
+	finditem ITEM_LAX_INCENSE
 	end
 
 MtPyre_6F_EventScript_1B1967:: @ 81B1967
-	giveitem_std ITEM_TM30_SHADOW_BALL, 1, 1
+	finditem ITEM_TM30_SHADOW_BALL
 	end
 
 MtPyre_Exterior_EventScript_1B1974:: @ 81B1974
-	giveitem_std ITEM_MAX_POTION, 1, 1
+	finditem ITEM_MAX_POTION
 	end
 
 MtPyre_Exterior_EventScript_1B1981:: @ 81B1981
-	giveitem_std ITEM_TM48_SKILL_SWAP, 1, 1
+	finditem ITEM_TM48_SKILL_SWAP
 	end
 
 AquaHideout_B1F_EventScript_1B198E:: @ 81B198E
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+	finditem ITEM_MASTER_BALL
 	end
 
 AquaHideout_B1F_EventScript_1B199B:: @ 81B199B
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem ITEM_NUGGET
 	end
 
 AquaHideout_B1F_EventScript_1B19A8:: @ 81B19A8
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem ITEM_MAX_ELIXIR
 	end
 
 AquaHideout_B2F_EventScript_1B19B5:: @ 81B19B5
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem ITEM_NEST_BALL
 	end
 
 MagmaHideout_B1F_EventScript_1B19C2:: @ 81B19C2
-	giveitem_std ITEM_MASTER_BALL, 1, 1
+	finditem ITEM_MASTER_BALL
 	end
 
 MagmaHideout_B1F_EventScript_1B19CF:: @ 81B19CF
-	giveitem_std ITEM_NUGGET, 1, 1
+	finditem ITEM_NUGGET
 	end
 
 MagmaHideout_B1F_EventScript_1B19DC:: @ 81B19DC
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem ITEM_MAX_ELIXIR
 	end
 
 MagmaHideout_B2F_EventScript_1B19E9:: @ 81B19E9
-	giveitem_std ITEM_NEST_BALL, 1, 1
+	finditem ITEM_NEST_BALL
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_1B19F6:: @ 81B19F6
-	giveitem_std ITEM_BIG_PEARL, 1, 1
+	finditem ITEM_BIG_PEARL
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_1B1A03:: @ 81B1A03
-	giveitem_std ITEM_RARE_CANDY, 1, 1
+	finditem ITEM_RARE_CANDY
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_1B1A10:: @ 81B1A10
-	giveitem_std ITEM_ICE_HEAL, 1, 1
+	finditem ITEM_ICE_HEAL
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_1B1A1D:: @ 81B1A1D
-	giveitem_std ITEM_TM07_HAIL, 1, 1
+	finditem ITEM_TM07_HAIL
 	end
 
 ShoalCave_LowTideIceRoom_EventScript_1B1A2A:: @ 81B1A2A
-	giveitem_std ITEM_NEVER_MELT_ICE, 1, 1
+	finditem ITEM_NEVER_MELT_ICE
 	end
 
 SeafloorCavern_Room9_EventScript_1B1A37:: @ 81B1A37
-	giveitem_std ITEM_TM26_EARTHQUAKE, 1, 1
+	finditem ITEM_TM26_EARTHQUAKE
 	end
 
 CaveOfOrigin_B3F_EventScript_1B1A44:: @ 81B1A44
-	giveitem_std ITEM_HM07_WATERFALL, 1, 1
+	finditem ITEM_HM07_WATERFALL
 	end
 
 Route110_TrickHousePuzzle1_EventScript_1B1A51:: @ 81B1A51
-	giveitem_std ITEM_ORANGE_MAIL, 1, 1
+	finditem ITEM_ORANGE_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_1B1A5E:: @ 81B1A5E
-	giveitem_std ITEM_HARBOR_MAIL, 1, 1
+	finditem ITEM_HARBOR_MAIL
 	end
 
 Route110_TrickHousePuzzle2_EventScript_1B1A6B:: @ 81B1A6B
-	giveitem_std ITEM_WAVE_MAIL, 1, 1
+	finditem ITEM_WAVE_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_1B1A78:: @ 81B1A78
-	giveitem_std ITEM_SHADOW_MAIL, 1, 1
+	finditem ITEM_SHADOW_MAIL
 	end
 
 Route110_TrickHousePuzzle3_EventScript_1B1A85:: @ 81B1A85
-	giveitem_std ITEM_WOOD_MAIL, 1, 1
+	finditem ITEM_WOOD_MAIL
 	end
 
 Route110_TrickHousePuzzle4_EventScript_1B1A92:: @ 81B1A92
-	giveitem_std ITEM_MECH_MAIL, 1, 1
+	finditem ITEM_MECH_MAIL
 	end
 
 Route110_TrickHousePuzzle6_EventScript_1B1A9F:: @ 81B1A9F
-	giveitem_std ITEM_GLITTER_MAIL, 1, 1
+	finditem ITEM_GLITTER_MAIL
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1B1AAC:: @ 81B1AAC
-	giveitem_std ITEM_TROPIC_MAIL, 1, 1
+	finditem ITEM_TROPIC_MAIL
 	end
 
 Route110_TrickHousePuzzle8_EventScript_1B1AB9:: @ 81B1AB9
-	giveitem_std ITEM_BEAD_MAIL, 1, 1
+	finditem ITEM_BEAD_MAIL
 	end
 
 VictoryRoad_1F_EventScript_1B1AC6:: @ 81B1AC6
-	giveitem_std ITEM_MAX_ELIXIR, 1, 1
+	finditem ITEM_MAX_ELIXIR
 	end
 
 VictoryRoad_1F_EventScript_1B1AD3:: @ 81B1AD3
-	giveitem_std ITEM_PP_UP, 1, 1
+	finditem ITEM_PP_UP
 	end
 
 VictoryRoad_B1F_EventScript_1B1AE0:: @ 81B1AE0
-	giveitem_std ITEM_TM29_PSYCHIC, 1, 1
+	finditem ITEM_TM29_PSYCHIC
 	end
 
 VictoryRoad_B1F_EventScript_1B1AED:: @ 81B1AED
-	giveitem_std ITEM_FULL_RESTORE, 1, 1
+	finditem ITEM_FULL_RESTORE
 	end
 
 VictoryRoad_B2F_EventScript_1B1AFA:: @ 81B1AFA
-	giveitem_std ITEM_FULL_HEAL, 1, 1
+	finditem ITEM_FULL_HEAL
 	end
 
 @ 81B1B07
-	giveitem_std ITEM_HM08_DIVE, 1, 1
+	finditem ITEM_HM08_DIVE
 	end
diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index c7be02801..b9335025d 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
@@ -9,16 +9,16 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5
 	compare VAR_RESULT, 1
 	goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23
 	goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D
-	msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_198C85, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_15EB23:: @ 815EB23
-	msgbox AbandonedShip_CaptainsOffice_Text_198D00, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_198D00, MSGBOX_DEFAULT
 	release
 	end
 
 AbandonedShip_CaptainsOffice_EventScript_15EB2D:: @ 815EB2D
-	msgbox AbandonedShip_CaptainsOffice_Text_198D7B, 4
+	msgbox AbandonedShip_CaptainsOffice_Text_198D7B, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index f2636fd31..e48f730f9 100644
--- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
@@ -2,10 +2,10 @@ AbandonedShip_Corridors_1F_MapScripts:: @ 815E964
 	.byte 0
 
 AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965
-	msgbox AbandonedShip_Corridors_1F_Text_1984D8, 2
+	msgbox AbandonedShip_Corridors_1F_Text_1984D8, MSGBOX_NPC
 	end
 
 AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E
-	trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479
-	msgbox AbandonedShip_Corridors_1F_Text_198493, 6
+	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479
+	msgbox AbandonedShip_Corridors_1F_Text_198493, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index cdf430e27..a67a11787 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -1,6 +1,6 @@
 AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F
-	map_script 5, AbandonedShip_Corridors_B1F_MapScript1_15E99A
-	map_script 1, AbandonedShip_Corridors_B1F_MapScript1_15E9A3
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_MapScript1_15E99A
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_MapScript1_15E9A3
 	.byte 0
 
 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A
@@ -21,7 +21,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0
 	return
 
 AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA
-	msgbox AbandonedShip_Corridors_B1F_Text_19864A, 2
+	msgbox AbandonedShip_Corridors_B1F_Text_19864A, MSGBOX_NPC
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
@@ -30,9 +30,9 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	checkitem ITEM_STORAGE_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A
-	msgbox AbandonedShip_Corridors_B1F_Text_198692, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_198692, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_STORAGE_KEY, 1
+	removeitem ITEM_STORAGE_KEY, 1
 	setflag FLAG_USED_STORAGE_KEY
 	call AbandonedShip_Corridors_B1F_EventScript_15E9C0
 	special DrawWholeMapView
@@ -40,16 +40,16 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15EA0A:: @ 815EA0A
-	msgbox AbandonedShip_Corridors_B1F_Text_19865C, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_19865C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14
-	msgbox AbandonedShip_Corridors_B1F_Text_1986EC, 4
+	msgbox AbandonedShip_Corridors_B1F_Text_1986EC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E
-	trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5
-	msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6
+	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5
+	msgbox AbandonedShip_Corridors_B1F_Text_1985D7, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 68d872f01..8e796436e 100644
--- a/data/maps/AbandonedShip_Deck/scripts.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Deck_MapScripts:: @ 815E95A
-	map_script 3, AbandonedShip_Deck_MapScript1_15E960
+	map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_MapScript1_15E960
 	.byte 0
 
 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index 6639e6b6e..09ab6d059 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -1,6 +1,6 @@
 AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46
-	map_script 5, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51
-	map_script 1, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51
+	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A
 	.byte 0
 
 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51
@@ -56,9 +56,9 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3
 	checkitem ITEM_ROOM_1_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_1_KEY, 1
+	removeitem ITEM_ROOM_1_KEY
 	setflag FLAG_USED_ROOM_1_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3
 	special DrawWholeMapView
@@ -71,9 +71,9 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A
 	checkitem ITEM_ROOM_2_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_2_KEY, 1
+	removeitem ITEM_ROOM_2_KEY
 	setflag FLAG_USED_ROOM_2_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD
 	special DrawWholeMapView
@@ -86,9 +86,9 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61
 	checkitem ITEM_ROOM_4_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_4_KEY, 1
+	removeitem ITEM_ROOM_4_KEY
 	setflag FLAG_USED_ROOM_4_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7
 	special DrawWholeMapView
@@ -101,9 +101,9 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	checkitem ITEM_ROOM_6_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, MSGBOX_DEFAULT
 	playse SE_PIN
-	takeitem ITEM_ROOM_6_KEY, 1
+	removeitem ITEM_ROOM_6_KEY
 	setflag FLAG_USED_ROOM_6_KEY
 	call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1
 	special DrawWholeMapView
@@ -111,26 +111,26 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF:: @ 815ECCF
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198DC0, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198DC0, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9:: @ 815ECD9
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198DF4, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198DF4, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3:: @ 815ECE3
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E28, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E28, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15ECED:: @ 815ECED
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E5C, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_198E5C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7:: @ 815ECF7
-	msgbox AbandonedShip_HiddenFloorCorridors_Text_1986EC, 4
+	msgbox AbandonedShip_HiddenFloorCorridors_Text_1986EC, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 0c2e900c3..d28e80ec8 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01
-	map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
 	.byte 0
 
 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07
@@ -138,6 +138,6 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
 
 AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB
 	lockall
-	msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, 4
+	msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index 089893aa2..a1bad74b4 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -2,27 +2,27 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67
 	.byte 0
 
 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68
-	trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
+	trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93
-	msgbox AbandonedShip_Rooms2_1F_Text_198835, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_198835, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93
-	trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE
-	msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6
+	trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE
+	msgbox AbandonedShip_Rooms2_1F_Text_198A70, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE
-	trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
+	trainerbattle_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9
-	msgbox AbandonedShip_Rooms2_1F_Text_198934, 6
+	msgbox AbandonedShip_Rooms2_1F_Text_198934, MSGBOX_AUTOCLOSE
 	end
 
 AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9
-	trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40
-	msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6
+	trainerbattle_rematch_double TRAINER_LOIS_AND_HAL_1, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40
+	msgbox AbandonedShip_Rooms2_1F_Text_198BEA, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 0c8f3ffc9..073b78a38 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
@@ -2,5 +2,5 @@ AbandonedShip_Rooms2_B1F_MapScripts:: @ 815EA4D
 	.byte 0
 
 AbandonedShip_Rooms2_B1F_EventScript_15EA4E:: @ 815EA4E
-	msgbox AbandonedShip_Rooms2_B1F_Text_198759, 2
+	msgbox AbandonedShip_Rooms2_B1F_Text_198759, MSGBOX_NPC
 	end
diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index c5f9ad3f5..2db19af0d 100644
--- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
@@ -2,5 +2,5 @@ AbandonedShip_Rooms_1F_MapScripts:: @ 815E985
 	.byte 0
 
 AbandonedShip_Rooms_1F_EventScript_15E986:: @ 815E986
-	msgbox AbandonedShip_Rooms_1F_Text_19850A, 2
+	msgbox AbandonedShip_Rooms_1F_Text_19850A, MSGBOX_NPC
 	end
diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 4299c7da4..6cce989c1 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35
-	map_script 5, AbandonedShip_Rooms_B1F_MapScript1_15EA3B
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_MapScript1_15EA3B
 	.byte 0
 
 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B
@@ -7,5 +7,5 @@ AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B
 	end
 
 AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44
-	msgbox AbandonedShip_Rooms_B1F_Text_1986FE, 2
+	msgbox AbandonedShip_Rooms_B1F_Text_1986FE, MSGBOX_NPC
 	end
diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 52ba61136..b4bc0e6b2 100644
--- a/data/maps/AbandonedShip_Underwater1/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater1_MapScripts:: @ 815EA57
-	map_script 5, AbandonedShip_Underwater1_MapScript1_15EA5D
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_MapScript1_15EA5D
 	.byte 0
 
 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D
diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 22113661a..d00fa1a59 100644
--- a/data/maps/AbandonedShip_Underwater2/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
@@ -1,5 +1,5 @@
 AbandonedShip_Underwater2_MapScripts:: @ 815EB37
-	map_script 5, AbandonedShip_Underwater2_MapScript1_15EB3D
+	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_MapScript1_15EB3D
 	.byte 0
 
 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 01b04bf27..a40e856be 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -1,7 +1,7 @@
 AncientTomb_MapScripts:: @ 815EFBE
-	map_script 5, AncientTomb_MapScript1_15EFCE
-	map_script 1, AncientTomb_MapScript1_15EFE0
-	map_script 3, AncientTomb_MapScript1_15EFDC
+	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_MapScript1_15EFCE
+	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_MapScript1_15EFE0
+	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_MapScript1_15EFDC
 	.byte 0
 
 AncientTomb_MapScript1_15EFCE:: @ 815EFCE
@@ -39,7 +39,7 @@ AncientTomb_EventScript_15F021:: @ 815F021
 	end
 
 AncientTomb_EventScript_15F038:: @ 815F038
-	msgbox AncientTomb_Text_1A13BE, 4
+	msgbox AncientTomb_Text_1A13BE, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc
index e92e83cc8..768d7e28d 100644
--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -1,9 +1,9 @@
 AquaHideout_1F_MapScripts:: @ 815D7C2
-	map_script 3, AquaHideout_1F_MapScript1_15D7C8
+	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_1F_MapScript1_15D7C8
 	.byte 0
 
 AquaHideout_1F_MapScript1_15D7C8:: @ 815D7C8
-	call AquaHideout_1F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE
@@ -11,12 +11,12 @@ MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE
 	lock
 	faceplayer
 	goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3
-	msgbox AquaHideout_1F_Text_196AFD, 4
+	msgbox AquaHideout_1F_Text_196AFD, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_15D7E3:: @ 815D7E3
-	msgbox AquaHideout_1F_Text_196BC5, 4
+	msgbox AquaHideout_1F_Text_196BC5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -25,22 +25,22 @@ MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED
 	lock
 	faceplayer
 	goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802
-	msgbox AquaHideout_1F_Text_196C83, 4
+	msgbox AquaHideout_1F_Text_196C83, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_15D802:: @ 815D802
-	msgbox AquaHideout_1F_Text_196D46, 4
+	msgbox AquaHideout_1F_Text_196D46, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_1F_EventScript_15D80C:: @ 815D80C
 MagmaHideout_1F_EventScript_15D80C:: @ 815D80C
-	trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827
-	msgbox AquaHideout_1F_Text_196E3D, 6
+	trainerbattle_single TRAINER_HIDEOUT_1F_GRUNT, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827
+	msgbox AquaHideout_1F_Text_196E3D, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_1F_EventScript_15D827:: @ 815D827
-	msgbox AquaHideout_1F_Text_196E3D, 4
+	msgbox AquaHideout_1F_Text_196E3D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/AquaHideout_B1F/map.json b/data/maps/AquaHideout_B1F/map.json
index a18fe6bb8..e0e661b7a 100644
--- a/data/maps/AquaHideout_B1F/map.json
+++ b/data/maps/AquaHideout_B1F/map.json
@@ -86,7 +86,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_1A04FD",
+      "script": "Hideout_B1F_EventScript_Electrode1",
       "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT"
     },
     {
@@ -112,7 +112,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "AquaHideout_B1F_EventScript_1A051B",
+      "script": "Hideout_B1F_EventScript_Electrode2",
       "flag": "FLAG_HIDE_ELECTRODE_2_HIDEOUT"
     }
   ],
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index a5268d031..52fb300d8 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -1,6 +1,6 @@
 AquaHideout_B1F_MapScripts:: @ 815D831
-	map_script 5, AquaHideout_B1F_MapScript1_15D83C
-	map_script 3, AquaHideout_B1F_MapScript1_15D84A
+	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_MapScript1_15D83C
+	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_MapScript1_15D84A
 	.byte 0
 
 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C
@@ -12,33 +12,33 @@ AquaHideout_B1F_EventScript_15D846:: @ 815D846
 	return
 
 AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A
-	call AquaHideout_B1F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 AquaHideout_B1F_EventScript_15D850:: @ 815D850
 MagmaHideout_B1F_EventScript_15D850:: @ 815D850
-	trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B
-	msgbox AquaHideout_B1F_Text_196ECC, 6
+	trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_1, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B
+	msgbox AquaHideout_B1F_Text_196ECC, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_EventScript_15D86B:: @ 815D86B
-	msgbox AquaHideout_B1F_Text_196ECC, 4
+	msgbox AquaHideout_B1F_Text_196ECC, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B1F_EventScript_15D875:: @ 815D875
 MagmaHideout_B1F_EventScript_15D875:: @ 815D875
-	trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890
-	msgbox AquaHideout_B1F_Text_196FB5, 6
+	trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_2, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890
+	msgbox AquaHideout_B1F_Text_196FB5, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B1F_EventScript_15D890:: @ 815D890
-	msgbox AquaHideout_B1F_Text_196FB5, 4
+	msgbox AquaHideout_B1F_Text_196FB5, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A
 MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A
-	trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
-	msgbox AquaHideout_B1F_Text_197056, 6
+	trainerbattle_single TRAINER_HIDEOUT_B1F_GRUNT_3, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040
+	msgbox AquaHideout_B1F_Text_197056, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index 519c799fc..2ec8d5176 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -1,9 +1,9 @@
 AquaHideout_B2F_MapScripts:: @ 815D8B1
-	map_script 3, AquaHideout_B2F_MapScript1_15D8B7
+	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_MapScript1_15D8B7
 	.byte 0
 
 AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7
-	call AquaHideout_B2F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
@@ -11,12 +11,12 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
 	lockall
 	setvar VAR_0x8008, 1
 	playse SE_PIN
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0833
+	applymovement VAR_0x8008, Common_Movement_ExclamationMark
 	waitmovement 0
 	.ifdef SAPPHIRE
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	.else
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0841
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestUp
 	.endif
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
@@ -25,8 +25,8 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
 
 AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
-	trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
-	msgbox AquaHideout_B2F_Text_1971AE, 4
+	trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_1, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
+	msgbox AquaHideout_B2F_Text_1971AE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -38,20 +38,20 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	setvar VAR_0x8009, 3
 	.endif
 	.ifdef SAPPHIRE
-	applymovement VAR_0x8008, Movement_1A083F
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
 	.else
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight
 	.endif
 	waitmovement 0
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_197162, 4
+	msgbox AquaHideout_B2F_Text_197162, MSGBOX_DEFAULT
 	closemessage
 	.ifdef SAPPHIRE
-	applymovement VAR_0x8008, Movement_1A083F
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
 	.else
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0843
+	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestRight
 	.endif
 	.ifdef SAPPHIRE
 	applymovement VAR_0x8009, AquaHideout_B2F_Movement_15D958
@@ -61,9 +61,9 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	waitmovement 0
 	removeobject VAR_0x8009
 	delay 20
-	applymovement VAR_0x8008, AquaHideout_B2F_Movement_1A0839
+	applymovement VAR_0x8008, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox AquaHideout_B2F_Text_1971AE, 4
+	msgbox AquaHideout_B2F_Text_1971AE, MSGBOX_DEFAULT
 	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
 	setflag FLAG_HIDE_GRUNTS_LILYCOVE
 	release
@@ -74,28 +74,28 @@ AquaHideout_B2F_Movement_15D958:: @ 815D958
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 AquaHideout_B2F_Movement_15D95D:: @ 815D95D
 	walk_right
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 AquaHideout_B2F_EventScript_15D962:: @ 815D962
 MagmaHideout_B2F_EventScript_15D962:: @ 815D962
-	trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
-	msgbox AquaHideout_B2F_Text_1972D2, 6
+	trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_2, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
+	msgbox AquaHideout_B2F_Text_1972D2, MSGBOX_AUTOCLOSE
 	end
 
 AquaHideout_B2F_EventScript_15D97D:: @ 815D97D
-	msgbox AquaHideout_B2F_Text_1972D2, 4
+	msgbox AquaHideout_B2F_Text_1972D2, MSGBOX_DEFAULT
 	release
 	end
 
 AquaHideout_B2F_EventScript_15D987:: @ 815D987
 MagmaHideout_B2F_EventScript_15D987:: @ 815D987
-	trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
-	msgbox AquaHideout_B2F_Text_1973C0, 6
+	trainerbattle_single TRAINER_HIDEOUT_B2F_GRUNT_3, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
+	msgbox AquaHideout_B2F_Text_1973C0, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc
index 589438fa3..99cbf517d 100644
--- a/data/maps/BattleTower_BattleRoom/scripts.inc
+++ b/data/maps/BattleTower_BattleRoom/scripts.inc
@@ -1,5 +1,5 @@
 BattleTower_BattleRoom_MapScripts:: @ 81608DB
-	map_script 2, BattleTower_BattleRoom_MapScript2_1608E1
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_BattleRoom_MapScript2_1608E1
 	.byte 0
 
 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
@@ -8,7 +8,7 @@ BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
 
 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
 	setvar VAR_TEMP_0, 1
-	applymovement 255, BattleTower_BattleRoom_Movement_160AB7
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160AB7
 	waitmovement 0
 
 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
@@ -17,7 +17,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
 	applymovement 1, BattleTower_BattleRoom_Movement_160AC0
 	waitmovement 0
 	special PrintBattleTowerTrainerGreeting
-	msgbox gStringVar4, 4
+	msgbox gStringVar4, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
 	special ScrSpecial_HealPlayerParty
@@ -48,9 +48,9 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961
 	removeobject 1
 	applymovement 2, BattleTower_BattleRoom_Movement_160ACB
 	waitmovement 0
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABC
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160ABC
 	waitmovement 0
-	msgbox BattleTower_BattleRoom_Text_19ACDC, 4
+	msgbox BattleTower_BattleRoom_Text_19ACDC, MSGBOX_DEFAULT
 	special LoadPlayerParty
 	special SavePlayerParty
 	special SetBattleTowerParty
@@ -81,7 +81,7 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
 
 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
 	closemessage
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_BattleRoom_Movement_160ABE
 	waitmovement 0
 	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
 	waitmovement 0
@@ -112,10 +112,10 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
 	waitmessage
 	playse SE_SAVE
 	waitse
-	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
+	msgbox BattleTower_BattleRoom_Text_1C6D05, MSGBOX_DEFAULT
 
 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special BattleTower_SoftReset
 	end
 
@@ -124,15 +124,15 @@ BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
 	walk_up
 	walk_up
 	face_right
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
 	face_down
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
 	face_right
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
 	walk_down
@@ -140,21 +140,21 @@ BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
 	walk_down
 	walk_down
 	face_left
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
 	walk_up
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
 	walk_right
 	walk_right
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
 	walk_down
@@ -162,4 +162,4 @@ BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
 	walk_left
 	walk_left
 	face_right
-	end_movement
+	step_end
diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc
index 8981a2a14..9f006e6c9 100644
--- a/data/maps/BattleTower_Corridor/scripts.inc
+++ b/data/maps/BattleTower_Corridor/scripts.inc
@@ -1,6 +1,6 @@
 BattleTower_Corridor_MapScripts:: @ 8160845
-	map_script 1, BattleTower_Corridor_MapScript1_160850
-	map_script 2, BattleTower_Corridor_MapScript2_160881
+	map_script MAP_SCRIPT_ON_LOAD, BattleTower_Corridor_MapScript1_160850
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Corridor_MapScript2_160881
 	.byte 0
 
 BattleTower_Corridor_MapScript1_160850:: @ 8160850
@@ -24,13 +24,13 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B
 	compare VAR_0x8006, 1
 	goto_if_eq BattleTower_Corridor_EventScript_1608B1
 	applymovement 1, BattleTower_Corridor_Movement_1608D5
-	applymovement 255, BattleTower_Corridor_Movement_1608D4
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Corridor_Movement_1608D4
 	waitmovement 0
 	goto BattleTower_Corridor_EventScript_1608C2
 
 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1
 	applymovement 1, BattleTower_Corridor_Movement_1608D2
-	applymovement 255, BattleTower_Corridor_Movement_1608D1
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Corridor_Movement_1608D1
 	waitmovement 0
 
 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2
@@ -55,4 +55,4 @@ BattleTower_Corridor_Movement_1608D5:: @ 81608D5
 	walk_right
 	walk_up
 	set_invisible
-	end_movement
+	step_end
diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc
index f3373ee6e..4e5d8b8c1 100644
--- a/data/maps/BattleTower_Elevator/scripts.inc
+++ b/data/maps/BattleTower_Elevator/scripts.inc
@@ -1,6 +1,6 @@
 BattleTower_Elevator_MapScripts:: @ 81607CF
-	map_script 2, BattleTower_Elevator_MapScript2_1607DA
-	map_script 4, BattleTower_Elevator_MapScript2_160821
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Elevator_MapScript2_1607DA
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleTower_Elevator_MapScript2_160821
 	.byte 0
 
 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA
@@ -10,13 +10,13 @@ BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA
 BattleTower_Elevator_EventScript_1607E4:: @ 81607E4
 	setvar VAR_TEMP_0, 1
 	applymovement 1, BattleTower_Elevator_Movement_160835
-	applymovement 255, BattleTower_Elevator_Movement_160839
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160839
 	waitmovement 0
 	special ShakeScreenInElevator
 	waitstate
 	delay 64
 	applymovement 1, BattleTower_Elevator_Movement_16083D
-	applymovement 255, BattleTower_Elevator_Movement_160841
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Elevator_Movement_160841
 	waitmovement 0
 	setvar VAR_TEMP_0, 0
 	warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1
@@ -29,29 +29,29 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821
 
 BattleTower_Elevator_EventScript_16082B:: @ 816082B
 	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 BattleTower_Elevator_Movement_160835:: @ 8160835
 	walk_up
 	walk_right
 	face_down
-	end_movement
+	step_end
 
 BattleTower_Elevator_Movement_160839:: @ 8160839
 	walk_up
 	walk_up
 	face_down
-	end_movement
+	step_end
 
 BattleTower_Elevator_Movement_16083D:: @ 816083D
 	walk_down
 	walk_down
 	set_invisible
-	end_movement
+	step_end
 
 BattleTower_Elevator_Movement_160841:: @ 8160841
 	walk_right
 	walk_down
 	walk_down
-	end_movement
+	step_end
diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc
index bac2dff05..e30502fb6 100644
--- a/data/maps/BattleTower_Lobby/scripts.inc
+++ b/data/maps/BattleTower_Lobby/scripts.inc
@@ -1,8 +1,8 @@
 BattleTower_Lobby_MapScripts:: @ 816027E
-	map_script 5, BattleTower_Lobby_MapScript1_160293
-	map_script 3, BattleTower_Lobby_MapScript1_1602E8
-	map_script 2, BattleTower_Lobby_MapScript2_160302
-	map_script 4, BattleTower_Lobby_MapScript2_1602EE
+	map_script MAP_SCRIPT_ON_RESUME, BattleTower_Lobby_MapScript1_160293
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleTower_Lobby_MapScript1_1602E8
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleTower_Lobby_MapScript2_160302
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleTower_Lobby_MapScript2_1602EE
 	.byte 0
 
 BattleTower_Lobby_MapScript1_160293:: @ 8160293
@@ -44,7 +44,7 @@ BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE
 
 BattleTower_Lobby_EventScript_1602F8:: @ 81602F8
 	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 BattleTower_Lobby_MapScript2_160302:: @ 8160302
@@ -62,7 +62,7 @@ BattleTower_Lobby_EventScript_16032C:: @ 816032C
 BattleTower_Lobby_EventScript_160330:: @ 8160330
 	lock
 	faceplayer
-	msgbox BattleTower_Lobby_Text_19A3FD, 4
+	msgbox BattleTower_Lobby_Text_19A3FD, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 5
 	release
@@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
 	waitmessage
 	playfanfare MUS_FANFA4
 	waitfanfare
-	msgbox BattleTower_Lobby_Text_19A719, 4
+	msgbox BattleTower_Lobby_Text_19A719, MSGBOX_DEFAULT
 
 BattleTower_Lobby_EventScript_16037D:: @ 816037D
 	setvar VAR_0x8004, 8
@@ -118,17 +118,17 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
 	special BattleTowerUtil
 	compare VAR_RESULT, 49
 	goto_if_ne BattleTower_Lobby_EventScript_1603F8
-	msgbox BattleTower_Lobby_Text_19A617, 4
+	msgbox BattleTower_Lobby_Text_19A617, MSGBOX_DEFAULT
 
 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
-	msgbox BattleTower_Lobby_Text_199FA9, 4
+	msgbox BattleTower_Lobby_Text_199FA9, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 5
 	release
 	end
 
 BattleTower_Lobby_EventScript_160408:: @ 8160408
-	msgbox BattleTower_Lobby_Text_19A520, 4
+	msgbox BattleTower_Lobby_Text_19A520, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
 	setvar VAR_TEMP_0, 5
@@ -148,7 +148,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419
 	special SaveBattleTowerProgress
 	playse SE_SAVE
 	waitse
-	msgbox BattleTower_Lobby_Text_199FA9, 4
+	msgbox BattleTower_Lobby_Text_199FA9, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 5
 	release
@@ -172,7 +172,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B
 	setvar VAR_TEMP_0, 5
 	special SavePlayerParty
 	special SetBattleTowerParty
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	msgbox BattleTower_Lobby_Text_19A0A8, MSGBOX_DEFAULT
 	closemessage
 	call BattleTower_Lobby_EventScript_160664
 	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
@@ -187,7 +187,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E
 	compare VAR_RESULT, 6
 	goto_if_eq BattleTower_Lobby_EventScript_160342
 	special SavePlayerParty
-	msgbox BattleTower_Lobby_Text_199F2C, 4
+	msgbox BattleTower_Lobby_Text_199F2C, MSGBOX_DEFAULT
 
 BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
 	message BattleTower_Lobby_Text_199F79
@@ -213,8 +213,8 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
 	copyvar VAR_0x8005, VAR_RESULT
 	copyvar VAR_0x8006, VAR_RESULT
 	special SetBattleTowerProperty
-	msgbox BattleTower_Lobby_Text_19A07B, 4
-	fadescreen 1
+	msgbox BattleTower_Lobby_Text_19A07B, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	special ChooseBattleTowerPlayerParty
 	waitstate
 	compare VAR_RESULT, 0
@@ -240,7 +240,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	special LoadPlayerParty
 	closemessage
 	delay 2
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	setvar VAR_TEMP_0, 5
 	erasebox 0, 0, 15, 10
 	compare VAR_RESULT, 0
@@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	special SavePlayerParty
 	special SetBattleTowerParty
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	msgbox BattleTower_Lobby_Text_19A0A8, MSGBOX_DEFAULT
 	closemessage
 	call BattleTower_Lobby_EventScript_160664
 	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
@@ -257,7 +257,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	waitstate
 
 BattleTower_Lobby_EventScript_160600:: @ 8160600
-	msgbox BattleTower_Lobby_Text_19A0D1, 4
+	msgbox BattleTower_Lobby_Text_19A0D1, MSGBOX_DEFAULT
 	goto BattleTower_Lobby_EventScript_1604BE
 
 BattleTower_Lobby_EventScript_16060D:: @ 816060D
@@ -266,11 +266,11 @@ BattleTower_Lobby_EventScript_16060D:: @ 816060D
 	case 1, BattleTower_Lobby_EventScript_160635
 
 BattleTower_Lobby_EventScript_160628:: @ 8160628
-	msgbox BattleTower_Lobby_Text_19A249, 4
+	msgbox BattleTower_Lobby_Text_19A249, MSGBOX_DEFAULT
 	goto BattleTower_Lobby_EventScript_160662
 
 BattleTower_Lobby_EventScript_160635:: @ 8160635
-	msgbox BattleTower_Lobby_Text_19A32D, 4
+	msgbox BattleTower_Lobby_Text_19A32D, MSGBOX_DEFAULT
 	goto BattleTower_Lobby_EventScript_160662
 
 BattleTower_Lobby_EventScript_160642:: @ 8160642
@@ -282,7 +282,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F
 	special LoadPlayerParty
 
 BattleTower_Lobby_EventScript_160652:: @ 8160652
-	msgbox BattleTower_Lobby_Text_199FA9, 4
+	msgbox BattleTower_Lobby_Text_199FA9, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 11
 	special SetBattleTowerProperty
 
@@ -292,12 +292,12 @@ BattleTower_Lobby_EventScript_160662:: @ 8160662
 
 BattleTower_Lobby_EventScript_160664:: @ 8160664
 	applymovement 1, BattleTower_Lobby_Movement_160693
-	applymovement 255, BattleTower_Lobby_Movement_160693
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Lobby_Movement_160693
 	waitmovement 0
 	opendoor 6, 1
 	waitdooranim
 	applymovement 1, BattleTower_Lobby_Movement_160697
-	applymovement 255, BattleTower_Lobby_Movement_16069A
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Lobby_Movement_16069A
 	waitmovement 0
 	closedoor 6, 1
 	waitdooranim
@@ -307,18 +307,18 @@ BattleTower_Lobby_Movement_160693:: @ 8160693
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 BattleTower_Lobby_Movement_160697:: @ 8160697
 	walk_up
 	set_invisible
-	end_movement
+	step_end
 
 BattleTower_Lobby_Movement_16069A:: @ 816069A
 	walk_up
 	walk_up
 	set_invisible
-	end_movement
+	step_end
 
 @ 816069E
 	walk_fast_up
@@ -327,7 +327,7 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A
 	walk_fast_up
 	walk_fast_up
 	set_invisible
-	end_movement
+	step_end
 
 BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
 	lock
@@ -340,9 +340,9 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
 	end
 
 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
-	msgbox BattleTower_Lobby_Text_19A7C3, 4
+	msgbox BattleTower_Lobby_Text_19A7C3, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
-	call BattleTower_Lobby_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
@@ -352,26 +352,26 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
 	end
 
 BattleTower_Lobby_EventScript_1606F7:: @ 81606F7
-	msgbox BattleTower_Lobby_Text_19A7FD, 4
+	msgbox BattleTower_Lobby_Text_19A7FD, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_160701:: @ 8160701
-	msgbox BattleTower_Lobby_Text_19A83D, 4
+	msgbox BattleTower_Lobby_Text_19A83D, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_16070B:: @ 816070B
-	msgbox BattleTower_Lobby_Text_19A871, 4
+	msgbox BattleTower_Lobby_Text_19A871, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_160715:: @ 8160715
-	msgbox BattleTower_Lobby_Text_19A8AE, 2
+	msgbox BattleTower_Lobby_Text_19A8AE, MSGBOX_NPC
 	end
 
 BattleTower_Lobby_EventScript_16071E:: @ 816071E
-	msgbox BattleTower_Lobby_Text_19A946, 2
+	msgbox BattleTower_Lobby_Text_19A946, MSGBOX_NPC
 	end
 
 BattleTower_Lobby_EventScript_160727:: @ 8160727
@@ -387,13 +387,13 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733
 	faceplayer
 	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
 	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
-	msgbox BattleTower_Lobby_Text_19A9EE, 4
+	msgbox BattleTower_Lobby_Text_19A9EE, MSGBOX_DEFAULT
 	setvar VAR_0x8008, DECOR_SILVER_SHIELD
-	givedecoration_std DECOR_SILVER_SHIELD
+	givedecoration DECOR_SILVER_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
 	setflag FLAG_RECEIVED_SILVER_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	msgbox BattleTower_Lobby_Text_19ABAA, MSGBOX_DEFAULT
 	release
 	end
 
@@ -401,24 +401,24 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773
 	specialvar VAR_RESULT, GetBestBattleTowerStreak
 	compare VAR_RESULT, 100
 	goto_if_lt BattleTower_Lobby_EventScript_1607C5
-	msgbox BattleTower_Lobby_Text_19AAC4, 4
+	msgbox BattleTower_Lobby_Text_19AAC4, MSGBOX_DEFAULT
 	setvar VAR_0x8008, DECOR_GOLD_SHIELD
-	givedecoration_std DECOR_GOLD_SHIELD
+	givedecoration DECOR_GOLD_SHIELD
 	compare VAR_RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_1607AF
 	setflag FLAG_RECEIVED_GOLD_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	msgbox BattleTower_Lobby_Text_19ABAA, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
 	bufferdecorationname 1, VAR_0x8008
-	msgbox BattleTower_Lobby_Text_1A0CEF, 4
-	msgbox BattleTower_Lobby_Text_19ABED, 4
+	msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
+	msgbox BattleTower_Lobby_Text_19ABED, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Lobby_EventScript_1607C5:: @ 81607C5
-	msgbox BattleTower_Lobby_Text_19AC55, 4
+	msgbox BattleTower_Lobby_Text_19AC55, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/BattleTower_Outside/scripts.inc b/data/maps/BattleTower_Outside/scripts.inc
index 680738272..0290737ce 100644
--- a/data/maps/BattleTower_Outside/scripts.inc
+++ b/data/maps/BattleTower_Outside/scripts.inc
@@ -1,5 +1,5 @@
 BattleTower_Outside_MapScripts:: @ 8160156
-	map_script 3, BattleTower_Outside_MapScript1_16015C
+	map_script MAP_SCRIPT_ON_TRANSITION, BattleTower_Outside_MapScript1_16015C
 	.byte 0
 
 BattleTower_Outside_MapScript1_16015C:: @ 816015C
@@ -11,7 +11,7 @@ BattleTower_Outside_MapScript1_16015C:: @ 816015C
 BattleTower_Outside_EventScript_160168:: @ 8160168
 	lock
 	faceplayer
-	msgbox BattleTower_Outside_Text_199D06, 4
+	msgbox BattleTower_Outside_Text_199D06, MSGBOX_DEFAULT
 	checkitem ITEM_SS_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq BattleTower_Outside_EventScript_1601C6
@@ -30,7 +30,7 @@ BattleTower_Outside_EventScript_16018E:: @ 816018E
 	end
 
 BattleTower_Outside_EventScript_1601C6:: @ 81601C6
-	msgbox BattleTower_Outside_Text_199D40, 4
+	msgbox BattleTower_Outside_Text_199D40, MSGBOX_DEFAULT
 	release
 	end
 
@@ -38,7 +38,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0
 	msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleTower_Outside_EventScript_160226
-	msgbox BattleTower_Outside_Text_199E4B, 4
+	msgbox BattleTower_Outside_Text_199E4B, MSGBOX_DEFAULT
 	call BattleTower_Outside_EventScript_160232
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -49,7 +49,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB
 	msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleTower_Outside_EventScript_160226
-	msgbox BattleTower_Outside_Text_199E4B, 4
+	msgbox BattleTower_Outside_Text_199E4B, MSGBOX_DEFAULT
 	call BattleTower_Outside_EventScript_160232
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -64,31 +64,31 @@ BattleTower_Outside_EventScript_160226:: @ 8160226
 
 BattleTower_Outside_EventScript_160232:: @ 8160232
 	closemessage
-	applymovement VAR_LAST_TALKED, BattleTower_Outside_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE
 	setvar VAR_0x8004, 4
-	call BattleTower_Outside_EventScript_1A047C
+	call Common_EventScript_FerryDepartIsland
 	return
 
 BattleTower_Outside_EventScript_160250:: @ 8160250
-	msgbox BattleTower_Outside_Text_199E29, 4
+	msgbox BattleTower_Outside_Text_199E29, MSGBOX_DEFAULT
 	release
 	end
 
 BattleTower_Outside_EventScript_16025A:: @ 816025A
-	msgbox BattleTower_Outside_Text_199C6F, 3
+	msgbox BattleTower_Outside_Text_199C6F, MSGBOX_SIGN
 	end
 
 BattleTower_Outside_EventScript_160263:: @ 8160263
-	msgbox BattleTower_Outside_Text_199CA4, 2
+	msgbox BattleTower_Outside_Text_199CA4, MSGBOX_NPC
 	end
 
 BattleTower_Outside_EventScript_16026C:: @ 816026C
-	msgbox BattleTower_Outside_Text_199E9C, 2
+	msgbox BattleTower_Outside_Text_199E9C, MSGBOX_NPC
 	end
 
 BattleTower_Outside_EventScript_160275:: @ 8160275
-	msgbox BattleTower_Outside_Text_199ED4, 2
+	msgbox BattleTower_Outside_Text_199ED4, MSGBOX_NPC
 	end
diff --git a/data/maps/CaveOfOrigin_1F/map.json b/data/maps/CaveOfOrigin_1F/map.json
index 0a12aa36e..a111c1a10 100644
--- a/data/maps/CaveOfOrigin_1F/map.json
+++ b/data/maps/CaveOfOrigin_1F/map.json
@@ -35,7 +35,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -44,7 +44,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -53,7 +53,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     }
   ],
   "bg_events": []
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 58c6563f6..0ad0d0019 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -1,7 +1,7 @@
 CaveOfOrigin_1F_MapScripts:: @ 815DD6C
-	map_script 3, CaveOfOrigin_1F_MapScript1_15DD72
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_MapScript1_15DD72
 	.byte 0
 
 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_B1F/map.json b/data/maps/CaveOfOrigin_B1F/map.json
index ed873116c..71220abe6 100644
--- a/data/maps/CaveOfOrigin_B1F/map.json
+++ b/data/maps/CaveOfOrigin_B1F/map.json
@@ -35,7 +35,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -44,7 +44,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -53,7 +53,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B1F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     }
   ],
   "bg_events": []
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index c79eb088e..62aaed6d9 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -1,7 +1,7 @@
 CaveOfOrigin_B1F_MapScripts:: @ 815DD7C
-	map_script 3, CaveOfOrigin_B1F_MapScript1_15DD82
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B1F_MapScript1_15DD82
 	.byte 0
 
 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_B2F/map.json b/data/maps/CaveOfOrigin_B2F/map.json
index 9c35a6ad3..0a2f03ae2 100644
--- a/data/maps/CaveOfOrigin_B2F/map.json
+++ b/data/maps/CaveOfOrigin_B2F/map.json
@@ -35,7 +35,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B2F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -44,7 +44,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B2F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -53,7 +53,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "CaveOfOrigin_B2F_EventScript_1A04BB"
+      "script": "CaveOfOrigin_EventScript_Shake2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/CaveOfOrigin_B2F/scripts.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc
index 66b02ee9f..ca0249f68 100644
--- a/data/maps/CaveOfOrigin_B2F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B2F/scripts.inc
@@ -1,7 +1,7 @@
 CaveOfOrigin_B2F_MapScripts:: @ 815DD8C
-	map_script 3, CaveOfOrigin_B2F_MapScript1_15DD92
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B2F_MapScript1_15DD92
 	.byte 0
 
 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_B3F/map.json b/data/maps/CaveOfOrigin_B3F/map.json
index e0b2c8c5c..4546d50f8 100644
--- a/data/maps/CaveOfOrigin_B3F/map.json
+++ b/data/maps/CaveOfOrigin_B3F/map.json
@@ -49,7 +49,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "CaveOfOrigin_B3F_EventScript_1A04AF"
+      "script": "CaveOfOrigin_EventScript_Shake1"
     },
     {
       "type": "trigger",
@@ -58,7 +58,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "CaveOfOrigin_B3F_EventScript_1A04BB"
+      "script": "CaveOfOrigin_EventScript_Shake2"
     },
     {
       "type": "trigger",
@@ -67,7 +67,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "CaveOfOrigin_B3F_EventScript_1A04BB"
+      "script": "CaveOfOrigin_EventScript_Shake2"
     }
   ],
   "bg_events": []
diff --git a/data/maps/CaveOfOrigin_B3F/scripts.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc
index 8084ceb43..2ec00218c 100644
--- a/data/maps/CaveOfOrigin_B3F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B3F/scripts.inc
@@ -1,7 +1,7 @@
 CaveOfOrigin_B3F_MapScripts:: @ 815DD9C
-	map_script 3, CaveOfOrigin_B3F_MapScript1_15DDA2
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B3F_MapScript1_15DDA2
 	.byte 0
 
 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_B4F/map.json b/data/maps/CaveOfOrigin_B4F/map.json
index 43e765b0b..5270d384b 100644
--- a/data/maps/CaveOfOrigin_B4F/map.json
+++ b/data/maps/CaveOfOrigin_B4F/map.json
@@ -51,7 +51,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": "0",
-      "script": "CaveOfOrigin_B4F_EventScript_1A04A0"
+      "script": "CaveOfOrigin_EventScript_LegendaryCry"
     },
     {
       "type": "trigger",
@@ -60,7 +60,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": "0",
-      "script": "CaveOfOrigin_B4F_EventScript_1A04A0"
+      "script": "CaveOfOrigin_EventScript_LegendaryCry"
     }
   ],
   "bg_events": []
diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc
index b689d5158..96cf8610d 100644
--- a/data/maps/CaveOfOrigin_B4F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B4F/scripts.inc
@@ -1,6 +1,6 @@
 CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
-	map_script 5, CaveOfOrigin_B4F_MapScript1_15DDB7
-	map_script 3, CaveOfOrigin_B4F_MapScript1_15DDC5
+	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_B4F_MapScript1_15DDB7
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_B4F_MapScript1_15DDC5
 	.byte 0
 
 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
@@ -17,18 +17,18 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
 	.else
 	setmaplayoutindex 313
 	.endif
-	call CaveOfOrigin_B4F_EventScript_1A01B5
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3
+	call Common_EventScript_SetupLegendaryGfxIds
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_EventScript_DisableTriggers
 	end
 
 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	lockall
-	applymovement 255, CaveOfOrigin_B4F_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4F03, 4
+	msgbox UnknownString_81B4F03, MSGBOX_DEFAULT
 	.else
-	msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
+	msgbox CaveOfOrigin_B4F_Text_1B4FE4, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	setweather WEATHER_NONE
@@ -81,17 +81,17 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 
 CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4F29, 4
+	msgbox UnknownString_81B4F29, MSGBOX_DEFAULT
 	.else
-	msgbox CaveOfOrigin_B4F_Text_1B5009, 4
+	msgbox CaveOfOrigin_B4F_Text_1B5009, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	return
 
 CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D
 	init_affine_anim
-	walk_down_affine_0
+	walk_down_start_affine
 	delay_16
 	delay_16
-	walk_down_affine_1
-	end_movement
+	walk_down_affine
+	step_end
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index fefb24228..cfd5d115a 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -1,7 +1,7 @@
 DesertRuins_MapScripts:: @ 815CAF3
-	map_script 5, DesertRuins_MapScript1_15CB03
-	map_script 1, DesertRuins_MapScript1_15CB11
-	map_script 3, DesertRuins_MapScript1_15CB52
+	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_MapScript1_15CB03
+	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_MapScript1_15CB11
+	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_MapScript1_15CB52
 	.byte 0
 
 DesertRuins_MapScript1_15CB03:: @ 815CB03
@@ -39,7 +39,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56
 	end
 
 DesertRuins_EventScript_15CB6D:: @ 815CB6D
-	msgbox DesertRuins_Text_1A13BE, 4
+	msgbox DesertRuins_Text_1A13BE, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/DewfordTown/map.json b/data/maps/DewfordTown/map.json
index b6291d287..4e130a9df 100644
--- a/data/maps/DewfordTown/map.json
+++ b/data/maps/DewfordTown/map.json
@@ -149,7 +149,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -157,7 +157,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "DewfordTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index dec181f27..51df11d88 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -1,5 +1,5 @@
 DewfordTown_MapScripts:: @ 814DFF8
-	map_script 3, DewfordTown_MapScript1_14DFFE
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_MapScript1_14DFFE
 	.byte 0
 
 DewfordTown_MapScript1_14DFFE:: @ 814DFFE
@@ -21,21 +21,21 @@ DewfordTown_EventScript_14E002:: @ 814E002
 	end
 
 DewfordTown_EventScript_14E04B:: @ 814E04B
-	msgbox DewfordTown_Text_16B57D, 4
+	msgbox DewfordTown_Text_16B57D, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_14E151
 	release
 	end
 
 DewfordTown_EventScript_14E05B:: @ 814E05B
-	msgbox DewfordTown_Text_16B5D2, 4
+	msgbox DewfordTown_Text_16B5D2, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_14E1D8
 	release
 	end
 
 DewfordTown_EventScript_14E06B:: @ 814E06B
-	msgbox DewfordTown_Text_16B627, 4
+	msgbox DewfordTown_Text_16B627, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
@@ -44,30 +44,30 @@ DewfordTown_EventScript_14E076:: @ 814E076
 	msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq DewfordTown_EventScript_14E093
-	msgbox DewfordTown_Text_16B471, 4
+	msgbox DewfordTown_Text_16B471, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E093:: @ 814E093
-	msgbox DewfordTown_Text_16B417, 4
+	msgbox DewfordTown_Text_16B417, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_14E151
 	end
 
 DewfordTown_EventScript_14E0A2:: @ 814E0A2
-	msgbox DewfordTown_Text_16B23B, 2
+	msgbox DewfordTown_Text_16B23B, MSGBOX_NPC
 	end
 
 DewfordTown_EventScript_14E0AB:: @ 814E0AB
-	msgbox DewfordTown_Text_16B2A7, 3
+	msgbox DewfordTown_Text_16B2A7, MSGBOX_SIGN
 	end
 
 DewfordTown_EventScript_14E0B4:: @ 814E0B4
-	msgbox DewfordTown_Text_16B2D5, 3
+	msgbox DewfordTown_Text_16B2D5, MSGBOX_SIGN
 	end
 
 DewfordTown_EventScript_14E0BD:: @ 814E0BD
-	msgbox DewfordTown_Text_16B317, 3
+	msgbox DewfordTown_Text_16B317, MSGBOX_SIGN
 	end
 
 DewfordTown_EventScript_14E0C6:: @ 814E0C6
@@ -82,15 +82,15 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6
 	end
 
 DewfordTown_EventScript_14E0F0:: @ 814E0F0
-	msgbox DewfordTown_Text_16B6A8, 4
-	giveitem_std ITEM_OLD_ROD
+	msgbox DewfordTown_Text_16B6A8, MSGBOX_DEFAULT
+	giveitem ITEM_OLD_ROD
 	setflag FLAG_RECEIVED_OLD_ROD
-	msgbox DewfordTown_Text_16B6F9, 4
+	msgbox DewfordTown_Text_16B6F9, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E111:: @ 814E111
-	msgbox DewfordTown_Text_16B828, 4
+	msgbox DewfordTown_Text_16B828, MSGBOX_DEFAULT
 	release
 	end
 
@@ -105,41 +105,41 @@ DewfordTown_EventScript_14E11B:: @ 814E11B
 	end
 
 DewfordTown_EventScript_14E13D:: @ 814E13D
-	msgbox DewfordTown_Text_16B866, 4
+	msgbox DewfordTown_Text_16B866, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E147:: @ 814E147
-	msgbox DewfordTown_Text_16B89A, 4
+	msgbox DewfordTown_Text_16B89A, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E151:: @ 814E151
-	call DewfordTown_EventScript_1A010C
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	setobjectpriority 255, MAP_DEWFORD_TOWN, 0
 	applymovement 2, DewfordTown_Movement_14E40E
 	waitmovement 0
 	removeobject 2
-	applymovement 255, DewfordTown_Movement_14E402
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402
 	waitmovement 0
-	hideobjectat 255, MAP_DEWFORD_TOWN
-	call DewfordTown_EventScript_1A02E7
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
+	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement 4, DewfordTown_Movement_14E293
-	applymovement 255, DewfordTown_Movement_14E293
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E293
 	waitmovement 0
-	showobjectat 255, MAP_ROUTE104
-	call DewfordTown_EventScript_1A02EF
-	applymovement 255, DewfordTown_Movement_14E405
+	showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
+	call Common_EventScript_StopBrineysBoatMusic
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E405
 	waitmovement 0
-	showobjectat 255, MAP_ROUTE104
+	showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
 	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
 	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
 	hideobjectat 4, MAP_DEWFORD_TOWN
 	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
-	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
 	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
 	waitstate
@@ -147,22 +147,22 @@ DewfordTown_EventScript_14E151:: @ 814E151
 	end
 
 DewfordTown_EventScript_14E1D8:: @ 814E1D8
-	call DewfordTown_EventScript_1A010C
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
 	setobjectpriority 255, MAP_DEWFORD_TOWN, 1
 	applymovement 2, DewfordTown_Movement_14E40E
 	waitmovement 0
 	removeobject 2
-	applymovement 255, DewfordTown_Movement_14E402
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E402
 	waitmovement 0
-	hideobjectat 255, MAP_DEWFORD_TOWN
-	call DewfordTown_EventScript_1A02E7
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
+	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement 4, DewfordTown_Movement_14E356
-	applymovement 255, DewfordTown_Movement_14E356
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E356
 	waitmovement 0
-	call DewfordTown_EventScript_1A02EF
-	showobjectat 255, MAP_ROUTE109
-	applymovement 255, DewfordTown_Movement_14E409
+	call Common_EventScript_StopBrineysBoatMusic
+	showobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
+	applymovement OBJ_EVENT_ID_PLAYER, DewfordTown_Movement_14E409
 	waitmovement 0
 	setobjectxyperm 2, 21, 26
 	addobject 2
@@ -178,18 +178,18 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A
 	closemessage
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
-	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
 	resetobjectpriority 2, MAP_ROUTE109
 	moveobjectoffscreen 2
 	release
 	end
 
 DewfordTown_EventScript_14E281:: @ 814E281
-	msgbox DewfordTown_Text_16E080, 4
+	msgbox DewfordTown_Text_16E080, MSGBOX_DEFAULT
 	return
 
 DewfordTown_EventScript_14E28A:: @ 814E28A
-	msgbox DewfordTown_Text_16E1FA, 4
+	msgbox DewfordTown_Text_16E1FA, MSGBOX_DEFAULT
 	return
 
 DewfordTown_Movement_14E293:: @ 814E293
@@ -387,7 +387,7 @@ DewfordTown_Movement_14E293:: @ 814E293
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E356:: @ 814E356
 	walk_right
@@ -561,39 +561,39 @@ DewfordTown_Movement_14E356:: @ 814E356
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E402:: @ 814E402
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E405:: @ 814E405
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E409:: @ 814E409
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E40E:: @ 814E40E
 	walk_up
-	end_movement
+	step_end
 
 DewfordTown_Movement_14E410:: @ 814E410
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 DewfordTown_EventScript_14E413:: @ 814E413
 	lock
 	faceplayer
-	call DewfordTown_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq DewfordTown_EventScript_14E439
@@ -602,14 +602,14 @@ DewfordTown_EventScript_14E413:: @ 814E413
 	end
 
 DewfordTown_EventScript_14E439:: @ 814E439
-	msgbox DewfordTown_Text_16BD37, 4
+	msgbox DewfordTown_Text_16BD37, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E443:: @ 814E443
-	msgbox DewfordTown_Text_16BADC, 4
+	msgbox DewfordTown_Text_16BADC, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 9
-	call DewfordTown_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -622,21 +622,21 @@ DewfordTown_EventScript_14E46E:: @ 814E46E
 	incrementgamestat GAME_STAT_STARTED_TRENDS
 	compare VAR_0x8004, 0
 	goto_if_eq DewfordTown_EventScript_14E48F
-	msgbox DewfordTown_Text_16BB44, 4
+	msgbox DewfordTown_Text_16BB44, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E485:: @ 814E485
-	msgbox DewfordTown_Text_16BCE9, 4
+	msgbox DewfordTown_Text_16BCE9, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_EventScript_14E48F:: @ 814E48F
-	msgbox DewfordTown_Text_16BCA2, 4
+	msgbox DewfordTown_Text_16BCA2, MSGBOX_DEFAULT
 	release
 	end
 
 @ 814E499
-	msgbox DewfordTown_Text_16BD79, 4
+	msgbox DewfordTown_Text_16BD79, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 476880f68..30f7b2b6d 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -1,5 +1,5 @@
 DewfordTown_Gym_MapScripts:: @ 8153065
-	map_script 3, DewfordTown_Gym_MapScript1_15306B
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_MapScript1_15306B
 	.byte 0
 
 DewfordTown_Gym_MapScript1_15306B:: @ 815306B
@@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B
 	end
 
 DewfordTown_Gym_EventScript_153071:: @ 8153071
-	goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA
+	goto_if_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA
 	call DewfordTown_Gym_EventScript_153122
 	copyvar VAR_0x8001, VAR_0x8000
 	compare VAR_0x8000, 0
@@ -80,24 +80,24 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117
 
 DewfordTown_Gym_EventScript_153122:: @ 8153122
 	setvar VAR_0x8000, 0
-	goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135
+	goto_if_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135
 	addvar VAR_0x8000, 1
 
 DewfordTown_Gym_EventScript_153135:: @ 8153135
-	goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143
+	goto_if_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143
 	addvar VAR_0x8000, 1
 
 DewfordTown_Gym_EventScript_153143:: @ 8153143
-	goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151
+	goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151
 	addvar VAR_0x8000, 1
 
 DewfordTown_Gym_EventScript_153151:: @ 8153151
 	return
 
 DewfordTown_Gym_EventScript_153152:: @ 8153152
-	trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177
+	trainerbattle_single TRAINER_BRAWLY, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5
-	msgbox DewfordTown_Gym_Text_175412, 4
+	msgbox DewfordTown_Gym_Text_175412, MSGBOX_DEFAULT
 	release
 	end
 
@@ -105,30 +105,30 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177
 	call DewfordTown_Gym_EventScript_153117
 	message DewfordTown_Gym_Text_1752BB
 	waitmessage
-	call DewfordTown_Gym_EventScript_1A02C5
-	msgbox DewfordTown_Gym_Text_1752E6, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox DewfordTown_Gym_Text_1752E6, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_DEWFORD_GYM
 	setflag FLAG_BADGE02_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq DewfordTown_Gym_EventScript_1A00FB
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 2
-	call DewfordTown_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto DewfordTown_Gym_EventScript_1531B5
 	end
 
 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5
-	giveitem_std ITEM_TM08_BULK_UP
+	giveitem ITEM_TM08_BULK_UP
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Gym_EventScript_1A029B
-	msgbox DewfordTown_Gym_Text_1753BF, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox DewfordTown_Gym_Text_1753BF, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM08
 	release
 	end
 
 DewfordTown_Gym_EventScript_1531D9:: @ 81531D9
-	trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4
-	msgbox DewfordTown_Gym_Text_174F8E, 6
+	trainerbattle_single TRAINER_HIDEKI, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4
+	msgbox DewfordTown_Gym_Text_174F8E, MSGBOX_AUTOCLOSE
 	end
 
 DewfordTown_Gym_EventScript_1531F4:: @ 81531F4
@@ -137,8 +137,8 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4
 	end
 
 DewfordTown_Gym_EventScript_1531FB:: @ 81531FB
-	trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216
-	msgbox DewfordTown_Gym_Text_175031, 6
+	trainerbattle_single TRAINER_TESSA, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216
+	msgbox DewfordTown_Gym_Text_175031, MSGBOX_AUTOCLOSE
 	end
 
 DewfordTown_Gym_EventScript_153216:: @ 8153216
@@ -147,8 +147,8 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216
 	end
 
 DewfordTown_Gym_EventScript_15321D:: @ 815321D
-	trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238
-	msgbox DewfordTown_Gym_Text_175117, 6
+	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238
+	msgbox DewfordTown_Gym_Text_175117, MSGBOX_AUTOCLOSE
 	end
 
 DewfordTown_Gym_EventScript_153238:: @ 8153238
@@ -160,12 +160,12 @@ DewfordTown_Gym_EventScript_15323F:: @ 815323F
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254
-	msgbox DewfordTown_Gym_Text_174D98, 4
+	msgbox DewfordTown_Gym_Text_174D98, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Gym_EventScript_153254:: @ 8153254
-	msgbox DewfordTown_Gym_Text_174F1E, 4
+	msgbox DewfordTown_Gym_Text_174F1E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -182,11 +182,11 @@ DewfordTown_Gym_EventScript_15326E:: @ 815326E
 	end
 
 DewfordTown_Gym_EventScript_15327E:: @ 815327E
-	msgbox DewfordTown_Gym_Text_175490, 4
+	msgbox DewfordTown_Gym_Text_175490, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Gym_EventScript_153288:: @ 8153288
-	msgbox DewfordTown_Gym_Text_175477, 4
+	msgbox DewfordTown_Gym_Text_175477, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 65e16a78a..cfed2c8b1 100644
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -4,31 +4,31 @@ DewfordTown_Hall_MapScripts:: @ 8153292
 DewfordTown_Hall_EventScript_153293:: @ 8153293
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	special TrendyPhraseIsOld
 	compare VAR_RESULT, 1
 	goto_if_eq DewfordTown_Hall_EventScript_1532B2
-	msgbox DewfordTown_Hall_Text_1754C9, 4
+	msgbox DewfordTown_Hall_Text_1754C9, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_1532B2:: @ 81532B2
-	msgbox DewfordTown_Hall_Text_175528, 4
+	msgbox DewfordTown_Hall_Text_175528, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_1532BC:: @ 81532BC
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17559E, 4
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_17559E, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_1532CD:: @ 81532CD
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	special BufferRandomHobbyOrLifestyleString
 	msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -38,22 +38,22 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD
 	end
 
 DewfordTown_Hall_EventScript_1532F6:: @ 81532F6
-	msgbox DewfordTown_Hall_Text_175664, 4
+	msgbox DewfordTown_Hall_Text_175664, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_153300:: @ 8153300
-	msgbox DewfordTown_Hall_Text_1756B7, 4
+	msgbox DewfordTown_Hall_Text_1756B7, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_15330A:: @ 815330A
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17570D, 4
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_17570D, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, DewfordTown_Hall_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
@@ -61,10 +61,10 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A
 DewfordTown_Hall_EventScript_153326:: @ 8153326
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17574C, 4
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_17574C, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, DewfordTown_Hall_Movement_1A0841
+	applymovement 5, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	release
 	end
@@ -72,21 +72,21 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326
 DewfordTown_Hall_EventScript_153342:: @ 8153342
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_175779, 4
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_175779, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_Hall_EventScript_153353:: @ 8153353
 	lockall
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_175842, 4
+	call Common_EventScript_BufferTrendyPhrase
+	msgbox DewfordTown_Hall_Text_175842, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_153363:: @ 8153363
 	lockall
-	call DewfordTown_Hall_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
 	switch VAR_RESULT
 	case 0, DewfordTown_Hall_EventScript_1533CA
@@ -100,22 +100,22 @@ DewfordTown_Hall_EventScript_153363:: @ 8153363
 	end
 
 DewfordTown_Hall_EventScript_1533CA:: @ 81533CA
-	msgbox DewfordTown_Hall_Text_1758C4, 4
+	msgbox DewfordTown_Hall_Text_1758C4, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1533D4:: @ 81533D4
-	msgbox DewfordTown_Hall_Text_1758E0, 4
+	msgbox DewfordTown_Hall_Text_1758E0, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1533DE:: @ 81533DE
-	msgbox DewfordTown_Hall_Text_1758FB, 4
+	msgbox DewfordTown_Hall_Text_1758FB, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1533E8:: @ 81533E8
-	msgbox DewfordTown_Hall_Text_175916, 4
+	msgbox DewfordTown_Hall_Text_175916, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -132,7 +132,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE
 	end
 
 DewfordTown_Hall_EventScript_15340A:: @ 815340A
-	call DewfordTown_Hall_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
 	switch VAR_RESULT
 	case 0, DewfordTown_Hall_EventScript_153470
@@ -147,41 +147,41 @@ DewfordTown_Hall_EventScript_15340A:: @ 815340A
 
 DewfordTown_Hall_EventScript_153470:: @ 8153470
 	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175935, 4
+	msgbox DewfordTown_Hall_Text_175935, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_1759A1, 4
+	msgbox DewfordTown_Hall_Text_1759A1, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_15348C:: @ 815348C
 	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175A5C, 4
+	msgbox DewfordTown_Hall_Text_175A5C, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175AD9, 4
+	msgbox DewfordTown_Hall_Text_175AD9, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1534A8:: @ 81534A8
 	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175B46, 4
+	msgbox DewfordTown_Hall_Text_175B46, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175BA7, 4
+	msgbox DewfordTown_Hall_Text_175BA7, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1534C4:: @ 81534C4
 	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175C41, 4
+	msgbox DewfordTown_Hall_Text_175C41, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175CC2, 4
+	msgbox DewfordTown_Hall_Text_175CC2, MSGBOX_DEFAULT
 	releaseall
 	end
 
 DewfordTown_Hall_EventScript_1534E0:: @ 81534E0
 	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175D6B, 4
+	msgbox DewfordTown_Hall_Text_175D6B, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175DC3, 4
+	msgbox DewfordTown_Hall_Text_175DC3, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD
 DewfordTown_Hall_EventScript_15351E:: @ 815351E
 	compare VAR_FACING, 4
 	goto_if_eq DewfordTown_Hall_EventScript_1534FC
-	applymovement 255, DewfordTown_Hall_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -224,44 +224,44 @@ DewfordTown_Hall_EventScript_153556:: @ 8153556
 	return
 
 DewfordTown_Hall_EventScript_15356D:: @ 815356D
-	applymovement 255, DewfordTown_Hall_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_153578:: @ 8153578
-	applymovement 255, DewfordTown_Hall_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 DewfordTown_Hall_EventScript_153583:: @ 8153583
 	compare VAR_FACING, 3
 	goto_if_eq DewfordTown_Hall_EventScript_1534FC
-	applymovement 255, DewfordTown_Hall_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 DewfordTown_Hall_Movement_153599:: @ 8153599
 	walk_in_place_left
-	end_movement
+	step_end
 
 DewfordTown_Hall_Movement_15359B:: @ 815359B
 	walk_in_place_right
-	end_movement
+	step_end
 
 DewfordTown_Hall_EventScript_15359D:: @ 815359D
 	lock
 	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
+	call Common_EventScript_BufferTrendyPhrase
 	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1
-	msgbox DewfordTown_Hall_Text_175E13, 4
-	giveitem_std ITEM_TM36_SLUDGE_BOMB
+	msgbox DewfordTown_Hall_Text_175E13, MSGBOX_DEFAULT
+	giveitem ITEM_TM36_SLUDGE_BOMB
 	compare VAR_RESULT, 0
-	goto_if_eq DewfordTown_Hall_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM36
 	release
 	end
 
 DewfordTown_Hall_EventScript_1535D1:: @ 81535D1
-	msgbox DewfordTown_Hall_Text_175EBE, 4
+	msgbox DewfordTown_Hall_Text_175EBE, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc
index 4a112eea2..808d0fdf7 100644
--- a/data/maps/DewfordTown_House1/scripts.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
@@ -2,11 +2,11 @@ DewfordTown_House1_MapScripts:: @ 8152FEE
 	.byte 0
 
 DewfordTown_House1_EventScript_152FEF:: @ 8152FEF
-	msgbox DewfordTown_House1_Text_174BA5, 2
+	msgbox DewfordTown_House1_Text_174BA5, MSGBOX_NPC
 	end
 
 DewfordTown_House1_EventScript_152FF8:: @ 8152FF8
-	msgbox DewfordTown_House1_Text_174C0D, 2
+	msgbox DewfordTown_House1_Text_174C0D, MSGBOX_NPC
 	end
 
 DewfordTown_House1_EventScript_153001:: @ 8153001
@@ -14,7 +14,7 @@ DewfordTown_House1_EventScript_153001:: @ 8153001
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox DewfordTown_House1_Text_174CC8, 4
+	msgbox DewfordTown_House1_Text_174CC8, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc
index 307e33033..6748fb5e1 100644
--- a/data/maps/DewfordTown_House2/scripts.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
@@ -5,8 +5,8 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615
-	msgbox DewfordTown_House2_Text_175EFE, 4
-	giveitem_std ITEM_SILK_SCARF
+	msgbox DewfordTown_House2_Text_175EFE, MSGBOX_DEFAULT
+	giveitem ITEM_SILK_SCARF
 	compare VAR_RESULT, 0
 	goto_if_eq DewfordTown_House2_EventScript_15360B
 	setflag FLAG_RECEIVED_SILK_SCARF
@@ -14,15 +14,15 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC
 	end
 
 DewfordTown_House2_EventScript_15360B:: @ 815360B
-	msgbox DewfordTown_House2_Text_175FDA, 4
+	msgbox DewfordTown_House2_Text_175FDA, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_House2_EventScript_153615:: @ 8153615
-	msgbox DewfordTown_House2_Text_176055, 4
+	msgbox DewfordTown_House2_Text_176055, MSGBOX_DEFAULT
 	release
 	end
 
 DewfordTown_House2_EventScript_15361F:: @ 815361F
-	msgbox DewfordTown_House2_Text_1760C8, 2
+	msgbox DewfordTown_House2_Text_1760C8, MSGBOX_NPC
 	end
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 5408bef63..b02761b8b 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -1,24 +1,24 @@
 DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014
-	map_script 3, DewfordTown_PokemonCenter_1F_MapScript1_15301A
+	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_MapScript1_15301A
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A
 	setrespawn HEAL_LOCATION_DEWFORD_TOWN
-	call DewfordTown_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023
 	setvar VAR_0x800B, 1
-	call DewfordTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 DewfordTown_PokemonCenter_1F_EventScript_153031:: @ 8153031
-	msgbox DewfordTown_PokemonCenter_1F_Text_174CDB, 2
+	msgbox DewfordTown_PokemonCenter_1F_Text_174CDB, MSGBOX_NPC
 	end
 
 DewfordTown_PokemonCenter_1F_EventScript_15303A:: @ 815303A
-	msgbox DewfordTown_PokemonCenter_1F_Text_174D32, 2
+	msgbox DewfordTown_PokemonCenter_1F_Text_174D32, MSGBOX_NPC
 	end
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index 554c9ef6b..3fa3bceeb 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 DewfordTown_PokemonCenter_2F_MapScripts:: @ 8153043
-	map_script 2, DewfordTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, DewfordTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, DewfordTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, DewfordTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, DewfordTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 DewfordTown_PokemonCenter_2F_EventScript_153053:: @ 8153053
diff --git a/data/maps/EverGrandeCity/map.json b/data/maps/EverGrandeCity/map.json
index 643d4db3d..06fb9c275 100644
--- a/data/maps/EverGrandeCity/map.json
+++ b/data/maps/EverGrandeCity/map.json
@@ -163,7 +163,7 @@
       "y": 48,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "EverGrandeCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -187,7 +187,7 @@
       "y": 48,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "EverGrandeCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     }
   ]
 }
diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc
index 293780716..c49486ddd 100644
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -1,21 +1,21 @@
 EverGrandeCity_MapScripts:: @ 814D4D5
-	map_script 3, EverGrandeCity_MapScript1_14D4DB
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_MapScript1_14D4DB
 	.byte 0
 
 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB
-	call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 EverGrandeCity_EventScript_14D4E5:: @ 814D4E5
-	msgbox EverGrandeCity_Text_16A74D, 3
+	msgbox EverGrandeCity_Text_16A74D, MSGBOX_SIGN
 	end
 
 EverGrandeCity_EventScript_14D4EE:: @ 814D4EE
-	msgbox EverGrandeCity_Text_16A787, 3
+	msgbox EverGrandeCity_Text_16A787, MSGBOX_SIGN
 	end
 
 EverGrandeCity_EventScript_14D4F7:: @ 814D4F7
-	msgbox EverGrandeCity_Text_16A763, 3
+	msgbox EverGrandeCity_Text_16A763, MSGBOX_SIGN
 	end
 
 EverGrandeCity_EventScript_14D500:: @ 814D500
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index abb8e4121..5fdb9e18d 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -1,11 +1,11 @@
 EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF
-	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
-	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
-	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
 	.byte 0
 
 EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF
-	call EverGrandeCity_ChampionsRoom_EventScript_1A014E
+	call Common_EventScript_SetupRivalGfxId
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
@@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
 	.2byte 0
 
 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
@@ -22,10 +22,10 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
 
 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
 	lockall
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp4
 	waitmovement 0
 	delay 40
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B802
 	waitmovement 0
 	setvar VAR_TEMP_1, 1
 	goto EverGrandeCity_ChampionsRoom_EventScript_15B805
@@ -35,12 +35,12 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
 EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
 	playbgm MUS_DAIGO, FALSE
-	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4
-	trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0
+	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_STEVEN, EverGrandeCity_ChampionsRoom_Text_1910A0
 	goto EverGrandeCity_ChampionsRoom_EventScript_15B821
 	end
 
@@ -49,7 +49,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
 	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, MSGBOX_DEFAULT
 	closemessage
 	playse SE_DOOR
 	checkplayergender
@@ -75,28 +75,28 @@ EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886
-	msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191225, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191268, MSGBOX_DEFAULT
 	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
 	end
 
 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191305, MSGBOX_DEFAULT
 	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
 	end
 
@@ -105,28 +105,28 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	addobject 3
 	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
 	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4
-	call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
-	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, MSGBOX_DEFAULT
+	call ProfBirch_EventScript_RatePokedex
+	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191512, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9DD
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8
 	waitmovement 0
 	delay 20
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191546, MSGBOX_DEFAULT
 	checkplayergender
 	compare VAR_RESULT, 0
 	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
@@ -134,7 +134,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
 	closemessage
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_15B9E0
 	waitmovement 0
 	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
 	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
@@ -143,17 +143,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	end
 
 EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, MSGBOX_DEFAULT
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4
-	msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191675, MSGBOX_DEFAULT
 	return
 
 EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD
 	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6
 	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -165,7 +165,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
 EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
 	walk_up
@@ -173,7 +173,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
 	walk_up
@@ -184,7 +184,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
 	walk_left
 	walk_up
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
 	walk_in_place_fastest_up
@@ -195,24 +195,24 @@ EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
 	delay_8
 	walk_in_place_fastest_right
 	delay_16
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
 	walk_up
@@ -223,4 +223,4 @@ EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
 	walk_right
 	walk_up
 	walk_in_place_fastest_left
-	end_movement
+	step_end
diff --git a/data/maps/EverGrandeCity_Corridor1/scripts.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc
index 60d1f7253..0bb59bb07 100644
--- a/data/maps/EverGrandeCity_Corridor1/scripts.inc
+++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C
-	map_script 4, EverGrandeCity_Corridor1_MapScript2_15BA12
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor1_MapScript2_15BA12
 	.byte 0
 
 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12
@@ -7,5 +7,5 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12
 	.2byte 0
 
 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
diff --git a/data/maps/EverGrandeCity_Corridor2/scripts.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc
index d74be91c4..0ee6a6e3a 100644
--- a/data/maps/EverGrandeCity_Corridor2/scripts.inc
+++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Corridor2_MapScripts:: @ 815BA21
-	map_script 4, EverGrandeCity_Corridor2_MapScript2_15BA27
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor2_MapScript2_15BA27
 	.byte 0
 
 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27
@@ -7,5 +7,5 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27
 	.2byte 0
 
 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
diff --git a/data/maps/EverGrandeCity_Corridor3/scripts.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc
index 006e570ef..82592da7d 100644
--- a/data/maps/EverGrandeCity_Corridor3/scripts.inc
+++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Corridor3_MapScripts:: @ 815BA36
-	map_script 4, EverGrandeCity_Corridor3_MapScript2_15BA3C
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor3_MapScript2_15BA3C
 	.byte 0
 
 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C
@@ -7,5 +7,5 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C
 	.2byte 0
 
 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
diff --git a/data/maps/EverGrandeCity_Corridor4/scripts.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc
index 2ae857aa8..e1a49c7a3 100644
--- a/data/maps/EverGrandeCity_Corridor4/scripts.inc
+++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B
-	map_script 4, EverGrandeCity_Corridor4_MapScript2_15BA51
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor4_MapScript2_15BA51
 	.byte 0
 
 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51
@@ -7,5 +7,5 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51
 	.2byte 0
 
 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
diff --git a/data/maps/EverGrandeCity_Corridor5/scripts.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc
index 09ce304f6..f9ecb94ec 100644
--- a/data/maps/EverGrandeCity_Corridor5/scripts.inc
+++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_Corridor5_MapScripts:: @ 815BA60
-	map_script 4, EverGrandeCity_Corridor5_MapScript2_15BA66
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Corridor5_MapScript2_15BA66
 	.byte 0
 
 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66
@@ -7,5 +7,5 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66
 	.2byte 0
 
 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index a90523822..fcf09914b 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
-	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C
-	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743
-	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B72C
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_MapScript1_15B743
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_DrakesRoom_MapScript2_15B570
 	.byte 0
 
 @ 815B71D
@@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
 	.2byte 0
 
 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
@@ -18,7 +18,7 @@ EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
 
 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
 	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
 	end
 
 EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
-	call EverGrandeCity_DrakesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
-	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
@@ -42,13 +42,13 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
 	playbgm MUS_SITENNOU, FALSE
-	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
-	trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
+	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_190E42
 	goto EverGrandeCity_DrakesRoom_EventScript_15B795
 	end
 
 EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT
 	release
 	end
 
@@ -56,7 +56,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
 	setvar VAR_0x8004, 0
 	special sub_810FF60
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index ede08e504..d4b5c8582 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673
-	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692
-	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
-	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B692
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_MapScript2_15B683
 	.byte 0
 
 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
@@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
 	.2byte 0
 
 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
@@ -18,7 +18,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
 
 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
 	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
-	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
@@ -42,19 +42,19 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
 	playbgm MUS_SITENNOU, FALSE
-	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
-	trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
+	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_190C01
 	goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT
 	release
 	end
 
 EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 22cd64497..ca0acd145 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -1,6 +1,6 @@
 EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84
-	map_script 2, EverGrandeCity_HallOfFame_MapScript2_15BB9E
-	map_script 4, EverGrandeCity_HallOfFame_MapScript2_15BB8F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB9E
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_MapScript2_15BB8F
 	.byte 0
 
 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F
@@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F
 	.2byte 0
 
 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E
@@ -18,31 +18,31 @@ EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E
 EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	lockall
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC59
 	waitmovement 0
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_191841, 4
+	msgbox EverGrandeCity_HallOfFame_Text_191841, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_15BC60
 	waitmovement 0
 	delay 20
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4
+	msgbox EverGrandeCity_HallOfFame_Text_1918D7, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 20
 	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
 	delay 40
 	setvar VAR_TEMP_1, 1
-	call EverGrandeCity_HallOfFame_EventScript_19FC13
+	call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags
 	checkplayergender
 	compare VAR_RESULT, 0
 	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41
@@ -73,7 +73,7 @@ EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60
 	walk_up
@@ -81,4 +81,4 @@ EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index db30bcfa7..c5394ecb0 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9
-	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
-	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
-	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
 	.byte 0
 
 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
@@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
 	.2byte 0
 
 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
@@ -18,7 +18,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
 
 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
 	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
@@ -30,11 +30,11 @@ EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
-	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
@@ -42,19 +42,19 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
 	playbgm MUS_SITENNOU, FALSE
-	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
-	trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
+	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_190A0C
 	goto EverGrandeCity_PhoebesRoom_EventScript_15B661
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT
 	release
 	end
 
 EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 986c873bd..067488c55 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66
-	map_script 3, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C
@@ -9,16 +9,16 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C
 EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
 	setvar VAR_0x800B, 1
-	call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E:: @ 815BC7E
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_191967, 2
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_191967, MSGBOX_NPC
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_15BC87:: @ 815BC87
-	msgbox EverGrandeCity_PokemonCenter_1F_Text_1919EF, 2
+	msgbox EverGrandeCity_PokemonCenter_1F_Text_1919EF, MSGBOX_NPC
 	end
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 9941e17e4..310efef02 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 815BC90
-	map_script 2, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, EverGrandeCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0:: @ 815BCA0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
index b41bfe9cd..d13f20f1d 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
@@ -1,5 +1,5 @@
 EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
-	map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
+	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
 	.byte 0
 
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
@@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
 
 EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
 	setvar VAR_0x800B, 1
-	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
@@ -24,10 +24,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
 EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
 	lock
 	faceplayer
-	message EverGrandeCity_PokemonLeague_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart EverGrandeCity_PokemonLeague_Items
-	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -73,27 +73,27 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	end
 
 EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB76
 	waitmovement 0
 	return
 
 EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A
+	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_Movement_15BB7A
 	waitmovement 0
 	return
 
 EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
 	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4
+	msgbox EverGrandeCity_PokemonLeague_Text_19179C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
+	msgbox EverGrandeCity_PokemonLeague_Text_191804, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -102,20 +102,20 @@ EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
 	walk_down
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
 	walk_down
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index b2b731004..7bd896364 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -1,7 +1,7 @@
 EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
-	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F
-	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570
-	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F
+	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_MapScript1_15B54F
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B570
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_MapScript2_15B57F
 	.byte 0
 
 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
@@ -11,11 +11,11 @@ EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
-	call EverGrandeCity_SidneysRoom_EventScript_1A0757
+	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
 EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
-	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
+	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
 EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
@@ -24,7 +24,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570
 	.2byte 0
 
 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
@@ -33,7 +33,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
 
 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
 	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_1A0710
+	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
@@ -43,19 +43,19 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
 	playbgm MUS_SITENNOU, FALSE
-	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
-	trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
+	msgbox EverGrandeCity_SidneysRoom_Text_190728, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_190823
 	goto EverGrandeCity_SidneysRoom_EventScript_15B5C7
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT
 	release
 	end
 
 EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
 	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_1A0693
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/FallarborTown/map.json b/data/maps/FallarborTown/map.json
index 7ad3e4f1f..71e07b7c3 100644
--- a/data/maps/FallarborTown/map.json
+++ b/data/maps/FallarborTown/map.json
@@ -120,7 +120,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -128,7 +128,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -144,7 +144,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -160,7 +160,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FallarborTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index a168a0ef5..a39d7e51f 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -1,5 +1,5 @@
 FallarborTown_MapScripts:: @ 814E7E0
-	map_script 3, FallarborTown_MapScript1_14E7E6
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_MapScript1_14E7E6
 	.byte 0
 
 FallarborTown_MapScript1_14E7E6:: @ 814E7E6
@@ -13,21 +13,21 @@ FallarborTown_EventScript_14E7F5:: @ 814E7F5
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A
-	msgbox FallarborTown_Text_16C7FF, 4
+	msgbox FallarborTown_Text_16C7FF, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_EventScript_14E80A:: @ 814E80A
-	msgbox FallarborTown_Text_16C855, 4
+	msgbox FallarborTown_Text_16C855, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_EventScript_14E814:: @ 814E814
-	msgbox FallarborTown_Text_16C8D6, 2
+	msgbox FallarborTown_Text_16C8D6, MSGBOX_NPC
 	end
 
 FallarborTown_EventScript_14E81D:: @ 814E81D
-	msgbox FallarborTown_Text_16C941, 2
+	msgbox FallarborTown_Text_16C941, MSGBOX_NPC
 	end
 
 FallarborTown_EventScript_14E826:: @ 814E826
@@ -35,21 +35,21 @@ FallarborTown_EventScript_14E826:: @ 814E826
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 0
-	msgbox FallarborTown_Text_16C92C, 4
+	msgbox FallarborTown_Text_16C92C, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
 FallarborTown_EventScript_14E839:: @ 814E839
-	msgbox FallarborTown_Text_16CA39, 3
+	msgbox FallarborTown_Text_16CA39, MSGBOX_SIGN
 	end
 
 FallarborTown_EventScript_14E842:: @ 814E842
 MeteorFalls_1F_1R_EventScript_14E842:: @ 814E842
 MeteorFalls_1F_2R_EventScript_14E842:: @ 814E842
-	msgbox FallarborTown_Text_16CA83, 3
+	msgbox FallarborTown_Text_16CA83, MSGBOX_SIGN
 	end
 
 FallarborTown_EventScript_14E84B:: @ 814E84B
-	msgbox FallarborTown_Text_16CAB9, 3
+	msgbox FallarborTown_Text_16CAB9, MSGBOX_SIGN
 	end
diff --git a/data/maps/FallarborTown_ContestHall/scripts.inc b/data/maps/FallarborTown_ContestHall/scripts.inc
index e3fcfd9bc..34ece82e2 100644
--- a/data/maps/FallarborTown_ContestHall/scripts.inc
+++ b/data/maps/FallarborTown_ContestHall/scripts.inc
@@ -2,17 +2,17 @@ FallarborTown_ContestHall_MapScripts:: @ 8153ACE
 	.byte 0
 
 FallarborTown_ContestHall_EventScript_153ACF:: @ 8153ACF
-	msgbox FallarborTown_ContestHall_Text_177335, 2
+	msgbox FallarborTown_ContestHall_Text_177335, MSGBOX_NPC
 	end
 
 FallarborTown_ContestHall_EventScript_153AD8:: @ 8153AD8
-	msgbox FallarborTown_ContestHall_Text_1773C6, 2
+	msgbox FallarborTown_ContestHall_Text_1773C6, MSGBOX_NPC
 	end
 
 FallarborTown_ContestHall_EventScript_153AE1:: @ 8153AE1
-	msgbox FallarborTown_ContestHall_Text_177437, 2
+	msgbox FallarborTown_ContestHall_Text_177437, MSGBOX_NPC
 	end
 
 FallarborTown_ContestHall_EventScript_153AEA:: @ 8153AEA
-	msgbox FallarborTown_ContestHall_Text_1774B1, 3
+	msgbox FallarborTown_ContestHall_Text_1774B1, MSGBOX_SIGN
 	end
diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc
index f594d397d..f9a2cccce 100644
--- a/data/maps/FallarborTown_ContestLobby/scripts.inc
+++ b/data/maps/FallarborTown_ContestLobby/scripts.inc
@@ -1,5 +1,5 @@
 FallarborTown_ContestLobby_MapScripts:: @ 81539C1
-	map_script 3, FallarborTown_ContestLobby_MapScript1_1539C7
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_ContestLobby_MapScript1_1539C7
 	.byte 0
 
 FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7
@@ -35,12 +35,12 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
 	delay 20
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A8C
 	waitmovement 0
-	applymovement 255, FallarborTown_ContestLobby_Movement_153A7A
+	applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_ContestLobby_Movement_153A7A
 	waitmovement 0
-	msgbox FallarborTown_ContestLobby_Text_1A6832, 4
+	msgbox FallarborTown_ContestLobby_Text_1A6832, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A83
-	applymovement 255, FallarborTown_ContestLobby_Movement_153A70
+	applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_ContestLobby_Movement_153A70
 	waitmovement 0
 	releaseall
 	return
@@ -55,22 +55,22 @@ FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83
 	walk_left
@@ -81,33 +81,33 @@ FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
-	msgbox FallarborTown_ContestLobby_Text_177141, 2
+	msgbox FallarborTown_ContestLobby_Text_177141, MSGBOX_NPC
 	end
 
 FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
 	goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9
-	msgbox FallarborTown_ContestLobby_Text_177246, 2
+	msgbox FallarborTown_ContestLobby_Text_177246, MSGBOX_NPC
 	end
 
 FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9
-	msgbox FallarborTown_ContestLobby_Text_1772D8, 2
+	msgbox FallarborTown_ContestLobby_Text_1772D8, MSGBOX_NPC
 	end
 
 FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2
-	msgbox FallarborTown_ContestLobby_Text_1771F2, 2
+	msgbox FallarborTown_ContestLobby_Text_1771F2, MSGBOX_NPC
 	end
 
 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
 	lockall
-	fadescreen 1
-	drawcontestwinner 2
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 2
 	releaseall
 	end
 
diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc
index 23e47d780..9690ccb29 100644
--- a/data/maps/FallarborTown_House1/scripts.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
@@ -1,5 +1,5 @@
 FallarborTown_House1_MapScripts:: @ 8153BAE
-	map_script 3, FallarborTown_House1_MapScript1_153BB4
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_House1_MapScript1_153BB4
 	.byte 0
 
 FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4
@@ -12,7 +12,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5
 	checkitem ITEM_METEORITE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq FallarborTown_House1_EventScript_153BDA
-	msgbox FallarborTown_House1_Text_177755, 4
+	msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT
 	release
 	end
 
@@ -21,19 +21,19 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA
 	call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E
 	compare VAR_RESULT, NO
 	goto_if_eq FallarborTown_House1_EventScript_153C47
-	msgbox FallarborTown_House1_Text_1778C4, 4
-	giveitem_std ITEM_TM27_RETURN
+	msgbox FallarborTown_House1_Text_1778C4, MSGBOX_DEFAULT
+	giveitem ITEM_TM27_RETURN
 	compare VAR_RESULT, 0
-	goto_if_eq FallarborTown_House1_EventScript_1A029B
-	setvar VAR_0x8004, 280
-	call FallarborTown_House1_EventScript_1A067F
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	setvar VAR_0x8004, ITEM_METEORITE
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_RECEIVED_TM27
-	msgbox FallarborTown_House1_Text_177910, 4
+	msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_House1_EventScript_153C2D:: @ 8153C2D
-	msgbox FallarborTown_House1_Text_177755, 4
+	msgbox FallarborTown_House1_Text_177755, MSGBOX_DEFAULT
 	msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO
 	return
 
@@ -43,12 +43,12 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E
 
 FallarborTown_House1_EventScript_153C47:: @ 8153C47
 	setflag FLAG_TEMP_2
-	msgbox FallarborTown_House1_Text_17797D, 4
+	msgbox FallarborTown_House1_Text_17797D, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_House1_EventScript_153C54:: @ 8153C54
-	msgbox FallarborTown_House1_Text_177910, 4
+	msgbox FallarborTown_House1_Text_177910, MSGBOX_DEFAULT
 	release
 	end
 
@@ -57,16 +57,16 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86
 	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C
-	msgbox FallarborTown_House1_Text_177A2B, 4
+	msgbox FallarborTown_House1_Text_177A2B, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_House1_EventScript_153C7C:: @ 8153C7C
-	msgbox FallarborTown_House1_Text_177A7C, 4
+	msgbox FallarborTown_House1_Text_177A7C, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_House1_EventScript_153C86:: @ 8153C86
-	msgbox FallarborTown_House1_Text_177ABB, 4
+	msgbox FallarborTown_House1_Text_177ABB, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
index 67eb4fac1..6ea37ea51 100644
--- a/data/maps/FallarborTown_House2/scripts.inc
+++ b/data/maps/FallarborTown_House2/scripts.inc
@@ -3,10 +3,10 @@ FallarborTown_House2_MapScripts:: @ 8153C90
 
 FallarborTown_House2_EventScript_153C91:: @ 8153C91
 	lockall
-	applymovement 1, FallarborTown_House2_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6
-	msgbox FallarborTown_House2_Text_177AF4, 4
+	msgbox FallarborTown_House2_Text_177AF4, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	goto FallarborTown_House2_EventScript_153CB6
 	end
@@ -22,7 +22,7 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6
 	end
 
 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
-	msgbox FallarborTown_House2_Text_177C3F, 4
+	msgbox FallarborTown_House2_Text_177C3F, MSGBOX_DEFAULT
 	special SelectMoveTutorMon
 	waitstate
 	compare VAR_0x8004, 255
@@ -36,27 +36,27 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
 	end
 
 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
-	msgbox FallarborTown_House2_Text_177C5D, 4
+	msgbox FallarborTown_House2_Text_177C5D, MSGBOX_DEFAULT
 	special DisplayMoveTutorMenu
 	waitstate
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_House2_EventScript_153CE4
-	msgbox FallarborTown_House2_Text_177CC3, 4
-	takeitem ITEM_HEART_SCALE, 1
+	msgbox FallarborTown_House2_Text_177CC3, MSGBOX_DEFAULT
+	removeitem ITEM_HEART_SCALE
 	goto FallarborTown_House2_EventScript_153D60
 	end
 
 FallarborTown_House2_EventScript_153D44:: @ 8153D44
-	msgbox FallarborTown_House2_Text_177C78, 4
+	msgbox FallarborTown_House2_Text_177C78, MSGBOX_DEFAULT
 	goto FallarborTown_House2_EventScript_153CE4
 	end
 
 FallarborTown_House2_EventScript_153D52:: @ 8153D52
-	msgbox FallarborTown_House2_Text_177D33, 4
+	msgbox FallarborTown_House2_Text_177D33, MSGBOX_DEFAULT
 	goto FallarborTown_House2_EventScript_153CE4
 	end
 
 FallarborTown_House2_EventScript_153D60:: @ 8153D60
-	msgbox FallarborTown_House2_Text_177CEF, 4
+	msgbox FallarborTown_House2_Text_177CEF, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc
index cfd239e8a..12d92164b 100644
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -4,10 +4,10 @@ FallarborTown_Mart_MapScripts:: @ 8153966
 FallarborTown_Mart_EventScript_153967:: @ 8153967
 	lock
 	faceplayer
-	message FallarborTown_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart FallarborTown_Mart_Items
-	msgbox FallarborTown_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -30,11 +30,11 @@ FallarborTown_Mart_Items:: @ 8153980
 	end
 
 FallarborTown_Mart_EventScript_15399C:: @ 815399C
-	msgbox FallarborTown_Mart_Text_176FF0, 2
+	msgbox FallarborTown_Mart_Text_176FF0, MSGBOX_NPC
 	end
 
 FallarborTown_Mart_EventScript_1539A5:: @ 81539A5
-	msgbox FallarborTown_Mart_Text_1770E2, 2
+	msgbox FallarborTown_Mart_Text_1770E2, MSGBOX_NPC
 	end
 
 FallarborTown_Mart_EventScript_1539AE:: @ 81539AE
@@ -42,7 +42,7 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox FallarborTown_Mart_Text_1770D3, 4
+	msgbox FallarborTown_Mart_Text_1770D3, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 9e4fa7579..133b4626a 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -1,32 +1,32 @@
 FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
-	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9
+	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_MapScript1_153AF9
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
 	setrespawn HEAL_LOCATION_FALLARBOR_TOWN
-	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
 	setvar VAR_0x800B, 1
-	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10
-	msgbox FallarborTown_PokemonCenter_1F_Text_17768C, 2
+	msgbox FallarborTown_PokemonCenter_1F_Text_17768C, MSGBOX_NPC
 	end
 
 FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19
-	msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, 2
+	msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, MSGBOX_NPC
 	end
 
 FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22
 	lock
 	faceplayer
-	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4
+	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
 	case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49
@@ -65,7 +65,7 @@ FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74
 	walk_down
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
 	walk_down
@@ -78,4 +78,4 @@ FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
 	walk_down
 	walk_down
 	delay_8
-	end_movement
+	step_end
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 148b22531..eb55f493a 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 FallarborTown_PokemonCenter_2F_MapScripts:: @ 8153B8C
-	map_script 2, FallarborTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, FallarborTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, FallarborTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, FallarborTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 FallarborTown_PokemonCenter_2F_EventScript_153B9C:: @ 8153B9C
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index f0bd22071..ffa7fbda7 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -1,5 +1,5 @@
 FieryPath_MapScripts:: @ 815D318
-	map_script 3, FieryPath_MapScript1_15D31E
+	map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_MapScript1_15D31E
 	.byte 0
 
 FieryPath_MapScript1_15D31E:: @ 815D31E
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index b6047e395..a3e85f687 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -195,7 +195,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -203,7 +203,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -219,7 +219,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -227,7 +227,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "FortreeCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     }
   ]
 }
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index 5fe0b96a3..b46929698 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_MapScripts:: @ 814C943
-	map_script 3, FortreeCity_MapScript1_14C94E
-	map_script 5, FortreeCity_MapScript1_14C952
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_MapScript1_14C94E
+	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_MapScript1_14C952
 	.byte 0
 
 FortreeCity_MapScript1_14C94E:: @ 814C94E
@@ -12,44 +12,44 @@ FortreeCity_MapScript1_14C952:: @ 814C952
 	end
 
 FortreeCity_EventScript_14C955:: @ 814C955
-	msgbox FortreeCity_Text_167577, 2
+	msgbox FortreeCity_Text_167577, MSGBOX_NPC
 	end
 
 FortreeCity_EventScript_14C95E:: @ 814C95E
 	lock
 	faceplayer
 	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973
-	msgbox FortreeCity_Text_1675C2, 4
+	msgbox FortreeCity_Text_1675C2, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_EventScript_14C973:: @ 814C973
-	msgbox FortreeCity_Text_167642, 4
+	msgbox FortreeCity_Text_167642, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_EventScript_14C97D:: @ 814C97D
-	msgbox FortreeCity_Text_16768A, 2
+	msgbox FortreeCity_Text_16768A, MSGBOX_NPC
 	end
 
 FortreeCity_EventScript_14C986:: @ 814C986
-	msgbox FortreeCity_Text_16770E, 2
+	msgbox FortreeCity_Text_16770E, MSGBOX_NPC
 	end
 
 FortreeCity_EventScript_14C98F:: @ 814C98F
-	msgbox FortreeCity_Text_1677BD, 2
+	msgbox FortreeCity_Text_1677BD, MSGBOX_NPC
 	end
 
 FortreeCity_EventScript_14C998:: @ 814C998
-	msgbox FortreeCity_Text_16782C, 2
+	msgbox FortreeCity_Text_16782C, MSGBOX_NPC
 	end
 
 FortreeCity_EventScript_14C9A1:: @ 814C9A1
-	msgbox FortreeCity_Text_16792F, 3
+	msgbox FortreeCity_Text_16792F, MSGBOX_SIGN
 	end
 
 FortreeCity_EventScript_14C9AA:: @ 814C9AA
-	msgbox FortreeCity_Text_167969, 3
+	msgbox FortreeCity_Text_167969, MSGBOX_SIGN
 	end
 
 FortreeCity_EventScript_14C9B3:: @ 814C9B3
@@ -58,7 +58,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3
 	checkitem ITEM_DEVON_SCOPE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq FortreeCity_EventScript_14C9CF
-	msgbox FortreeCity_Text_167868, 4
+	msgbox FortreeCity_Text_167868, MSGBOX_DEFAULT
 	release
 	end
 
@@ -70,9 +70,9 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF
 	end
 
 FortreeCity_EventScript_14C9E4:: @ 814C9E4
-	msgbox FortreeCity_Text_1678CB, 4
+	msgbox FortreeCity_Text_1678CB, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, FortreeCity_Movement_1A0662
+	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KECLEON, 2
@@ -87,4 +87,4 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4
 
 FortreeCity_Movement_14CA13:: @ 814CA13
 	walk_right
-	end_movement
+	step_end
diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 56a360708..ec7a9a7cb 100644
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -2,20 +2,20 @@ FortreeCity_DecorationShop_MapScripts:: @ 8158257
 	.byte 0
 
 FortreeCity_DecorationShop_EventScript_158258:: @ 8158258
-	msgbox FortreeCity_DecorationShop_Text_186A61, 2
+	msgbox FortreeCity_DecorationShop_Text_186A61, MSGBOX_NPC
 	end
 
 FortreeCity_DecorationShop_EventScript_158261:: @ 8158261
-	msgbox FortreeCity_DecorationShop_Text_186AD6, 2
+	msgbox FortreeCity_DecorationShop_Text_186AD6, MSGBOX_NPC
 	end
 
 FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A
 	lock
 	faceplayer
-	message FortreeCity_DecorationShop_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration FortreeCity_DecorationShop_Decorations1
-	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -36,10 +36,10 @@ FortreeCity_DecorationShop_Decorations1:: @ 8158284
 FortreeCity_DecorationShop_EventScript_158298:: @ 8158298
 	lock
 	faceplayer
-	message FortreeCity_DecorationShop_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration FortreeCity_DecorationShop_Decorations2
-	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 3902fc815..5501546d1 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -1,6 +1,6 @@
 FortreeCity_Gym_MapScripts:: @ 8157ED3
-	map_script 3, FortreeCity_Gym_MapScript1_157EDE
-	map_script 4, FortreeCity_Gym_MapScript2_157EE2
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_MapScript1_157EDE
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_MapScript2_157EE2
 	.byte 0
 
 FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE
@@ -16,63 +16,63 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC
 	end
 
 FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
-	trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15
+	trainerbattle_single TRAINER_WINONA, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E
-	msgbox FortreeCity_Gym_Text_185F98, 4
+	msgbox FortreeCity_Gym_Text_185F98, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	message FortreeCity_Gym_Text_185E48
 	waitmessage
-	call FortreeCity_Gym_EventScript_1A02C5
-	msgbox FortreeCity_Gym_Text_185E73, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox FortreeCity_Gym_Text_185E73, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_FORTREE_GYM
 	setflag FLAG_BADGE06_GET
 	setvar VAR_0x8008, 6
-	call FortreeCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto FortreeCity_Gym_EventScript_157F3E
 	end
 
 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E
-	giveitem_std ITEM_TM40_AERIAL_ACE
+	giveitem ITEM_TM40_AERIAL_ACE
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_Gym_EventScript_1A029B
-	msgbox FortreeCity_Gym_Text_185F4A, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox FortreeCity_Gym_Text_185F4A, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM40
 	release
 	end
 
 FortreeCity_Gym_EventScript_157F62:: @ 8157F62
-	trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA
-	msgbox FortreeCity_Gym_Text_185A02, 6
+	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA
+	msgbox FortreeCity_Gym_Text_185A02, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_157F79:: @ 8157F79
-	trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC
-	msgbox FortreeCity_Gym_Text_185B18, 6
+	trainerbattle_single TRAINER_WILL, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC
+	msgbox FortreeCity_Gym_Text_185B18, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_157F90:: @ 8157F90
-	trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB
-	msgbox FortreeCity_Gym_Text_185C00, 6
+	trainerbattle_single TRAINER_TERRELL, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB
+	msgbox FortreeCity_Gym_Text_185C00, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7
-	trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C
-	msgbox FortreeCity_Gym_Text_185C8C, 6
+	trainerbattle_single TRAINER_KYLEE, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C
+	msgbox FortreeCity_Gym_Text_185C8C, MSGBOX_AUTOCLOSE
 	end
 
 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3
-	msgbox FortreeCity_Gym_Text_18589C, 4
+	msgbox FortreeCity_Gym_Text_18589C, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3
-	msgbox FortreeCity_Gym_Text_185994, 4
+	msgbox FortreeCity_Gym_Text_185994, MSGBOX_DEFAULT
 	release
 	end
 
@@ -89,11 +89,11 @@ FortreeCity_Gym_EventScript_157FED:: @ 8157FED
 	end
 
 FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD
-	msgbox FortreeCity_Gym_Text_185FEE, 4
+	msgbox FortreeCity_Gym_Text_185FEE, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FortreeCity_Gym_EventScript_158007:: @ 8158007
-	msgbox FortreeCity_Gym_Text_185FD5, 4
+	msgbox FortreeCity_Gym_Text_185FD5, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc
index 475905070..0af969a06 100644
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -28,29 +28,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13
 	special DoInGameTradeScene
 	waitstate
 	bufferspeciesname 0, VAR_0x8009
-	msgbox FortreeCity_House1_Text_1856F7, 4
+	msgbox FortreeCity_House1_Text_1856F7, MSGBOX_DEFAULT
 	setflag FLAG_FORTREE_NPC_TRADE_COMPLETED
 	release
 	end
 
 FortreeCity_House1_EventScript_157E95:: @ 8157E95
-	msgbox FortreeCity_House1_Text_18577F, 4
+	msgbox FortreeCity_House1_Text_18577F, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House1_EventScript_157E9F:: @ 8157E9F
 	bufferspeciesname 0, VAR_0x8009
-	msgbox FortreeCity_House1_Text_185737, 4
+	msgbox FortreeCity_House1_Text_185737, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House1_EventScript_157EAD:: @ 8157EAD
-	msgbox FortreeCity_House1_Text_1857C7, 4
+	msgbox FortreeCity_House1_Text_1857C7, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House1_EventScript_157EB7:: @ 8157EB7
-	msgbox FortreeCity_House1_Text_18582A, 2
+	msgbox FortreeCity_House1_Text_18582A, MSGBOX_NPC
 	end
 
 FortreeCity_House1_EventScript_157EC0:: @ 8157EC0
@@ -58,7 +58,7 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox FortreeCity_House1_Text_185888, 4
+	msgbox FortreeCity_House1_Text_185888, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc
index 5535a8d49..815c98f60 100644
--- a/data/maps/FortreeCity_House2/scripts.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
@@ -6,38 +6,38 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157
 	call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B
-	msgbox FortreeCity_House2_Text_186360, 4
+	msgbox FortreeCity_House2_Text_186360, MSGBOX_DEFAULT
 	multichoice 21, 8, 54, 1
 	switch VAR_RESULT
 	case 1, FortreeCity_House2_EventScript_158161
-	msgbox FortreeCity_House2_Text_1863F6, 4
+	msgbox FortreeCity_House2_Text_1863F6, MSGBOX_DEFAULT
 	multichoice 21, 8, 54, 1
 	switch VAR_RESULT
 	case 1, FortreeCity_House2_EventScript_158161
-	msgbox FortreeCity_House2_Text_186455, 4
+	msgbox FortreeCity_House2_Text_186455, MSGBOX_DEFAULT
 	multichoice 21, 8, 54, 1
 	switch VAR_RESULT
 	case 0, FortreeCity_House2_EventScript_158161
-	msgbox FortreeCity_House2_Text_1864C6, 4
-	giveitem_std ITEM_TM10_HIDDEN_POWER
+	msgbox FortreeCity_House2_Text_1864C6, MSGBOX_DEFAULT
+	giveitem ITEM_TM10_HIDDEN_POWER
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House2_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM10
-	msgbox FortreeCity_House2_Text_18652F, 4
+	msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House2_EventScript_15814B:: @ 815814B
-	msgbox FortreeCity_House2_Text_186306, 4
+	msgbox FortreeCity_House2_Text_186306, MSGBOX_DEFAULT
 	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
 FortreeCity_House2_EventScript_158157:: @ 8158157
-	msgbox FortreeCity_House2_Text_18652F, 4
+	msgbox FortreeCity_House2_Text_18652F, MSGBOX_DEFAULT
 	release
 	end
 
 FortreeCity_House2_EventScript_158161:: @ 8158161
-	msgbox FortreeCity_House2_Text_186565, 4
+	msgbox FortreeCity_House2_Text_186565, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc
index f5d11ffa7..3786fe5cf 100644
--- a/data/maps/FortreeCity_House3/scripts.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
@@ -2,9 +2,9 @@ FortreeCity_House3_MapScripts:: @ 815816B
 	.byte 0
 
 FortreeCity_House3_EventScript_15816C:: @ 815816C
-	msgbox FortreeCity_House3_Text_186624, 2
+	msgbox FortreeCity_House3_Text_186624, MSGBOX_NPC
 	end
 
 FortreeCity_House3_EventScript_158175:: @ 8158175
-	msgbox FortreeCity_House3_Text_186745, 2
+	msgbox FortreeCity_House3_Text_186745, MSGBOX_NPC
 	end
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index 36e339fa8..3e3d0948e 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -2,7 +2,7 @@ FortreeCity_House4_MapScripts:: @ 815817E
 	.byte 0
 
 FortreeCity_House4_EventScript_15817F:: @ 815817F
-	msgbox FortreeCity_House4_Text_1867AF, 2
+	msgbox FortreeCity_House4_Text_1867AF, MSGBOX_NPC
 	end
 
 FortreeCity_House4_EventScript_158188:: @ 8158188
@@ -10,7 +10,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
 	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204
 	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6
 	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2
-	msgbox FortreeCity_House4_Text_186835, 4
+	msgbox FortreeCity_House4_Text_186835, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_WINGULL_SENT_ON_ERRAND
 	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
@@ -21,27 +21,27 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
 	end
 
 FortreeCity_House4_EventScript_1581C2:: @ 81581C2
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_18684E, 4
+	msgbox FortreeCity_House4_Text_18684E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_1581D6:: @ 81581D6
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_186881, 4
-	giveitem_std ITEM_MENTAL_HERB
+	msgbox FortreeCity_House4_Text_186881, MSGBOX_DEFAULT
+	giveitem ITEM_MENTAL_HERB
 	compare VAR_RESULT, 0
-	goto_if_eq FortreeCity_House4_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MENTAL_HERB
 	releaseall
 	end
 
 FortreeCity_House4_EventScript_158204:: @ 8158204
-	applymovement VAR_LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox FortreeCity_House4_Text_186924, 4
+	msgbox FortreeCity_House4_Text_186924, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -51,14 +51,14 @@ FortreeCity_House4_Movement_158218:: @ 8158218
 	walk_fast_right
 	walk_in_place_fastest_down
 	delay_8
-	end_movement
+	step_end
 
 FortreeCity_House4_EventScript_15821E:: @ 815821E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox FortreeCity_House4_Text_18695C, 4
+	msgbox FortreeCity_House4_Text_18695C, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc
index 888ebe0e2..3b4b1d436 100644
--- a/data/maps/FortreeCity_House5/scripts.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
@@ -2,11 +2,11 @@ FortreeCity_House5_MapScripts:: @ 8158231
 	.byte 0
 
 FortreeCity_House5_EventScript_158232:: @ 8158232
-	msgbox FortreeCity_House5_Text_18696D, 2
+	msgbox FortreeCity_House5_Text_18696D, MSGBOX_NPC
 	end
 
 FortreeCity_House5_EventScript_15823B:: @ 815823B
-	msgbox FortreeCity_House5_Text_1869D6, 2
+	msgbox FortreeCity_House5_Text_1869D6, MSGBOX_NPC
 	end
 
 FortreeCity_House5_EventScript_158244:: @ 8158244
@@ -14,7 +14,7 @@ FortreeCity_House5_EventScript_158244:: @ 8158244
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox FortreeCity_House5_Text_186A4F, 4
+	msgbox FortreeCity_House5_Text_186A4F, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 076f702af..c41d5edae 100644
--- a/data/maps/FortreeCity_Mart/scripts.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
@@ -4,10 +4,10 @@ FortreeCity_Mart_MapScripts:: @ 8158066
 FortreeCity_Mart_EventScript_158067:: @ 8158067
 	lock
 	faceplayer
-	message FortreeCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart FortreeCity_Mart_Items
-	msgbox FortreeCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -28,13 +28,13 @@ FortreeCity_Mart_Items:: @ 8158080
 	end
 
 FortreeCity_Mart_EventScript_158098:: @ 8158098
-	msgbox FortreeCity_Mart_Text_1861EF, 2
+	msgbox FortreeCity_Mart_Text_1861EF, MSGBOX_NPC
 	end
 
 FortreeCity_Mart_EventScript_1580A1:: @ 81580A1
-	msgbox FortreeCity_Mart_Text_186251, 2
+	msgbox FortreeCity_Mart_Text_186251, MSGBOX_NPC
 	end
 
 FortreeCity_Mart_EventScript_1580AA:: @ 81580AA
-	msgbox FortreeCity_Mart_Text_1862CA, 2
+	msgbox FortreeCity_Mart_Text_1862CA, MSGBOX_NPC
 	end
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 53f47a324..90b74adc0 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011
-	map_script 3, FortreeCity_PokemonCenter_1F_MapScript1_158017
+	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_MapScript1_158017
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017
@@ -8,20 +8,20 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017
 
 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B
 	setvar VAR_0x800B, 1
-	call FortreeCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_158029:: @ 8158029
-	msgbox FortreeCity_PokemonCenter_1F_Text_186027, 2
+	msgbox FortreeCity_PokemonCenter_1F_Text_186027, MSGBOX_NPC
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_158032:: @ 8158032
-	msgbox FortreeCity_PokemonCenter_1F_Text_186086, 2
+	msgbox FortreeCity_PokemonCenter_1F_Text_186086, MSGBOX_NPC
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_15803B:: @ 815803B
-	msgbox FortreeCity_PokemonCenter_1F_Text_186138, 2
+	msgbox FortreeCity_PokemonCenter_1F_Text_186138, MSGBOX_NPC
 	end
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 3019dbbc0..fe58376cc 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 FortreeCity_PokemonCenter_2F_MapScripts:: @ 8158044
-	map_script 2, FortreeCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, FortreeCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, FortreeCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, FortreeCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 FortreeCity_PokemonCenter_2F_EventScript_158054:: @ 8158054
diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc
index b9d89f93c..3cf5c2d6f 100644
--- a/data/maps/GraniteCave_1F/scripts.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
@@ -5,14 +5,14 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3
-	msgbox GraniteCave_1F_Text_194917, 4
-	giveitem_std ITEM_HM05_FLASH
+	msgbox GraniteCave_1F_Text_194917, MSGBOX_DEFAULT
+	giveitem ITEM_HM05_FLASH
 	setflag FLAG_RECEIVED_HM05
-	msgbox GraniteCave_1F_Text_194A3E, 4
+	msgbox GraniteCave_1F_Text_194A3E, MSGBOX_DEFAULT
 	release
 	end
 
 GraniteCave_1F_EventScript_15CBD3:: @ 815CBD3
-	msgbox GraniteCave_1F_Text_194A3E, 4
+	msgbox GraniteCave_1F_Text_194A3E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc
index c6be3feca..1f2615436 100644
--- a/data/maps/GraniteCave_B1F/scripts.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
@@ -1,7 +1,7 @@
 GraniteCave_B1F_MapScripts:: @ 815CBDD
-	map_script 2, GraniteCave_B1F_MapScript2_1C6BB5
-	map_script 3, GraniteCave_B1F_MapScript1_1C6BBF
-	map_script 5, GraniteCave_B1F_MapScript1_15CBED
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+	map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_15CBED
 	.byte 0
 
 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 46ec0f8d1..861b0eccb 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -4,15 +4,15 @@ GraniteCave_StevensRoom_MapScripts:: @ 815CBF9
 GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	lock
 	faceplayer
-	msgbox GraniteCave_StevensRoom_Text_194AE5, 4
+	msgbox GraniteCave_StevensRoom_Text_194AE5, MSGBOX_DEFAULT
 	setvar VAR_0x8004, ITEM_LETTER
-	call GraniteCave_StevensRoom_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	setflag FLAG_DELIVERED_STEVEN_LETTER
-	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
-	giveitem_std ITEM_TM47_STEEL_WING
+	msgbox GraniteCave_StevensRoom_Text_194BDD, MSGBOX_DEFAULT
+	giveitem ITEM_TM47_STEEL_WING
 	compare VAR_RESULT, 0
 	call_if_eq GraniteCave_StevensRoom_EventScript_15CC83
-	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
+	msgbox GraniteCave_StevensRoom_Text_194C8D, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
@@ -38,7 +38,7 @@ GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78
 	return
 
 GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83
-	msgbox GraniteCave_StevensRoom_Text_194D43, 4
+	msgbox GraniteCave_StevensRoom_Text_194D43, MSGBOX_DEFAULT
 	return
 
 GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C
@@ -48,7 +48,7 @@ GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93
 	walk_left
@@ -59,4 +59,4 @@ GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 59a4e79ee..2ffdf8a8a 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -1,6 +1,6 @@
 InsideOfTruck_MapScripts:: @ 815FBFF
-	map_script 1, InsideOfTruck_MapScript1_15FC0A
-	map_script 5, InsideOfTruck_MapScript1_15FC26
+	map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_15FC0A
+	map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_15FC26
 	.byte 0
 
 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A
@@ -48,5 +48,5 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68
 	end
 
 InsideOfTruck_EventScript_15FC8B:: @ 815FC8B
-	msgbox InsideOfTruck_Text_198FAD, 3
+	msgbox InsideOfTruck_Text_198FAD, MSGBOX_SIGN
 	end
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 77392a4e7..1b5d84086 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -1,7 +1,7 @@
 IslandCave_MapScripts:: @ 815EEB6
-	map_script 5, IslandCave_MapScript1_15EEC6
-	map_script 1, IslandCave_MapScript1_15EED4
-	map_script 3, IslandCave_MapScript1_15EF15
+	map_script MAP_SCRIPT_ON_RESUME, IslandCave_MapScript1_15EEC6
+	map_script MAP_SCRIPT_ON_LOAD, IslandCave_MapScript1_15EED4
+	map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_MapScript1_15EF15
 	.byte 0
 
 IslandCave_MapScript1_15EEC6:: @ 815EEC6
@@ -51,7 +51,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59
 	end
 
 IslandCave_EventScript_15EF72:: @ 815EF72
-	msgbox IslandCave_Text_1A13BE, 4
+	msgbox IslandCave_Text_1A13BE, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index 151da14d1..f938caa05 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -1,6 +1,6 @@
 JaggedPass_MapScripts:: @ 815D266
-	map_script 5, JaggedPass_MapScript1_15D271
-	map_script 3, JaggedPass_MapScript1_15D274
+	map_script MAP_SCRIPT_ON_RESUME, JaggedPass_MapScript1_15D271
+	map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_MapScript1_15D274
 	.byte 0
 
 JaggedPass_MapScript1_15D271:: @ 815D271
@@ -18,32 +18,32 @@ JaggedPass_EventScript_15D280:: @ 815D280
 	return
 
 JaggedPass_EventScript_15D285:: @ 815D285
-	trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27
-	msgbox JaggedPass_Text_195E3E, 6
+	trainerbattle_single TRAINER_ERIC, JaggedPass_Text_195DAC, JaggedPass_Text_195E27
+	msgbox JaggedPass_Text_195E3E, MSGBOX_AUTOCLOSE
 	end
 
 JaggedPass_EventScript_15D29C:: @ 815D29C
-	trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF
+	trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq JaggedPass_EventScript_15D2C3
-	msgbox JaggedPass_Text_195F04, 6
+	msgbox JaggedPass_Text_195F04, MSGBOX_AUTOCLOSE
 	end
 
 JaggedPass_EventScript_15D2C3:: @ 815D2C3
-	trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C
-	msgbox JaggedPass_Text_195FB9, 6
+	trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_195F58, JaggedPass_Text_195F8C
+	msgbox JaggedPass_Text_195FB9, MSGBOX_AUTOCLOSE
 	end
 
 JaggedPass_EventScript_15D2DA:: @ 815D2DA
-	trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032
+	trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_195FF2, JaggedPass_Text_196032
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq JaggedPass_EventScript_15D301
-	msgbox JaggedPass_Text_196077, 6
+	msgbox JaggedPass_Text_196077, MSGBOX_AUTOCLOSE
 	end
 
 JaggedPass_EventScript_15D301:: @ 815D301
-	trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2
-	msgbox JaggedPass_Text_196118, 6
+	trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2
+	msgbox JaggedPass_Text_196118, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/LavaridgeTown/map.json b/data/maps/LavaridgeTown/map.json
index b6c53147b..dffded86a 100644
--- a/data/maps/LavaridgeTown/map.json
+++ b/data/maps/LavaridgeTown/map.json
@@ -213,7 +213,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -229,7 +229,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -237,7 +237,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -245,7 +245,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LavaridgeTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "hidden_item",
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 6c4b66e4b..7a868e72e 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -1,13 +1,13 @@
 LavaridgeTown_MapScripts:: @ 814E4A3
-	map_script 3, LavaridgeTown_MapScript1_14E4AE
-	map_script 2, LavaridgeTown_MapScript2_14E4E3
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_MapScript1_14E4AE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_MapScript2_14E4E3
 	.byte 0
 
 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
 	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
-	call LavaridgeTown_EventScript_1A014E
-	call LavaridgeTown_EventScript_1A0172
+	call Common_EventScript_SetupRivalGfxId
+	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_LAVARIDGE_RIVAL_STATE, 2
 	call_if_eq LavaridgeTown_EventScript_14E4D0
 	end
@@ -35,12 +35,12 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
 	waitmovement 0
 	closedoor 12, 15
 	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_1A083F
+	applymovement 8, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	applymovement 255, LavaridgeTown_Movement_1A0843
-	applymovement 8, LavaridgeTown_Movement_1A0833
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
+	applymovement 8, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_1A0835
+	applymovement 8, Common_Movement_Delay48
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, 0
@@ -81,18 +81,18 @@ LavaridgeTown_EventScript_14E575:: @ 814E575
 	end
 
 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
-	msgbox LavaridgeTown_Text_16BDA4, 4
-	giveitem_std ITEM_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16BDA4, MSGBOX_DEFAULT
+	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16BE7D, 4
+	msgbox LavaridgeTown_Text_16BE7D, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_14E5F5
 	end
 
 LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
-	msgbox LavaridgeTown_Text_16BF92, 4
-	giveitem_std ITEM_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16BF92, MSGBOX_DEFAULT
+	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16C020, 4
+	msgbox LavaridgeTown_Text_16C020, MSGBOX_DEFAULT
 	goto LavaridgeTown_EventScript_14E5F5
 	end
 
@@ -191,7 +191,7 @@ LavaridgeTown_Movement_14E6E8:: @ 814E6E8
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LavaridgeTown_Movement_14E6EF:: @ 814E6EF
 	walk_fast_right
@@ -204,7 +204,7 @@ LavaridgeTown_Movement_14E6EF:: @ 814E6EF
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 LavaridgeTown_Movement_14E6FA:: @ 814E6FA
 	walk_fast_right
@@ -215,7 +215,7 @@ LavaridgeTown_Movement_14E6FA:: @ 814E6FA
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 LavaridgeTown_Movement_14E703:: @ 814E703
 	walk_fast_down
@@ -228,11 +228,11 @@ LavaridgeTown_Movement_14E703:: @ 814E703
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 LavaridgeTown_Movement_14E70E:: @ 814E70E
 	walk_down
-	end_movement
+	step_end
 
 LavaridgeTown_EventScript_14E710:: @ 814E710
 	specialvar VAR_RESULT, GetPlayerFacingDirection
@@ -245,27 +245,27 @@ LavaridgeTown_EventScript_14E721:: @ 814E721
 	end
 
 LavaridgeTown_EventScript_14E724:: @ 814E724
-	msgbox LavaridgeTown_Text_16C3FD, 2
+	msgbox LavaridgeTown_Text_16C3FD, MSGBOX_NPC
 	end
 
 LavaridgeTown_EventScript_14E72D:: @ 814E72D
-	msgbox LavaridgeTown_Text_16C4DB, 3
+	msgbox LavaridgeTown_Text_16C4DB, MSGBOX_SIGN
 	end
 
 LavaridgeTown_EventScript_14E736:: @ 814E736
-	msgbox LavaridgeTown_Text_16C59B, 2
+	msgbox LavaridgeTown_Text_16C59B, MSGBOX_NPC
 	end
 
 LavaridgeTown_EventScript_14E73F:: @ 814E73F
-	msgbox LavaridgeTown_Text_16C603, 2
+	msgbox LavaridgeTown_Text_16C603, MSGBOX_NPC
 	end
 
 LavaridgeTown_EventScript_14E748:: @ 814E748
-	msgbox LavaridgeTown_Text_16C694, 2
+	msgbox LavaridgeTown_Text_16C694, MSGBOX_NPC
 	end
 
 LavaridgeTown_EventScript_14E751:: @ 814E751
-	msgbox LavaridgeTown_Text_16C54E, 2
+	msgbox LavaridgeTown_Text_16C54E, MSGBOX_NPC
 	end
 
 LavaridgeTown_EventScript_14E75A:: @ 814E75A
@@ -278,7 +278,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	getpartysize
 	compare VAR_RESULT, 6
 	goto_if_eq LavaridgeTown_EventScript_14E7A8
-	msgbox LavaridgeTown_Text_16C2B6, 4
+	msgbox LavaridgeTown_Text_16C2B6, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_LAVARIDGE_EGG
 	playfanfare MUS_FANFA4
 	message LavaridgeTown_Text_16C2EA
@@ -289,32 +289,32 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	end
 
 LavaridgeTown_EventScript_14E79E:: @ 814E79E
-	msgbox LavaridgeTown_Text_16C398, 4
+	msgbox LavaridgeTown_Text_16C398, MSGBOX_DEFAULT
 	release
 	end
 
 LavaridgeTown_EventScript_14E7A8:: @ 814E7A8
-	msgbox LavaridgeTown_Text_16C2FF, 4
+	msgbox LavaridgeTown_Text_16C2FF, MSGBOX_DEFAULT
 	release
 	end
 
 LavaridgeTown_EventScript_14E7B2:: @ 814E7B2
-	msgbox LavaridgeTown_Text_16C33C, 4
+	msgbox LavaridgeTown_Text_16C33C, MSGBOX_DEFAULT
 	release
 	end
 
 LavaridgeTown_EventScript_14E7BC:: @ 814E7BC
-	msgbox LavaridgeTown_Text_16C72F, 3
+	msgbox LavaridgeTown_Text_16C72F, MSGBOX_SIGN
 	end
 
 LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
-	msgbox LavaridgeTown_Text_16C77C, 3
+	msgbox LavaridgeTown_Text_16C77C, MSGBOX_SIGN
 	end
 
 @ 814E7CE
-	msgbox LavaridgeTown_Text_16C7CF, 3
+	msgbox LavaridgeTown_Text_16C7CF, MSGBOX_SIGN
 	end
 
 LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
-	msgbox LavaridgeTown_Text_16C7CF, 3
+	msgbox LavaridgeTown_Text_16C7CF, MSGBOX_SIGN
 	end
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 16c4e2031..cc0707fc5 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -1,5 +1,5 @@
 LavaridgeTown_Gym_1F_MapScripts:: @ 815368E
-	map_script 3, LavaridgeTown_Gym_1F_MapScript1_153694
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_MapScript1_153694
 	.byte 0
 
 LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694
@@ -13,87 +13,87 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F
 	setvar VAR_TEMP_D, 0
 	setvar VAR_TEMP_E, 0
 	setvar VAR_TEMP_F, 0
-	goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6
+	goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6
 	setvar VAR_TEMP_B, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6
-	goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4
+	goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4
 	setvar VAR_TEMP_C, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4
-	goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2
+	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2
 	setvar VAR_TEMP_D, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2
-	goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0
+	goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0
 	setvar VAR_TEMP_E, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0
-	goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE
+	goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE
 	setvar VAR_TEMP_F, 1
 
 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE
 	return
 
 LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF
-	goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C
+	goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C
 	setobjectmovementtype 2, 63
 
 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C
-	goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719
+	goto_if_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719
 	setobjectmovementtype 3, 63
 
 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719
-	goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726
+	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726
 	setobjectmovementtype 4, 63
 
 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726
-	goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733
+	goto_if_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733
 	setobjectmovementtype 5, 63
 
 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733
-	goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740
+	goto_if_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740
 	setobjectmovementtype 7, 63
 
 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
 	return
 
 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741
-	trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766
+	trainerbattle_single TRAINER_FLANNERY, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7
-	msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4
+	msgbox LavaridgeTown_Gym_1F_Text_176C4A, MSGBOX_DEFAULT
 	release
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	message LavaridgeTown_Gym_1F_Text_176A62
 	waitmessage
-	call LavaridgeTown_Gym_1F_EventScript_1A02C5
-	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox LavaridgeTown_Gym_1F_Text_176A8C, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_LAVARIDGE_GYM
 	setflag FLAG_BADGE04_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 4
-	call LavaridgeTown_Gym_1F_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 1
 	goto LavaridgeTown_Gym_1F_EventScript_1537A7
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7
-	giveitem_std ITEM_TM50_OVERHEAT
+	giveitem ITEM_TM50_OVERHEAT
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B
-	msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox LavaridgeTown_Gym_1F_Text_176B8F, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM50
 	release
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB
-	trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6
-	msgbox LavaridgeTown_Gym_1F_Text_176472, 6
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6
+	msgbox LavaridgeTown_Gym_1F_Text_176472, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6
@@ -102,35 +102,35 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED
-	trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6
-	msgbox LavaridgeTown_Gym_1F_Text_176537, 6
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6
+	msgbox LavaridgeTown_Gym_1F_Text_176537, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808
-	trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6
-	msgbox LavaridgeTown_Gym_1F_Text_176660, 6
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6
+	msgbox LavaridgeTown_Gym_1F_Text_176660, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823
-	trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6
-	msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6
+	msgbox LavaridgeTown_Gym_1F_Text_1767C1, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E
-	trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6
-	msgbox LavaridgeTown_Gym_1F_Text_17671D, 6
+	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6
+	msgbox LavaridgeTown_Gym_1F_Text_17671D, MSGBOX_AUTOCLOSE
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E
-	msgbox LavaridgeTown_Gym_1F_Text_176312, 4
+	msgbox LavaridgeTown_Gym_1F_Text_176312, MSGBOX_DEFAULT
 	release
 	end
 
 LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E
-	msgbox LavaridgeTown_Gym_1F_Text_17640C, 4
+	msgbox LavaridgeTown_Gym_1F_Text_17640C, MSGBOX_DEFAULT
 	release
 	end
 
@@ -147,11 +147,11 @@ LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888
 	end
 
 LavaridgeTown_Gym_1F_EventScript_153898:: @ 8153898
-	msgbox LavaridgeTown_Gym_1F_Text_176CCA, 4
+	msgbox LavaridgeTown_Gym_1F_Text_176CCA, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LavaridgeTown_Gym_1F_EventScript_1538A2:: @ 81538A2
-	msgbox LavaridgeTown_Gym_1F_Text_176CAF, 4
+	msgbox LavaridgeTown_Gym_1F_Text_176CAF, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index 5da9d19ad..d0da76367 100644
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -7,7 +7,7 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629
 	message LavaridgeTown_HerbShop_Text_17615C
 	waitmessage
 	pokemart LavaridgeTown_HerbShop_Items
-	msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -22,22 +22,22 @@ LavaridgeTown_HerbShop_Items:: @ 8153640
 	end
 
 LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C
-	msgbox LavaridgeTown_HerbShop_Text_1762A3, 2
+	msgbox LavaridgeTown_HerbShop_Text_1762A3, MSGBOX_NPC
 	end
 
 LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684
-	msgbox LavaridgeTown_HerbShop_Text_1761A2, 4
-	giveitem_std ITEM_CHARCOAL
+	msgbox LavaridgeTown_HerbShop_Text_1761A2, MSGBOX_DEFAULT
+	giveitem ITEM_CHARCOAL
 	compare VAR_RESULT, 0
-	goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHARCOAL
 	release
 	end
 
 LavaridgeTown_HerbShop_EventScript_153684:: @ 8153684
-	msgbox LavaridgeTown_HerbShop_Text_176209, 4
+	msgbox LavaridgeTown_HerbShop_Text_176209, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 6fc14e0b6..dc881a380 100644
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -2,7 +2,7 @@ LavaridgeTown_House_MapScripts:: @ 81538AD
 	.byte 0
 
 LavaridgeTown_House_EventScript_1538AE:: @ 81538AE
-	msgbox LavaridgeTown_House_Text_176D07, 2
+	msgbox LavaridgeTown_House_Text_176D07, MSGBOX_NPC
 	end
 
 LavaridgeTown_House_EventScript_1538B7:: @ 81538B7
@@ -10,7 +10,7 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox LavaridgeTown_House_Text_176D94, 4
+	msgbox LavaridgeTown_House_Text_176D94, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index 99b567e06..4c527e155 100644
--- a/data/maps/LavaridgeTown_Mart/scripts.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -4,10 +4,10 @@ LavaridgeTown_Mart_MapScripts:: @ 81538CA
 LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB
 	lock
 	faceplayer
-	message LavaridgeTown_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LavaridgeTown_Mart_Items
-	msgbox LavaridgeTown_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -27,9 +27,9 @@ LavaridgeTown_Mart_Items:: @ 81538E4
 	end
 
 LavaridgeTown_Mart_EventScript_1538FA:: @ 81538FA
-	msgbox LavaridgeTown_Mart_Text_176DA6, 2
+	msgbox LavaridgeTown_Mart_Text_176DA6, MSGBOX_NPC
 	end
 
 LavaridgeTown_Mart_EventScript_153903:: @ 8153903
-	msgbox LavaridgeTown_Mart_Text_176E1A, 2
+	msgbox LavaridgeTown_Mart_Text_176E1A, MSGBOX_NPC
 	end
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 22382ad54..637a1eefa 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -1,28 +1,28 @@
 LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C
-	map_script 3, LavaridgeTown_PokemonCenter_1F_MapScript1_153912
+	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_MapScript1_153912
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912
 	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
-	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B
 	setvar VAR_0x800B, 1
-	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 LavaridgeTown_PokemonCenter_1F_EventScript_153929:: @ 8153929
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_176F08, 2
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_176F08, MSGBOX_NPC
 	end
 
 LavaridgeTown_PokemonCenter_1F_EventScript_153932:: @ 8153932
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_176E92, 2
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_176E92, MSGBOX_NPC
 	end
 
 LavaridgeTown_PokemonCenter_1F_EventScript_15393B:: @ 815393B
-	msgbox LavaridgeTown_PokemonCenter_1F_Text_176F7A, 2
+	msgbox LavaridgeTown_PokemonCenter_1F_Text_176F7A, MSGBOX_NPC
 	end
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index daaeb0b93..376c13df9 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 8153944
-	map_script 2, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, LavaridgeTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LavaridgeTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, LavaridgeTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 LavaridgeTown_PokemonCenter_2F_EventScript_153954:: @ 8153954
diff --git a/data/maps/LilycoveCity/map.json b/data/maps/LilycoveCity/map.json
index 6d8d52000..7da6b4d91 100644
--- a/data/maps/LilycoveCity/map.json
+++ b/data/maps/LilycoveCity/map.json
@@ -367,7 +367,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -383,7 +383,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "LilycoveCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index 8951fe606..38fbd3472 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -1,15 +1,15 @@
 LilycoveCity_MapScripts:: @ 814CA15
-	map_script 3, LilycoveCity_MapScript1_14CA20
-	map_script 1, LilycoveCity_MapScript1_14CA3F
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_MapScript1_14CA20
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_MapScript1_14CA3F
 	.byte 0
 
 LilycoveCity_MapScript1_14CA20:: @ 814CA20
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
-	call LilycoveCity_EventScript_1A0196
-	call LilycoveCity_EventScript_1A014E
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
+	call Common_EventScript_SetupEvilTeamGfxIds
+	call Common_EventScript_SetupRivalGfxId
 	end
 
 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
@@ -60,55 +60,55 @@ LilycoveCity_EventScript_14CB2B:: @ 814CB2B
 LilycoveCity_EventScript_14CB74:: @ 814CB74
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
-	msgbox LilycoveCity_Text_1C5A7A, 4
+	msgbox LilycoveCity_Text_1C5A7A, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, ITEM_CHERI_BERRY
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
-	msgbox LilycoveCity_Text_1C5B1D, 4
+	msgbox LilycoveCity_Text_1C5B1D, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CBB4:: @ 814CBB4
-	msgbox LilycoveCity_Text_1C5B5D, 4
+	msgbox LilycoveCity_Text_1C5B5D, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CBBE:: @ 814CBBE
-	msgbox LilycoveCity_Text_1686C9, 2
+	msgbox LilycoveCity_Text_1686C9, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CBC7:: @ 814CBC7
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
-	msgbox LilycoveCity_Text_168750, 4
+	msgbox LilycoveCity_Text_168750, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CBDC:: @ 814CBDC
-	msgbox LilycoveCity_Text_168791, 4
+	msgbox LilycoveCity_Text_168791, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CBE6:: @ 814CBE6
-	msgbox LilycoveCity_Text_168819, 2
+	msgbox LilycoveCity_Text_168819, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CBEF:: @ 814CBEF
 	lock
 	faceplayer
 	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
-	msgbox LilycoveCity_Text_1688C1, 4
+	msgbox LilycoveCity_Text_1688C1, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CC04:: @ 814CC04
-	msgbox LilycoveCity_Text_168934, 4
+	msgbox LilycoveCity_Text_168934, MSGBOX_DEFAULT
 	release
 	end
 
@@ -116,50 +116,50 @@ LilycoveCity_EventScript_14CC0E:: @ 814CC0E
 	lock
 	faceplayer
 	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
-	msgbox LilycoveCity_Text_1689BF, 4
+	msgbox LilycoveCity_Text_1689BF, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CC23:: @ 814CC23
-	msgbox LilycoveCity_Text_168A55, 4
+	msgbox LilycoveCity_Text_168A55, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CC2D:: @ 814CC2D
-	msgbox LilycoveCity_Text_168A8D, 2
+	msgbox LilycoveCity_Text_168A8D, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CC36:: @ 814CC36
-	msgbox LilycoveCity_Text_168B1F, 3
+	msgbox LilycoveCity_Text_168B1F, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CC3F:: @ 814CC3F
-	msgbox LilycoveCity_Text_168B9B, 3
+	msgbox LilycoveCity_Text_168B9B, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CC48:: @ 814CC48
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
-	msgbox LilycoveCity_Text_168C16, 4
+	msgbox LilycoveCity_Text_168C16, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CC5D:: @ 814CC5D
-	msgbox LilycoveCity_Text_168D15, 4
+	msgbox LilycoveCity_Text_168D15, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_EventScript_14CC67:: @ 814CC67
-	msgbox LilycoveCity_Text_168DA9, 3
+	msgbox LilycoveCity_Text_168DA9, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CC70:: @ 814CC70
-	msgbox LilycoveCity_Text_168DE1, 3
+	msgbox LilycoveCity_Text_168DE1, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CC79:: @ 814CC79
-	msgbox LilycoveCity_Text_168E2F, 3
+	msgbox LilycoveCity_Text_168E2F, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CC82:: @ 814CC82
@@ -167,71 +167,71 @@ LilycoveCity_EventScript_14CC82:: @ 814CC82
 	specialvar VAR_0x8004, sub_80C4D50
 	switch VAR_0x8004
 	case 0, LilycoveCity_EventScript_14CCA2
-	msgbox LilycoveCity_Text_168EA4, 4
+	msgbox LilycoveCity_Text_168EA4, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CCA2:: @ 814CCA2
-	msgbox LilycoveCity_Text_168E67, 4
+	msgbox LilycoveCity_Text_168E67, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CCAC:: @ 814CCAC
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
-	msgbox LilycoveCity_Text_168EDA, 4
+	msgbox LilycoveCity_Text_168EDA, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CCC0:: @ 814CCC0
-	msgbox LilycoveCity_Text_168F57, 4
+	msgbox LilycoveCity_Text_168F57, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CCCA:: @ 814CCCA
-	msgbox LilycoveCity_Text_168FA1, 3
+	msgbox LilycoveCity_Text_168FA1, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CCD3:: @ 814CCD3
-	msgbox LilycoveCity_Text_168FF3, 3
+	msgbox LilycoveCity_Text_168FF3, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CCDC:: @ 814CCDC
-	msgbox LilycoveCity_Text_169072, 3
+	msgbox LilycoveCity_Text_169072, MSGBOX_SIGN
 	end
 
 LilycoveCity_EventScript_14CCE5:: @ 814CCE5
 	lockall
 	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
-	msgbox LilycoveCity_Text_16864A, 4
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0839
+	msgbox LilycoveCity_Text_16864A, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_Text_168675, 4
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A083D
+	msgbox LilycoveCity_Text_168675, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_MET_WAILMER_TRAINER
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CD18:: @ 814CD18
-	msgbox LilycoveCity_Text_16864A, 4
+	msgbox LilycoveCity_Text_16864A, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_EventScript_14CD22:: @ 814CD22
-	msgbox LilycoveCity_Text_168455, 2
+	msgbox LilycoveCity_Text_168455, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CD2B:: @ 814CD2B
-	msgbox LilycoveCity_Text_1684C2, 2
+	msgbox LilycoveCity_Text_1684C2, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CD34:: @ 814CD34
-	msgbox LilycoveCity_Text_168573, 2
+	msgbox LilycoveCity_Text_168573, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CD3D:: @ 814CD3D
-	msgbox LilycoveCity_Text_1685EB, 2
+	msgbox LilycoveCity_Text_1685EB, MSGBOX_NPC
 	end
 
 LilycoveCity_EventScript_14CD46:: @ 814CD46
@@ -250,7 +250,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_EventScript_14CDC2
-	msgbox LilycoveCity_Text_167B94, 4
+	msgbox LilycoveCity_Text_167B94, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_14CE46
 	case 1, LilycoveCity_EventScript_14CE56
@@ -267,7 +267,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9
 
 LilycoveCity_EventScript_14CDC2:: @ 814CDC2
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_167AEB, 4
+	msgbox LilycoveCity_Text_167AEB, MSGBOX_DEFAULT
 	savebgm 0
 	fadedefaultbgm
 	release
@@ -279,7 +279,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_EventScript_14CE35
-	msgbox LilycoveCity_Text_1680A9, 4
+	msgbox LilycoveCity_Text_1680A9, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, LilycoveCity_EventScript_14CE76
 	case 1, LilycoveCity_EventScript_14CE86
@@ -296,44 +296,44 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C
 
 LilycoveCity_EventScript_14CE35:: @ 814CE35
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_16802C, 4
+	msgbox LilycoveCity_Text_16802C, MSGBOX_DEFAULT
 	savebgm 0
 	fadedefaultbgm
 	release
 	end
 
 LilycoveCity_EventScript_14CE46:: @ 814CE46
-	trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5
+	trainerbattle_no_intro TRAINER_MAY_11, LilycoveCity_Text_167BD5
 	goto LilycoveCity_EventScript_14CEA6
 	end
 
 LilycoveCity_EventScript_14CE56:: @ 814CE56
-	trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5
+	trainerbattle_no_intro TRAINER_MAY_12, LilycoveCity_Text_167BD5
 	goto LilycoveCity_EventScript_14CEA6
 	end
 
 LilycoveCity_EventScript_14CE66:: @ 814CE66
-	trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5
+	trainerbattle_no_intro TRAINER_MAY_10, LilycoveCity_Text_167BD5
 	goto LilycoveCity_EventScript_14CEA6
 	end
 
 LilycoveCity_EventScript_14CE76:: @ 814CE76
-	trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4
+	trainerbattle_no_intro TRAINER_BRENDAN_11, LilycoveCity_Text_1680E4
 	goto LilycoveCity_EventScript_14CF12
 	end
 
 LilycoveCity_EventScript_14CE86:: @ 814CE86
-	trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4
+	trainerbattle_no_intro TRAINER_BRENDAN_12, LilycoveCity_Text_1680E4
 	goto LilycoveCity_EventScript_14CF12
 	end
 
 LilycoveCity_EventScript_14CE96:: @ 814CE96
-	trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4
+	trainerbattle_no_intro TRAINER_BRENDAN_10, LilycoveCity_Text_1680E4
 	goto LilycoveCity_EventScript_14CF12
 	end
 
 LilycoveCity_EventScript_14CEA6:: @ 814CEA6
-	msgbox LilycoveCity_Text_167C6B, 4
+	msgbox LilycoveCity_Text_167C6B, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
 	compare VAR_RESULT, 0
@@ -354,20 +354,20 @@ LilycoveCity_EventScript_14CEE8:: @ 814CEE8
 	return
 
 LilycoveCity_EventScript_14CEEE:: @ 814CEEE
-	msgbox LilycoveCity_Text_167D08, 4
+	msgbox LilycoveCity_Text_167D08, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CEF7:: @ 814CEF7
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
-	msgbox LilycoveCity_Text_167DDD, 4
+	msgbox LilycoveCity_Text_167DDD, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CF09:: @ 814CF09
-	msgbox LilycoveCity_Text_167EAA, 4
+	msgbox LilycoveCity_Text_167EAA, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CF12:: @ 814CF12
-	msgbox LilycoveCity_Text_168149, 4
+	msgbox LilycoveCity_Text_168149, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
 	compare VAR_RESULT, 0
@@ -379,21 +379,21 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12
 	end
 
 LilycoveCity_EventScript_14CF47:: @ 814CF47
-	msgbox LilycoveCity_Text_1681EA, 4
+	msgbox LilycoveCity_Text_1681EA, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CF50:: @ 814CF50
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
-	msgbox LilycoveCity_Text_168282, 4
+	msgbox LilycoveCity_Text_168282, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CF62:: @ 814CF62
-	msgbox LilycoveCity_Text_16835A, 4
+	msgbox LilycoveCity_Text_16835A, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_EventScript_14CF6B:: @ 814CF6B
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 944857a21..42efd2f18 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -4,252 +4,252 @@ LilycoveCity_ContestHall_MapScripts:: @ 8159099
 	.byte 0 @ XXX
 
 LilycoveCity_ContestHall_EventScript_15909B:: @ 815909B
-	msgbox LilycoveCity_ContestHall_Text_1890D4, 2
+	msgbox LilycoveCity_ContestHall_Text_1890D4, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestHall_EventScript_1590A4:: @ 81590A4
-	msgbox LilycoveCity_ContestHall_Text_18915F, 2
+	msgbox LilycoveCity_ContestHall_Text_18915F, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestHall_EventScript_1590AD:: @ 81590AD
-	msgbox LilycoveCity_ContestHall_Text_189221, 2
+	msgbox LilycoveCity_ContestHall_Text_189221, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestHall_EventScript_1590B6:: @ 81590B6
-	msgbox LilycoveCity_ContestHall_Text_189299, 2
+	msgbox LilycoveCity_ContestHall_Text_189299, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF
-	msgbox LilycoveCity_ContestHall_Text_189301, 2
+	msgbox LilycoveCity_ContestHall_Text_189301, MSGBOX_NPC
 	lockall
-	applymovement 4, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4
-	msgbox LilycoveCity_ContestHall_Text_189366, 2
+	msgbox LilycoveCity_ContestHall_Text_189366, MSGBOX_NPC
 	lockall
-	applymovement 5, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9
-	msgbox LilycoveCity_ContestHall_Text_1893CE, 2
+	msgbox LilycoveCity_ContestHall_Text_1893CE, MSGBOX_NPC
 	lockall
-	applymovement 6, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE
-	msgbox LilycoveCity_ContestHall_Text_189463, 2
+	msgbox LilycoveCity_ContestHall_Text_189463, MSGBOX_NPC
 	lockall
-	applymovement 7, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159113:: @ 8159113
-	msgbox LilycoveCity_ContestHall_Text_189512, 2
+	msgbox LilycoveCity_ContestHall_Text_189512, MSGBOX_NPC
 	lockall
-	applymovement 8, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159128:: @ 8159128
-	msgbox LilycoveCity_ContestHall_Text_18956B, 2
+	msgbox LilycoveCity_ContestHall_Text_18956B, MSGBOX_NPC
 	lockall
-	applymovement 9, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15913D:: @ 815913D
-	msgbox LilycoveCity_ContestHall_Text_1895F3, 3
+	msgbox LilycoveCity_ContestHall_Text_1895F3, MSGBOX_SIGN
 	end
 
 LilycoveCity_ContestHall_EventScript_159146:: @ 8159146
-	msgbox LilycoveCity_ContestHall_Text_189617, 2
+	msgbox LilycoveCity_ContestHall_Text_189617, MSGBOX_NPC
 	lockall
-	applymovement 12, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B
-	msgbox LilycoveCity_ContestHall_Text_1896BE, 2
+	msgbox LilycoveCity_ContestHall_Text_1896BE, MSGBOX_NPC
 	lockall
-	applymovement 22, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 22, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159170:: @ 8159170
-	msgbox LilycoveCity_ContestHall_Text_1896FE, 2
+	msgbox LilycoveCity_ContestHall_Text_1896FE, MSGBOX_NPC
 	lockall
-	applymovement 11, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159185:: @ 8159185
-	msgbox LilycoveCity_ContestHall_Text_189771, 2
+	msgbox LilycoveCity_ContestHall_Text_189771, MSGBOX_NPC
 	lockall
-	applymovement 13, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A
-	msgbox LilycoveCity_ContestHall_Text_1897AA, 2
+	msgbox LilycoveCity_ContestHall_Text_1897AA, MSGBOX_NPC
 	lockall
-	applymovement 14, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF
-	msgbox LilycoveCity_ContestHall_Text_18980B, 2
+	msgbox LilycoveCity_ContestHall_Text_18980B, MSGBOX_NPC
 	lockall
-	applymovement 15, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4
-	msgbox LilycoveCity_ContestHall_Text_189874, 2
+	msgbox LilycoveCity_ContestHall_Text_189874, MSGBOX_NPC
 	lockall
-	applymovement 16, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 16, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9
-	msgbox LilycoveCity_ContestHall_Text_18990A, 2
+	msgbox LilycoveCity_ContestHall_Text_18990A, MSGBOX_NPC
 	lockall
-	applymovement 17, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 17, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE
-	msgbox LilycoveCity_ContestHall_Text_189981, 2
+	msgbox LilycoveCity_ContestHall_Text_189981, MSGBOX_NPC
 	lockall
-	applymovement 18, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159203:: @ 8159203
-	msgbox LilycoveCity_ContestHall_Text_189A1D, 2
+	msgbox LilycoveCity_ContestHall_Text_189A1D, MSGBOX_NPC
 	lockall
-	applymovement 19, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159218:: @ 8159218
-	msgbox LilycoveCity_ContestHall_Text_189A82, 2
+	msgbox LilycoveCity_ContestHall_Text_189A82, MSGBOX_NPC
 	lockall
-	applymovement 21, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 21, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D
-	msgbox LilycoveCity_ContestHall_Text_189AE1, 2
+	msgbox LilycoveCity_ContestHall_Text_189AE1, MSGBOX_NPC
 	lockall
-	applymovement 20, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159242:: @ 8159242
-	msgbox LilycoveCity_ContestHall_Text_189B4E, 2
+	msgbox LilycoveCity_ContestHall_Text_189B4E, MSGBOX_NPC
 	lockall
-	applymovement 23, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 23, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159257:: @ 8159257
-	msgbox LilycoveCity_ContestHall_Text_189BBF, 2
+	msgbox LilycoveCity_ContestHall_Text_189BBF, MSGBOX_NPC
 	lockall
-	applymovement 24, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 24, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C
-	msgbox LilycoveCity_ContestHall_Text_189C29, 2
+	msgbox LilycoveCity_ContestHall_Text_189C29, MSGBOX_NPC
 	lockall
-	applymovement 25, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 25, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159281:: @ 8159281
-	msgbox LilycoveCity_ContestHall_Text_189C67, 2
+	msgbox LilycoveCity_ContestHall_Text_189C67, MSGBOX_NPC
 	lockall
-	applymovement 26, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_159296:: @ 8159296
-	msgbox LilycoveCity_ContestHall_Text_189CB3, 2
+	msgbox LilycoveCity_ContestHall_Text_189CB3, MSGBOX_NPC
 	lockall
-	applymovement 27, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1592AB:: @ 81592AB
-	msgbox LilycoveCity_ContestHall_Text_189D11, 2
+	msgbox LilycoveCity_ContestHall_Text_189D11, MSGBOX_NPC
 	lockall
-	applymovement 28, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0
 	lockall
-	applymovement 29, LilycoveCity_ContestHall_Movement_1A0839
+	applymovement 29, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 25
-	applymovement 29, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	msgbox LilycoveCity_ContestHall_Text_189DA2, 3
+	msgbox LilycoveCity_ContestHall_Text_189DA2, MSGBOX_SIGN
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2
-	msgbox LilycoveCity_ContestHall_Text_189E5F, 2
+	msgbox LilycoveCity_ContestHall_Text_189E5F, MSGBOX_NPC
 	lockall
-	applymovement 31, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_1592F7:: @ 81592F7
-	msgbox LilycoveCity_ContestHall_Text_189DF3, 2
+	msgbox LilycoveCity_ContestHall_Text_189DF3, MSGBOX_NPC
 	lockall
-	applymovement 30, LilycoveCity_ContestHall_Movement_1A083D
+	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_ContestHall_EventScript_15930C:: @ 815930C
-	msgbox LilycoveCity_ContestHall_Text_189EF3, 3
+	msgbox LilycoveCity_ContestHall_Text_189EF3, MSGBOX_SIGN
 	end
 
 LilycoveCity_ContestHall_EventScript_159315:: @ 8159315
-	msgbox LilycoveCity_ContestHall_Text_189F29, 3
+	msgbox LilycoveCity_ContestHall_Text_189F29, MSGBOX_SIGN
 	end
 
 LilycoveCity_ContestHall_EventScript_15931E:: @ 815931E
-	msgbox LilycoveCity_ContestHall_Text_189F5C, 3
+	msgbox LilycoveCity_ContestHall_Text_189F5C, MSGBOX_SIGN
 	end
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index e96a356ce..dc3031bda 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_ContestLobby_MapScripts:: @ 8158866
-	map_script 3, LilycoveCity_ContestLobby_MapScript1_158871
-	map_script 2, LilycoveCity_ContestLobby_MapScript2_158877
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_MapScript1_158871
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_MapScript2_158877
 	.byte 0
 
 LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871
@@ -22,12 +22,12 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
 	addobject 4
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B
 	waitmovement 4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158A4C
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT
 	lockall
-	fadescreen 1
-	drawcontestwinner 0
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 0
 	lockall
 	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -38,7 +38,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
 	end
 
 LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, MSGBOX_DEFAULT
 	closemessage
 	special sub_80C4CEC
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
@@ -57,7 +57,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
 	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
 	waitmovement 0
@@ -72,16 +72,16 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
 	waitmovement 0
 	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A52
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_188C32, MSGBOX_DEFAULT
 	closemessage
 	return
 
@@ -152,7 +152,7 @@ LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
 	walk_down
@@ -163,17 +163,17 @@ LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
 	delay_16
@@ -184,7 +184,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
 	walk_fast_up
 	walk_fast_up
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
@@ -196,12 +196,12 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
 	addobject 11
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B64
 	waitmovement 11
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158B76
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158B76
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	msgbox LilycoveCity_ContestLobby_Text_18890F, MSGBOX_DEFAULT
 	lockall
-	fadescreen 1
-	drawcontestwinner 0
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 0
 	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
@@ -210,7 +210,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
 	end
 
 LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, MSGBOX_DEFAULT
 	closemessage
 	special sub_80C4CEC
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
@@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
 	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, MSGBOX_DEFAULT
 	closemessage
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
 	waitmovement 0
@@ -244,16 +244,16 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
 	waitmovement 0
 	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, MSGBOX_DEFAULT
 	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C19, MSGBOX_DEFAULT
+	msgbox LilycoveCity_ContestLobby_Text_188C32, MSGBOX_DEFAULT
 	closemessage
 	return
 
@@ -266,7 +266,7 @@ LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
 	walk_down
@@ -277,17 +277,17 @@ LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
 	delay_16
@@ -298,7 +298,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
 	walk_fast_up
 	walk_fast_up
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	lockall
@@ -319,7 +319,7 @@ LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
 	end
 
 LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA
-	msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4
+	msgbox LilycoveCity_ContestLobby_Text_1A63F4, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -327,7 +327,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	erasebox 0, 0, 15, 9
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
@@ -344,18 +344,18 @@ LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
-	msgbox LilycoveCity_ContestLobby_Text_1885A7, 4
+	msgbox LilycoveCity_ContestLobby_Text_1885A7, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158B85
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
-	msgbox LilycoveCity_ContestLobby_Text_188559, 4
+	msgbox LilycoveCity_ContestLobby_Text_188559, MSGBOX_DEFAULT
 	releaseall
 	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
-	msgbox LilycoveCity_ContestLobby_Text_188703, 4
+	msgbox LilycoveCity_ContestLobby_Text_188703, MSGBOX_DEFAULT
 	setvar VAR_CONTEST_RANK, 0
 	choosecontestmon
 	compare VAR_0x8004, 255
@@ -374,17 +374,17 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
 	end
 
 LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96
-	msgbox LilycoveCity_ContestLobby_Text_1A664A, 4
+	msgbox LilycoveCity_ContestLobby_Text_1A664A, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158C42
 	end
 
 LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4
-	msgbox LilycoveCity_ContestLobby_Text_1A669F, 4
+	msgbox LilycoveCity_ContestLobby_Text_1A669F, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158C42
 	end
 
 LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
-	msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4
+	msgbox LilycoveCity_ContestLobby_Text_1A66DC, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158C42
 	end
 
@@ -432,13 +432,13 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
 	end
 
 LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
-	msgbox LilycoveCity_ContestLobby_Text_188750, 4
+	msgbox LilycoveCity_ContestLobby_Text_188750, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158CEA
 	end
 
 LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
+	msgbox LilycoveCity_ContestLobby_Text_18878D, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	clearflag FLAG_TEMP_3
@@ -446,7 +446,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 
 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
+	msgbox LilycoveCity_ContestLobby_Text_1887F4, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	clearflag FLAG_TEMP_3
@@ -454,14 +454,14 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 
 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
 	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
+	msgbox LilycoveCity_ContestLobby_Text_18881F, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	clearflag FLAG_TEMP_3
 	end
 
 LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
-	msgbox LilycoveCity_ContestLobby_Text_18873A, 4
+	msgbox LilycoveCity_ContestLobby_Text_18873A, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_158CEA
 	end
 
@@ -505,14 +505,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
 	delay 20
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
 	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158E99
 	waitmovement 0
 	messageautoscroll LilycoveCity_ContestLobby_Text_1A6832
 	waitmessage
 	delay 20
 	closemessage
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158E8E
 	waitmovement 0
 	releaseall
 	return
@@ -528,24 +528,24 @@ LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
 	walk_in_place_fastest_right
 	walk_right
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
 	walk_right
@@ -557,11 +557,11 @@ LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 	specialvar VAR_RESULT, sub_80C5044
@@ -581,7 +581,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
-	giveitem ITEM_CONTEST_PASS, 1
+	additem ITEM_CONTEST_PASS
 	setvar VAR_0x800B, 8
 	setvar VAR_CONTEST_RANK, 3
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
@@ -644,12 +644,12 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
 	delay 20
 	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
 	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_159008
 	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
+	msgbox LilycoveCity_ContestLobby_Text_1A6832, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_ContestLobby_Movement_158FFE
 	waitmovement 0
 	releaseall
 	return
@@ -664,24 +664,24 @@ LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
 	walk_in_place_fastest_left
 	walk_left
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
 	walk_left
@@ -692,68 +692,68 @@ LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
-	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
+	msgbox LilycoveCity_ContestLobby_Text_188D3C, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
 	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
-	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
+	msgbox LilycoveCity_ContestLobby_Text_188DDA, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039
-	msgbox LilycoveCity_ContestLobby_Text_188E47, 2
+	msgbox LilycoveCity_ContestLobby_Text_188E47, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042
-	msgbox LilycoveCity_ContestLobby_Text_188F07, 2
+	msgbox LilycoveCity_ContestLobby_Text_188F07, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B
-	msgbox LilycoveCity_ContestLobby_Text_188F81, 2
+	msgbox LilycoveCity_ContestLobby_Text_188F81, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054
-	msgbox LilycoveCity_ContestLobby_Text_188FE3, 2
+	msgbox LilycoveCity_ContestLobby_Text_188FE3, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
-	msgbox LilycoveCity_ContestLobby_Text_18904D, 2
+	msgbox LilycoveCity_ContestLobby_Text_18904D, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
 	lockall
-	fadescreen 1
-	drawcontestwinner 6
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 6
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
 	lockall
-	fadescreen 1
-	drawcontestwinner 7
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 7
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
 	lockall
-	fadescreen 1
-	drawcontestwinner 8
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 8
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B
-	msgbox LilycoveCity_ContestLobby_Text_1B7225, 2
+	msgbox LilycoveCity_ContestLobby_Text_1B7225, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
-	msgbox LilycoveCity_ContestLobby_Text_1B7241, 2
+	msgbox LilycoveCity_ContestLobby_Text_1B7241, MSGBOX_NPC
 	end
 
 LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index c3eca04f4..04fdafbec 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -5,34 +5,34 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
@@ -40,15 +40,15 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326
 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D
 	lockall
 	playse SE_PIN
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_CoveLilyMotel_1F_Movement_158395
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A
 	waitmovement 0
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C
@@ -61,14 +61,14 @@ LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
-	end_movement
+	step_end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C
 	face_down
 	walk_down
 	face_up
-	end_movement
+	step_end
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 40d757c4a..1b48e4b4d 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -13,7 +13,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
@@ -26,28 +26,28 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
 	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
 	waitmessage
-	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
+	call Common_EventScript_PlayGymBadgeFanfare
 	special ScrSpecial_ShowDiploma
 	waitstate
 	release
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, MSGBOX_NPC
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, MSGBOX_NPC
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, MSGBOX_NPC
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, MSGBOX_NPC
 	end
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, MSGBOX_NPC
 	end
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 5a157eadd..eca853db4 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1
 
 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
 	erasebox 0, 0, 29, 19
-	applymovement VAR_LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	special ShakeScreenInElevator
 	waitstate
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 9ed0262ea..5b7fafb87 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F
-	map_script 3, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145
 	.byte 0
 
 LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145
@@ -21,10 +21,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -54,17 +54,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0
 	getpricereduction 3
 	compare VAR_RESULT, 1
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA:: @ 815A1BA
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C685, 4
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C685, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C70E, 2
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C70E, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD
@@ -83,7 +83,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE
 	case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C
 	case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227
 	case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, 4
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396
 	end
 
@@ -103,27 +103,27 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D
-	checkmoney 0xc8, 0
+	checkmoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A244:: @ 815A244
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B
-	checkmoney 0x15e, 0
+	checkmoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252
-	takemoney 0xc8, 0
+	removemoney 200, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259
-	takemoney 0x12c, 0
+	removemoney 300, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260
-	takemoney 0x15e, 0
+	removemoney 350, 0
 	return
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
@@ -148,11 +148,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	nop
 	bufferitemname 0, VAR_TEMP_0
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4
-	giveitem VAR_TEMP_0, 1
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, MSGBOX_DEFAULT
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
+	msgbox Text_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
 	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
@@ -160,11 +160,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4
-	giveitem VAR_TEMP_0, 1
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
+	msgbox Text_PutItemInPocket, MSGBOX_DEFAULT
 	random 64
 	compare VAR_RESULT, 0
 	goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
@@ -172,11 +172,11 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388
 	playse SE_JIHANKI
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4
-	giveitem VAR_TEMP_0, 1
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, MSGBOX_DEFAULT
+	additem VAR_TEMP_0
 	bufferitemname 1, VAR_TEMP_0
 	bufferstdstring 2, 14
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4
+	msgbox Text_PutItemInPocket, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E
 	end
 
@@ -187,12 +187,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, 4
+	msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396
 	end
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388
-	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C79, 4
+	msgbox Text_TheBagIsFull, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396
 	end
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index ad2c6aad1..db7c2363a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -2,13 +2,13 @@ LilycoveCity_DepartmentStore_1F_MapScripts:: @ 8159D54
 	.byte 0
 
 LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18BFB5, 2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18BFB5, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	compare VAR_LOTTERY_PRIZE, 0
 	goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1
 	goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C
@@ -21,8 +21,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	special RetrieveLotteryNumber
 	copyvar VAR_0x8008, VAR_RESULT
 	special BufferLottoTicketNumber
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, MSGBOX_DEFAULT
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PC_ON
 	special DoLotteryCornerComputerEffect
@@ -30,7 +30,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	delay 220
 	special EndLotteryCornerComputerEffect
 	delay 10
-	applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8004, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60
@@ -48,54 +48,54 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A
 	compare VAR_0x8004, 4
 	call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93
-	giveitem_std VAR_0x8005
+	giveitem VAR_0x8005
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C
 	goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E3A:: @ 8159E3A
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4D7D, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4D7D, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E43:: @ 8159E43
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4DD1, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4DD1, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E4C:: @ 8159E4C
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C6A, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C6A, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E56:: @ 8159E56
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C85, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4C85, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E60:: @ 8159E60
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E6E:: @ 8159E6E
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C501C, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C501C, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E78:: @ 8159E78
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E4F, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E4F, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E81:: @ 8159E81
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E92, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E92, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E8A:: @ 8159E8A
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4ED8, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4ED8, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F1C, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F1C, MSGBOX_DEFAULT
 	return
 
 LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C
@@ -104,13 +104,13 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F77, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4F77, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1
-	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4
-	giveitem_std VAR_LOTTERY_PRIZE
+	msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, MSGBOX_DEFAULT
+	giveitem VAR_LOTTERY_PRIZE
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7
 	setvar VAR_LOTTERY_PRIZE, 0
@@ -118,15 +118,15 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159ED7:: @ 8159ED7
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18BFDB, 2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18BFDB, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EE0:: @ 8159EE0
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18C044, 2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18C044, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EE9:: @ 8159EE9
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18C07A, 2
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18C07A, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2
@@ -134,11 +134,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
 LilycoveCity_DepartmentStore_1F_EventScript_159F05:: @ 8159F05
-	msgbox LilycoveCity_DepartmentStore_1F_Text_18C0D9, 3
+	msgbox LilycoveCity_DepartmentStore_1F_Text_18C0D9, MSGBOX_SIGN
 	end
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 25e981628..b83e23289 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -2,24 +2,24 @@ LilycoveCity_DepartmentStore_2F_MapScripts:: @ 8159F0E
 	.byte 0
 
 LilycoveCity_DepartmentStore_2F_EventScript_159F0F:: @ 8159F0F
-	msgbox LilycoveCity_DepartmentStore_2F_Text_18C162, 2
+	msgbox LilycoveCity_DepartmentStore_2F_Text_18C162, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_2F_EventScript_159F18:: @ 8159F18
-	msgbox LilycoveCity_DepartmentStore_2F_Text_18C195, 2
+	msgbox LilycoveCity_DepartmentStore_2F_Text_18C195, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_2F_EventScript_159F21:: @ 8159F21
-	msgbox LilycoveCity_DepartmentStore_2F_Text_18C1D9, 2
+	msgbox LilycoveCity_DepartmentStore_2F_Text_18C1D9, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_2F_Items1
-	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -43,10 +43,10 @@ LilycoveCity_DepartmentStore_2F_Items1:: @ 8159F44
 LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_2F_Items2
-	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 1f55f5018..d723531db 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
@@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_3F_MapScripts:: @ 8159F90
 LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_3F_Items1
-	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -26,10 +26,10 @@ LilycoveCity_DepartmentStore_3F_Items1:: @ 8159FA8
 LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_3F_Items2
-	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -48,13 +48,13 @@ LilycoveCity_DepartmentStore_3F_Items2:: @ 8159FD0
 	end
 
 LilycoveCity_DepartmentStore_3F_EventScript_159FE2:: @ 8159FE2
-	msgbox LilycoveCity_DepartmentStore_3F_Text_18C24B, 2
+	msgbox LilycoveCity_DepartmentStore_3F_Text_18C24B, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_3F_EventScript_159FEB:: @ 8159FEB
-	msgbox LilycoveCity_DepartmentStore_3F_Text_18C2B5, 2
+	msgbox LilycoveCity_DepartmentStore_3F_Text_18C2B5, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_3F_EventScript_159FF4:: @ 8159FF4
-	msgbox LilycoveCity_DepartmentStore_3F_Text_18C32E, 2
+	msgbox LilycoveCity_DepartmentStore_3F_Text_18C32E, MSGBOX_NPC
 	end
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 907b79847..33a536b85 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
@@ -2,24 +2,24 @@ LilycoveCity_DepartmentStore_4F_MapScripts:: @ 8159FFD
 	.byte 0
 
 LilycoveCity_DepartmentStore_4F_EventScript_159FFE:: @ 8159FFE
-	msgbox LilycoveCity_DepartmentStore_4F_Text_18C39C, 2
+	msgbox LilycoveCity_DepartmentStore_4F_Text_18C39C, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_4F_EventScript_15A007:: @ 815A007
-	msgbox LilycoveCity_DepartmentStore_4F_Text_18C41B, 2
+	msgbox LilycoveCity_DepartmentStore_4F_Text_18C41B, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_4F_EventScript_15A010:: @ 815A010
-	msgbox LilycoveCity_DepartmentStore_4F_Text_18C481, 2
+	msgbox LilycoveCity_DepartmentStore_4F_Text_18C481, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_4F_Items1
-	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -36,10 +36,10 @@ LilycoveCity_DepartmentStore_4F_Items1:: @ 815A030
 LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart LilycoveCity_DepartmentStore_4F_Items2
-	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 184d3b816..edb17848a 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -4,10 +4,10 @@ LilycoveCity_DepartmentStore_5F_MapScripts:: @ 815A060
 LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1
-	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -32,10 +32,10 @@ LilycoveCity_DepartmentStore_5F_Items1:: @ 815A078
 LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2
-	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -57,10 +57,10 @@ LilycoveCity_DepartmentStore_5F_Items2:: @ 815A0AC
 LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3
-	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -82,10 +82,10 @@ LilycoveCity_DepartmentStore_5F_Items3:: @ 815A0DC
 LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2
 	lock
 	faceplayer
-	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4
-	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -106,13 +106,13 @@ LilycoveCity_DepartmentStore_5F_Items4:: @ 815A10C
 	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_15A124:: @ 815A124
-	msgbox LilycoveCity_DepartmentStore_5F_Text_18C4F9, 2
+	msgbox LilycoveCity_DepartmentStore_5F_Text_18C4F9, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_15A12D:: @ 815A12D
-	msgbox LilycoveCity_DepartmentStore_5F_Text_18C59F, 2
+	msgbox LilycoveCity_DepartmentStore_5F_Text_18C59F, MSGBOX_NPC
 	end
 
 LilycoveCity_DepartmentStore_5F_EventScript_15A136:: @ 815A136
-	msgbox LilycoveCity_DepartmentStore_5F_Text_18C556, 2
+	msgbox LilycoveCity_DepartmentStore_5F_Text_18C556, MSGBOX_NPC
 	end
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 3bb6d47c8..2fb9bea30 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_Harbor_MapScripts:: @ 8159893
-	map_script 3, LilycoveCity_Harbor_MapScript1_159899
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_MapScript1_159899
 	.byte 0
 
 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899
@@ -17,12 +17,12 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
 
 LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD
-	msgbox LilycoveCity_Harbor_Text_18B306, 4
+	msgbox LilycoveCity_Harbor_Text_18B306, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD
-	msgbox LilycoveCity_Harbor_Text_18B36F, 4
+	msgbox LilycoveCity_Harbor_Text_18B36F, MSGBOX_DEFAULT
 	checkitem ITEM_SS_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_159929
@@ -41,7 +41,7 @@ LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1
 	end
 
 LilycoveCity_Harbor_EventScript_159929:: @ 8159929
-	msgbox LilycoveCity_Harbor_Text_18B3A9, 4
+	msgbox LilycoveCity_Harbor_Text_18B3A9, MSGBOX_DEFAULT
 	release
 	end
 
@@ -73,9 +73,9 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E
 	end
 
 LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
-	msgbox LilycoveCity_Harbor_Text_18B4B3, 4
+	msgbox LilycoveCity_Harbor_Text_18B4B3, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -84,23 +84,23 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
 	compare VAR_FACING, 4
 	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_1A040E
+	call Common_EventScript_FerryDepart
 	return
 
 LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE
-	applymovement 255, LilycoveCity_Harbor_Movement_159A86
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A86
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9
-	applymovement 255, LilycoveCity_Harbor_Movement_159A89
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_159A89
 	waitmovement 0
 	return
 
 LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
-	msgbox LilycoveCity_Harbor_Text_18B45B, 4
+	msgbox LilycoveCity_Harbor_Text_18B45B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -108,20 +108,20 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA
 	goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA
 	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA
-	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
+	msgbox LilycoveCity_Harbor_Text_1C50F2, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
 	delay 60
 	addobject 4
 	delay 30
-	applymovement 4, LilycoveCity_Harbor_Movement_1A0839
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_Harbor_Text_1C5120, 4
+	msgbox LilycoveCity_Harbor_Text_1C5120, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	removeobject 4
@@ -130,10 +130,10 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	compare VAR_FACING, 4
 	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
 	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	special ScrSpecial_HealPlayerParty
 	setvar VAR_0x8004, 2
-	call LilycoveCity_Harbor_EventScript_1A040E
+	call Common_EventScript_FerryDepart
 	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
 	waitstate
 	release
@@ -142,25 +142,25 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 LilycoveCity_Harbor_Movement_159A86:: @ 8159A86
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
 	walk_up
-	end_movement
+	step_end
 
 @ 8159A8B
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2
-	msgbox LilycoveCity_Harbor_Text_18B504, 4
+	msgbox LilycoveCity_Harbor_Text_18B504, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2
-	msgbox LilycoveCity_Harbor_Text_18B58E, 4
+	msgbox LilycoveCity_Harbor_Text_18B58E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 15535a122..86b37ecd7 100644
--- a/data/maps/LilycoveCity_House1/scripts.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
@@ -2,7 +2,7 @@ LilycoveCity_House1_MapScripts:: @ 8159B85
 	.byte 0
 
 LilycoveCity_House1_EventScript_159B86:: @ 8159B86
-	msgbox LilycoveCity_House1_Text_18B7B0, 2
+	msgbox LilycoveCity_House1_Text_18B7B0, MSGBOX_NPC
 	end
 
 LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F
@@ -10,7 +10,7 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox LilycoveCity_House1_Text_18B82B, 4
+	msgbox LilycoveCity_House1_Text_18B82B, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 123e3a79d..ae37152fa 100644
--- a/data/maps/LilycoveCity_House2/scripts.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
@@ -5,16 +5,16 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA
-	msgbox LilycoveCity_House2_Text_18B83C, 4
-	giveitem_std ITEM_TM44_REST
+	msgbox LilycoveCity_House2_Text_18B83C, MSGBOX_DEFAULT
+	giveitem ITEM_TM44_REST
 	compare VAR_RESULT, 0
-	goto_if_eq LilycoveCity_House2_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM44
-	msgbox LilycoveCity_House2_Text_18B883, 4
+	msgbox LilycoveCity_House2_Text_18B883, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_House2_EventScript_159BDA:: @ 8159BDA
-	msgbox LilycoveCity_House2_Text_18B883, 4
+	msgbox LilycoveCity_House2_Text_18B883, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc
index f771ab1d4..a149f6891 100644
--- a/data/maps/LilycoveCity_House3/scripts.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_House3_MapScripts:: @ 8159BE4
-	map_script 3, LilycoveCity_House3_MapScript1_159BEA
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_MapScript1_159BEA
 	.byte 0
 
 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA
@@ -13,17 +13,17 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3
 	msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_House3_EventScript_159C1D
-	msgbox LilycoveCity_House3_Text_18BA2B, 4
+	msgbox LilycoveCity_House3_Text_18BA2B, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D
-	msgbox LilycoveCity_House3_Text_18B9DC, 4
+	msgbox LilycoveCity_House3_Text_18B9DC, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -31,9 +31,9 @@ LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D
 LilycoveCity_House3_EventScript_159C32:: @ 8159C32
 	lock
 	faceplayer
-	msgbox LilycoveCity_House3_Text_18BD64, 4
+	msgbox LilycoveCity_House3_Text_18BD64, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, LilycoveCity_House3_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -79,21 +79,21 @@ LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5
 	end
 
 LilycoveCity_House3_EventScript_159D19:: @ 8159D19
-	msgbox LilycoveCity_House3_Text_18BDDB, 4
+	msgbox LilycoveCity_House3_Text_18BDDB, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_House3_EventScript_159D23:: @ 8159D23
-	msgbox LilycoveCity_House3_Text_18BE14, 4
+	msgbox LilycoveCity_House3_Text_18BE14, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_House3_EventScript_159D2D:: @ 8159D2D
-	msgbox LilycoveCity_House3_Text_18BE57, 4
+	msgbox LilycoveCity_House3_Text_18BE57, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_House3_EventScript_159D37:: @ 8159D37
-	msgbox LilycoveCity_House3_Text_18BE8E, 4
+	msgbox LilycoveCity_House3_Text_18BE8E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 13bc95dfa..4a1759b59 100644
--- a/data/maps/LilycoveCity_House4/scripts.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
@@ -2,9 +2,9 @@ LilycoveCity_House4_MapScripts:: @ 8159D41
 	.byte 0
 
 LilycoveCity_House4_EventScript_159D42:: @ 8159D42
-	msgbox LilycoveCity_House4_Text_18BEE8, 2
+	msgbox LilycoveCity_House4_Text_18BEE8, MSGBOX_NPC
 	end
 
 LilycoveCity_House4_EventScript_159D4B:: @ 8159D4B
-	msgbox LilycoveCity_House4_Text_18BF4E, 2
+	msgbox LilycoveCity_House4_Text_18BF4E, MSGBOX_NPC
 	end
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index 0d115eff8..4f14d7711 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -2,12 +2,12 @@ LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 815841B
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425
 	lockall
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	message LilycoveCity_LilycoveMuseum_1F_Text_1873B9
 	waitmessage
 	multichoice 20, 8, 16, 1
@@ -18,7 +18,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458
@@ -30,12 +30,12 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, MSGBOX_SIGN
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, MSGBOX_SIGN
 	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC
 	waitmovement 0
 	removeobject 2
@@ -47,7 +47,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD
 	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158504
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
@@ -55,7 +55,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2
 	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
@@ -63,7 +63,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7
 	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_158501
 	waitmovement 0
 	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
 	waitstate
@@ -71,92 +71,92 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7
 
 LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158510:: @ 8158510
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158519:: @ 8158519
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158522:: @ 8158522
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15852B:: @ 815852B
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158534:: @ 8158534
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15853D:: @ 815853D
 LilycoveCity_LilycoveMuseum_2F_EventScript_15853D:: @ 815853D
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158546:: @ 8158546
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15854F:: @ 815854F
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158558:: @ 8158558
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158561:: @ 8158561
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15856A:: @ 815856A
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158573:: @ 8158573
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, 3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15857C:: @ 815857C
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, MSGBOX_NPC
 	lockall
-	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, 2
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, MSGBOX_NPC
 	end
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index c6090a5a9..8c6d9a72b 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
-	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7
-	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670
 	.byte 0
 
 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
@@ -62,32 +62,32 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A
 	lockall
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
+	applymovement 1, Common_Movement_FacePlayer
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, MSGBOX_SIGN
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
 	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, MSGBOX_SIGN
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
+	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, MSGBOX_SIGN
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
 	face_up
 	delay_16
-	end_movement
+	step_end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	lockall
@@ -99,26 +99,26 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
 	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
 	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
 	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_158735
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, MSGBOX_DEFAULT
 	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, MSGBOX_DEFAULT
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4
-	givedecoration_std DECOR_GLASS_ORNAMENT
+	applymovement 1, Common_Movement_FacePlayer
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, MSGBOX_DEFAULT
+	givedecoration DECOR_GLASS_ORNAMENT
 	compare VAR_RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
 	setflag FLAG_RECEIVED_GLASS_ORNAMENT
@@ -127,94 +127,94 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783
-	call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4
+	call Common_EventScript_NoRoomForDecor
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, MSGBOX_NPC
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
 	lockall
 	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
 	lockall
 	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
 	lockall
 	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
 	lockall
 	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
 	lockall
 	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, MSGBOX_SIGN
 	end
 
 @ 81587FC
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15880E:: @ 815880E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, 2
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, MSGBOX_NPC
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 9
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 9
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 10
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 10
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 11
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 11
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 12
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 12
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 13
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, MSGBOX_SIGN
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 13
 	releaseall
 	end
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 8adf8b559..39ab9984a 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -3,7 +3,7 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
 
 LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
 	lockall
-	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO
 	switch VAR_RESULT
@@ -13,7 +13,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, MSGBOX_DEFAULT
 	special SelectMonForNPCTrade
 	waitstate
 	compare VAR_0x8004, 255
@@ -24,10 +24,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
 	special ScrSpecial_CountPokemonMoves
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
-	fadescreen 1
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	special SelectMove
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	compare VAR_0x8005, 4
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
 	special ScrSpecial_GetPokemonNicknameAndMoveName
@@ -42,22 +42,22 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
 	special DeleteMonMove
 	playfanfare MUS_ME_WASURE
 	waitfanfare
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
 	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index 61c6db9aa..47466c925 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327
-	map_script 3, LilycoveCity_PokemonCenter_1F_MapScript1_15932D
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_MapScript1_15932D
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D
@@ -8,25 +8,25 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D
 
 LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331
 	setvar VAR_0x800B, 1
-	call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F
-	msgbox LilycoveCity_PokemonCenter_1F_Text_189FC9, 2
+	msgbox LilycoveCity_PokemonCenter_1F_Text_189FC9, MSGBOX_NPC
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D
-	msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4
+	msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_15935D:: @ 815935D
-	msgbox LilycoveCity_PokemonCenter_1F_Text_18A0A1, 4
+	msgbox LilycoveCity_PokemonCenter_1F_Text_18A0A1, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index e4554e49c..b916ffc61 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 LilycoveCity_PokemonCenter_2F_MapScripts:: @ 8159367
-	map_script 2, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, LilycoveCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 LilycoveCity_PokemonCenter_2F_EventScript_159377:: @ 8159377
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index eeb5669ae..3f3905177 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -1,6 +1,6 @@
 LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A
-	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395
-	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395
+	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412
 	.byte 0
 
 LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395
@@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F
 	lockall
-	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402
 	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA
 	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, MSGBOX_DEFAULT
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409
 	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C
 	waitmovement 0
@@ -36,7 +36,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA
 	walk_down
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402
 	walk_fast_left
@@ -45,12 +45,12 @@ LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402
 	walk_fast_down
 	walk_fast_left
 	walk_fast_down
-	end_movement
+	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C
 	jump_in_place_right
@@ -58,7 +58,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C
 	walk_fast_up
 	walk_fast_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
@@ -156,7 +156,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, MSGBOX_DEFAULT
 	release
 	end
 
@@ -164,22 +164,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159588:: @ 8159588
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159592:: @ 8159592
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, MSGBOX_DEFAULT
 	release
 	end
 
@@ -196,7 +196,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, MSGBOX_DEFAULT
 	release
 	end
 
@@ -204,22 +204,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF:: @ 81595FF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159609:: @ 8159609
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -236,7 +236,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, MSGBOX_DEFAULT
 	release
 	end
 
@@ -244,22 +244,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159676:: @ 8159676
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159680:: @ 8159680
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, MSGBOX_DEFAULT
 	release
 	end
 
@@ -276,7 +276,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, MSGBOX_DEFAULT
 	release
 	end
 
@@ -284,22 +284,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED:: @ 81596ED
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7:: @ 81596F7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -314,7 +314,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, MSGBOX_DEFAULT
 	release
 	end
 
@@ -322,17 +322,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159759:: @ 8159759
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, MSGBOX_DEFAULT
 	release
 	end
 
@@ -347,7 +347,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, MSGBOX_DEFAULT
 	release
 	end
 
@@ -355,17 +355,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB:: @ 81597BB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -380,7 +380,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, MSGBOX_DEFAULT
 	release
 	end
 
@@ -388,17 +388,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15981D:: @ 815981D
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, MSGBOX_DEFAULT
 	release
 	end
 
@@ -413,7 +413,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 7
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, MSGBOX_DEFAULT
 	release
 	end
 
@@ -421,16 +421,16 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865
 	specialvar VAR_RESULT, GetNumMovedLilycoveFanClubMembers
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15987F:: @ 815987F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, MSGBOX_DEFAULT
 	release
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, 4
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/LinkContestRoom1/scripts.inc b/data/maps/LinkContestRoom1/scripts.inc
index 870eeb331..df95d1e41 100644
--- a/data/maps/LinkContestRoom1/scripts.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
@@ -1,8 +1,8 @@
 LinkContestRoom1_MapScripts:: @ 815F580
-	map_script 4, LinkContestRoom1_MapScript2_15F610
-	map_script 2, LinkContestRoom1_MapScript2_15F606
-	map_script 3, LinkContestRoom1_MapScript1_15F595
-	map_script 5, LinkContestRoom1_MapScript1_15F5F4
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LinkContestRoom1_MapScript2_15F610
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LinkContestRoom1_MapScript2_15F606
+	map_script MAP_SCRIPT_ON_TRANSITION, LinkContestRoom1_MapScript1_15F595
+	map_script MAP_SCRIPT_ON_RESUME, LinkContestRoom1_MapScript1_15F5F4
 	.byte 0
 
 LinkContestRoom1_MapScript1_15F595:: @ 815F595
@@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A
 	end
 
 LinkContestRoom1_EventScript_15F625:: @ 815F625
-	hideobjectat 255, MAP_LITTLEROOT_TOWN
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	call LinkContestRoom1_EventScript_15F919
 	end
 
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index d0b82f8ef..7b45aa651 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -1,6 +1,6 @@
 LittlerootTown_MapScripts:: @ 814D509
-	map_script 3, LittlerootTown_MapScript1_14D514
-	map_script 2, LittlerootTown_MapScript2_14D5D5
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MapScript1_14D514
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MapScript2_14D5D5
 	.byte 0
 
 LittlerootTown_MapScript1_14D514:: @ 814D514
@@ -99,7 +99,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D
 LittlerootTown_EventScript_14D62B:: @ 814D62B
 	delay 15
 	playse SE_DANSA
-	applymovement 255, LittlerootTown_Movement_14D6C0
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6C0
 	waitmovement 0
 	opendoor VAR_0x8004, VAR_0x8005
 	waitdooranim
@@ -111,19 +111,19 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 	delay 10
 	applymovement 4, LittlerootTown_Movement_14D6AE
 	waitmovement 0
-	msgbox LittlerootTown_Text_16A7C9, 4
+	msgbox LittlerootTown_Text_16A7C9, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, LittlerootTown_Movement_14D6B1
-	applymovement 255, LittlerootTown_Movement_14D6B8
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6B8
 	waitmovement 0
 	opendoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	applymovement 4, LittlerootTown_Movement_14D6B5
-	applymovement 255, LittlerootTown_Movement_14D6BD
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D6BD
 	waitmovement 0
 	setflag FLAG_HIDE_MOM_LITTLEROOT
 	setvar VAR_LITTLEROOT_INTRO_STATE, 3
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
@@ -132,42 +132,42 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 
 LittlerootTown_Movement_14D6AC:: @ 814D6AC
 	walk_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6AE:: @ 814D6AE
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6B1:: @ 814D6B1
 	delay_16
 	delay_8
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6B5:: @ 814D6B5
 	walk_up
 	set_invisible
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6B8:: @ 814D6B8
 	delay_16
 	delay_8
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6BD:: @ 814D6BD
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D6C0:: @ 814D6C0
 	jump_right
 	delay_16
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 LittlerootTown_EventScript_14D6C5:: @ 814D6C5
 	lockall
@@ -176,11 +176,11 @@ LittlerootTown_EventScript_14D6C5:: @ 814D6C5
 	end
 
 LittlerootTown_EventScript_14D6CD:: @ 814D6CD
-	msgbox LittlerootTown_Text_16AC00, 2
+	msgbox LittlerootTown_Text_16AC00, MSGBOX_NPC
 	end
 
 LittlerootTown_EventScript_14D6D6:: @ 814D6D6
-	msgbox LittlerootTown_Text_16AC56, 2
+	msgbox LittlerootTown_Text_16AC56, MSGBOX_NPC
 	end
 
 LittlerootTown_EventScript_14D6DF:: @ 814D6DF
@@ -190,14 +190,14 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
 	compare VAR_LITTLEROOT_STATE, 0
 	goto_if_ne LittlerootTown_EventScript_14D708
-	msgbox LittlerootTown_Text_16ACEB, 4
+	msgbox LittlerootTown_Text_16ACEB, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_EventScript_14D708:: @ 814D708
-	msgbox LittlerootTown_Text_16AD82, 4
+	msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_LITTLEROOT_STATE, 2
 	release
@@ -205,12 +205,12 @@ LittlerootTown_EventScript_14D708:: @ 814D708
 
 LittlerootTown_EventScript_14D722:: @ 814D722
 	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_16ADF2, 4
+	msgbox LittlerootTown_Text_16ADF2, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_EventScript_14D72F:: @ 814D72F
-	msgbox LittlerootTown_Text_16AE25, 4
+	msgbox LittlerootTown_Text_16AE25, MSGBOX_DEFAULT
 	release
 	end
 
@@ -225,12 +225,12 @@ LittlerootTown_EventScript_14D739:: @ 814D739
 	end
 
 LittlerootTown_EventScript_14D755:: @ 814D755
-	msgbox LittlerootTown_Text_16ACEB, 4
+	msgbox LittlerootTown_Text_16ACEB, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, LittlerootTown_Movement_14D787
-	applymovement 255, LittlerootTown_Movement_14D793
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_14D793
 	waitmovement 0
-	msgbox LittlerootTown_Text_16AD3C, 4
+	msgbox LittlerootTown_Text_16AD3C, MSGBOX_DEFAULT
 	closemessage
 	return
 
@@ -248,11 +248,11 @@ LittlerootTown_Movement_14D779:: @ 814D779
 	walk_fast_up
 	walk_fast_left
 	face_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D787:: @ 814D787
 	walk_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D789:: @ 814D789
 	walk_right
@@ -264,13 +264,13 @@ LittlerootTown_Movement_14D789:: @ 814D789
 	walk_left
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D793:: @ 814D793
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
-	end_movement
+	step_end
 
 LittlerootTown_EventScript_14D797:: @ 814D797
 	lockall
@@ -295,7 +295,7 @@ LittlerootTown_Movement_14D7B3:: @ 814D7B3
 	walk_fast_up
 	walk_fast_right
 	face_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14D7C0:: @ 814D7C0
 	walk_left
@@ -304,28 +304,28 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LittlerootTown_EventScript_14D7C7:: @ 814D7C7
 	lockall
-	applymovement 1, LittlerootTown_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 255, LittlerootTown_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_Text_16AD82, 4
+	msgbox LittlerootTown_Text_16AD82, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setvar VAR_LITTLEROOT_STATE, 2
 	releaseall
 	end
 
 LittlerootTown_EventScript_14D7F6:: @ 814D7F6
-	msgbox LittlerootTown_Text_16AE50, 3
+	msgbox LittlerootTown_Text_16AE50, MSGBOX_SIGN
 	end
 
 LittlerootTown_EventScript_14D7FF:: @ 814D7FF
-	msgbox LittlerootTown_Text_16AE87, 3
+	msgbox LittlerootTown_Text_16AE87, MSGBOX_SIGN
 	end
 
 LittlerootTown_EventScript_14D808:: @ 814D808
@@ -339,11 +339,11 @@ LittlerootTown_EventScript_14D808:: @ 814D808
 	end
 
 LittlerootTown_EventScript_14D822:: @ 814D822
-	msgbox LittlerootTown_Text_16AEA1, 4
+	msgbox LittlerootTown_Text_16AEA1, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_EventScript_14D82B:: @ 814D82B
-	msgbox LittlerootTown_Text_16AEAC, 4
+	msgbox LittlerootTown_Text_16AEAC, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_EventScript_14D834:: @ 814D834
@@ -357,11 +357,11 @@ LittlerootTown_EventScript_14D834:: @ 814D834
 	end
 
 LittlerootTown_EventScript_14D84E:: @ 814D84E
-	msgbox LittlerootTown_Text_16AEAC, 4
+	msgbox LittlerootTown_Text_16AEAC, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_EventScript_14D857:: @ 814D857
-	msgbox LittlerootTown_Text_16AEA1, 4
+	msgbox LittlerootTown_Text_16AEA1, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_EventScript_14D860:: @ 814D860
@@ -413,7 +413,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6
 	call_if_eq LittlerootTown_EventScript_14D926
 	compare VAR_RESULT, 1
 	call_if_eq LittlerootTown_EventScript_14D931
-	msgbox LittlerootTown_Text_16A8EE, 4
+	msgbox LittlerootTown_Text_16A8EE, MSGBOX_DEFAULT
 	closemessage
 	checkplayergender
 	compare VAR_RESULT, 0
@@ -440,12 +440,12 @@ LittlerootTown_EventScript_14D931:: @ 814D931
 	return
 
 LittlerootTown_EventScript_14D93C:: @ 814D93C
-	applymovement 4, LittlerootTown_Movement_1A0843
+	applymovement 4, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14D947:: @ 814D947
-	applymovement 4, LittlerootTown_Movement_1A083F
+	applymovement 4, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -480,70 +480,70 @@ LittlerootTown_EventScript_14D995:: @ 814D995
 	return
 
 LittlerootTown_EventScript_14D9D8:: @ 814D9D8
-	applymovement 255, LittlerootTown_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC76
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14D9ED:: @ 814D9ED
-	applymovement 255, LittlerootTown_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC7D
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA02:: @ 814DA02
-	applymovement 255, LittlerootTown_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC84
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA17:: @ 814DA17
-	applymovement 255, LittlerootTown_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC89
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA2C:: @ 814DA2C
-	applymovement 255, LittlerootTown_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC8F
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA41:: @ 814DA41
-	applymovement 255, LittlerootTown_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC92
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA56:: @ 814DA56
-	applymovement 255, LittlerootTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC96
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA6B:: @ 814DA6B
-	applymovement 255, LittlerootTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC9A
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA80:: @ 814DA80
-	applymovement 255, LittlerootTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DC9D
 	waitmovement 0
 	return
 
 LittlerootTown_EventScript_14DA95:: @ 814DA95
-	applymovement 255, LittlerootTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, LittlerootTown_Movement_14DCA3
 	waitmovement 0
@@ -692,7 +692,7 @@ LittlerootTown_Movement_14DC76:: @ 814DC76
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC7D:: @ 814DC7D
 	walk_up
@@ -701,14 +701,14 @@ LittlerootTown_Movement_14DC7D:: @ 814DC7D
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC84:: @ 814DC84
 	walk_right
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC89:: @ 814DC89
 	walk_right
@@ -716,29 +716,29 @@ LittlerootTown_Movement_14DC89:: @ 814DC89
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC8F:: @ 814DC8F
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC92:: @ 814DC92
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC96:: @ 814DC96
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC9A:: @ 814DC9A
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DC9D:: @ 814DC9D
 	walk_left
@@ -746,14 +746,14 @@ LittlerootTown_Movement_14DC9D:: @ 814DC9D
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCA3:: @ 814DCA3
 	walk_left
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCA8:: @ 814DCA8
 	walk_down
@@ -761,7 +761,7 @@ LittlerootTown_Movement_14DCA8:: @ 814DCA8
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCAE:: @ 814DCAE
 	walk_down
@@ -769,7 +769,7 @@ LittlerootTown_Movement_14DCAE:: @ 814DCAE
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCB4:: @ 814DCB4
 	walk_left
@@ -777,7 +777,7 @@ LittlerootTown_Movement_14DCB4:: @ 814DCB4
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCBA:: @ 814DCBA
 	walk_left
@@ -786,33 +786,33 @@ LittlerootTown_Movement_14DCBA:: @ 814DCBA
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCC1:: @ 814DCC1
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCC5:: @ 814DCC5
 	walk_left
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCCA:: @ 814DCCA
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCCF:: @ 814DCCF
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCD3:: @ 814DCD3
 	walk_right
@@ -821,7 +821,7 @@ LittlerootTown_Movement_14DCD3:: @ 814DCD3
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCDA:: @ 814DCDA
 	walk_right
@@ -829,11 +829,11 @@ LittlerootTown_Movement_14DCDA:: @ 814DCDA
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LittlerootTown_Movement_14DCE0:: @ 814DCE0
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 	lock
@@ -844,7 +844,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2
 	compare VAR_RESULT, 1
 	call_if_eq LittlerootTown_EventScript_14D931
 	call LittlerootTown_EventScript_14DD38
-	applymovement 4, LittlerootTown_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
 	waitdooranim
@@ -864,14 +864,14 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B
 	end
 
 LittlerootTown_EventScript_14DD38:: @ 814DD38
-	msgbox LittlerootTown_Text_16A8FD, 4
+	msgbox LittlerootTown_Text_16A8FD, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
 	message LittlerootTown_Text_16AA32
 	waitfanfare
 	waitmessage
 	setflag FLAG_RECEIVED_RUNNING_SHOES
-	msgbox LittlerootTown_Text_16AA5C, 4
-	msgbox LittlerootTown_Text_16AB10, 4
+	msgbox LittlerootTown_Text_16AA5C, MSGBOX_DEFAULT
+	msgbox LittlerootTown_Text_16AB10, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	return
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index b712826f3..e3073b374 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -1,7 +1,7 @@
 LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
-	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B
-	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A
-	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_MapScript1_15264B
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_MapScript1_15268A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0
 	.byte 0
 
 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
@@ -59,9 +59,9 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0
 
 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
 	lockall
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172574, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_152720
 	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720
 	waitmovement 0
 	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
@@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
 
 LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722
 	lockall
@@ -90,15 +90,15 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733
 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782
 	waitmovement 0
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
 	setvar VAR_LITTLEROOT_HOUSES_STATE, 2
 	releaseall
@@ -111,13 +111,13 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 0
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7
 	end
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 932334f02..bac89c25e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -1,14 +1,14 @@
 LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4
-	map_script 3, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF
-	map_script 4, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_MapScript1_1527AF
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_MapScript2_1527DA
 	.byte 0
 
 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF
 	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950
-	call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D
-	setvar VAR_0x4089, 0
+	call SecretBase_EventScript_SetDecorationFlags
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE
@@ -17,13 +17,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE
 	return
 
 LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA
-	map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4
 	.2byte 0
 
 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4
 	checkplayergender
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68
+	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
 @ 81527F1
@@ -36,12 +36,12 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_15280A:: @ 815280A
-	msgbox UnknownString_8172F31, 4
+	msgbox UnknownString_8172F31, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152814:: @ 8152814
-	msgbox UnknownString_8173A76, 4
+	msgbox UnknownString_8173A76, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837
 	setvar VAR_0x8004, 1
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, MSGBOX_DEFAULT
 	special BedroomPC
 	waitstate
 	releaseall
@@ -74,16 +74,16 @@ gBrendanHouse_TurnPCOff:: @ 8152850
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_15285D:: @ 815285D
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1A100C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152867:: @ 8152867
 LittlerootTown_MaysHouse_2F_EventScript_152867:: @ 8152867
-	msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, 3
+	msgbox LittlerootTown_BrendansHouse_2F_Text_172F9A, MSGBOX_SIGN
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152870:: @ 8152870
 LittlerootTown_MaysHouse_2F_EventScript_152870:: @ 8152870
-	msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, 3
+	msgbox LittlerootTown_BrendansHouse_2F_Text_17306C, MSGBOX_SIGN
 	end
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
index a2dce3b4e..8ef358560 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
@@ -28,7 +28,7 @@ LittlerootTown_BrendansHouse_2F_Text_172F9A:: @ 8172F9A
 	.string "Record your progress with SAVE.\p"
 	.string "The remaining pages are blank...$"
 
-UnknownString_817303D: @ 817303D
+Text_LookCloserAtMap: @ 817303D
 	.string "{PLAYER} took a closer look at the\n"
 	.string "HOENN region map.$"
 
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index 587695bcc..59add7384 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -1,7 +1,7 @@
 LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
-	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_152889
-	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1528C8
-	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_15290E
+	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_MapScript1_152889
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_MapScript1_1528C8
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_MapScript2_15290E
 	.byte 0
 
 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
@@ -59,9 +59,9 @@ LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E
 
 LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
 	lockall
-	msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4
+	msgbox LittlerootTown_MaysHouse_1F_Text_172574, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_15295E
 	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E
 	waitmovement 0
 	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
@@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
 
 LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960
 	lockall
@@ -90,15 +90,15 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971
 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
 	lockall
 	playse SE_PIN
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0
 	waitmovement 0
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
+	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, MSGBOX_DEFAULT
 	setflag FLAG_MET_RIVAL_MOM
 	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
 	releaseall
@@ -111,7 +111,7 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 @ 81529C7
 	lockall
@@ -127,7 +127,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
@@ -139,22 +139,22 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
 	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152A17:: @ 8152A17
-	msgbox LittlerootTown_BrendansHouse_1F_Text_173262, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_173262, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152A21:: @ 8152A21
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, MSGBOX_DEFAULT
 	release
 	end
 
@@ -162,7 +162,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35
 	lockall
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	applymovement VAR_0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7
 	end
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index 628f3b18e..660f68e5e 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -1,14 +1,14 @@
 LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
-	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
-	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_MapScript2_152A86
 	.byte 0
 
 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
 	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
 	compare VAR_LITTLEROOT_INTRO_STATE, 4
 	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
-	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
-	setvar VAR_0x4089, 0
+	call SecretBase_EventScript_SetDecorationFlags
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
 LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
@@ -17,13 +17,13 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
 	return
 
 LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
-	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
+	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
 	.2byte 0
 
 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
 	checkplayergender
 	compare VAR_RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68
+	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
@@ -45,15 +45,15 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
-	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, MSGBOX_DEFAULT
 	playbgm MUS_GIRL_SUP, TRUE
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
@@ -79,15 +79,15 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, MSGBOX_DEFAULT
 	playbgm MUS_BOY_SUP, TRUE
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 4
 	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
@@ -108,7 +108,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
-	applymovement VAR_LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, 0
@@ -121,20 +121,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
 	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
 	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
@@ -148,7 +148,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
 	walk_left
@@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
 	walk_left
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
 	walk_down
@@ -172,7 +172,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
 	walk_right
@@ -183,7 +183,7 @@ LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
 	walk_right
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 gUnknown_08152C39:: @ 8152C39
 
@@ -197,7 +197,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
 	end
 
 LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -205,7 +205,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
 	setvar VAR_0x8004, 2
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, MSGBOX_DEFAULT
 	special BedroomPC
 	waitstate
 	releaseall
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index 620cddd0b..15267ec8a 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -1,12 +1,12 @@
 LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
-	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
-	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
-	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
+	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
 	.byte 0
 
 LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
+	call Common_EventScript_SetupRivalGfxId
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
@@ -14,7 +14,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
 	.2byte 0
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
@@ -38,7 +38,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
 	setvar VAR_0x8004, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
+	call Common_EventScript_NameReceivedPartyMon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
 	end
 
@@ -51,7 +51,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_BOY_ROUTE101
 	setvar VAR_BIRCH_LAB_STATE, 3
 	releaseall
@@ -67,7 +67,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
 	lockall
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
 	waitmovement 0
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA
 	end
@@ -80,7 +80,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	lock
@@ -88,38 +88,38 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
 	compare VAR_BIRCH_LAB_STATE, 3
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
 	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, MSGBOX_DEFAULT
 	setflag FLAG_BIRCH_AIDE_MET
 	release
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
 	lock
 	faceplayer
-	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
+	goto_if_unset FLAG_UNKNOWN_BIRCH_380, ProfBirch_EventScript_AskRatePokedex
 	compare VAR_BIRCH_LAB_STATE, 5
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, MSGBOX_DEFAULT
 	call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, MSGBOX_DEFAULT
 	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97
 	waitmovement 0
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	checkplayergender
 	compare VAR_RESULT, 0
@@ -135,20 +135,20 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
-	giveitem_std ITEM_POKE_BALL, 5
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, MSGBOX_DEFAULT
+	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, 0
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
-	giveitem_std ITEM_POKE_BALL, 5
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, MSGBOX_DEFAULT
+	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, 0
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 1
 	return
 
@@ -161,25 +161,25 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, MSGBOX_SIGN
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
@@ -194,21 +194,21 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, MSGBOX_DEFAULT
 	return
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, MSGBOX_SIGN
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, MSGBOX_SIGN
 	end
 
 LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, MSGBOX_SIGN
 	end
diff --git a/data/maps/MagmaHideout_B1F/map.json b/data/maps/MagmaHideout_B1F/map.json
index c3b75214a..6219a75db 100644
--- a/data/maps/MagmaHideout_B1F/map.json
+++ b/data/maps/MagmaHideout_B1F/map.json
@@ -86,7 +86,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_B1F_EventScript_1A04FD",
+      "script": "Hideout_B1F_EventScript_Electrode1",
       "flag": "FLAG_HIDE_ELECTRODE_1_HIDEOUT"
     },
     {
@@ -112,7 +112,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MagmaHideout_B1F_EventScript_1A051B",
+      "script": "Hideout_B1F_EventScript_Electrode2",
       "flag": "FLAG_HIDE_ELECTRODE_2_HIDEOUT"
     }
   ],
diff --git a/data/maps/MagmaHideout_B1F/scripts.inc b/data/maps/MagmaHideout_B1F/scripts.inc
index 89eb5ab98..e267683c8 100644
--- a/data/maps/MagmaHideout_B1F/scripts.inc
+++ b/data/maps/MagmaHideout_B1F/scripts.inc
@@ -1,5 +1,5 @@
 MagmaHideout_B1F_MapScripts:: @ 815F2A8
-	map_script 5, MagmaHideout_B1F_MapScript1_15F2AE
+	map_script MAP_SCRIPT_ON_RESUME, MagmaHideout_B1F_MapScript1_15F2AE
 	.byte 0
 
 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE
diff --git a/data/maps/MauvilleCity/map.json b/data/maps/MauvilleCity/map.json
index 18e4963fa..fa745647e 100644
--- a/data/maps/MauvilleCity/map.json
+++ b/data/maps/MauvilleCity/map.json
@@ -209,7 +209,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -225,7 +225,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -233,7 +233,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -241,7 +241,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MauvilleCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index c3c6834e4..efbb52755 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -1,5 +1,5 @@
 MauvilleCity_MapScripts:: @ 814C032
-	map_script 3, MauvilleCity_MapScript1_14C038
+	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_MapScript1_14C038
 	.byte 0
 
 MauvilleCity_MapScript1_14C038:: @ 814C038
@@ -17,48 +17,48 @@ MauvilleCity_EventScript_14C053:: @ 814C053
 	return
 
 MauvilleCity_EventScript_14C05A:: @ 814C05A
-	msgbox MauvilleCity_Text_1664DF, 2
+	msgbox MauvilleCity_Text_1664DF, MSGBOX_NPC
 	end
 
 MauvilleCity_EventScript_14C063:: @ 814C063
-	msgbox MauvilleCity_Text_16655C, 2
+	msgbox MauvilleCity_Text_16655C, MSGBOX_NPC
 	end
 
 MauvilleCity_EventScript_14C06C:: @ 814C06C
-	msgbox MauvilleCity_Text_1665DB, 2
+	msgbox MauvilleCity_Text_1665DB, MSGBOX_NPC
 	end
 
 MauvilleCity_EventScript_14C075:: @ 814C075
-	msgbox MauvilleCity_Text_16662A, 2
+	msgbox MauvilleCity_Text_16662A, MSGBOX_NPC
 	end
 
 MauvilleCity_EventScript_14C07E:: @ 814C07E
-	msgbox MauvilleCity_Text_166665, 3
+	msgbox MauvilleCity_Text_166665, MSGBOX_SIGN
 	end
 
 MauvilleCity_EventScript_14C087:: @ 814C087
-	msgbox MauvilleCity_Text_166697, 3
+	msgbox MauvilleCity_Text_166697, MSGBOX_SIGN
 	end
 
 MauvilleCity_EventScript_14C090:: @ 814C090
-	msgbox MauvilleCity_Text_1666E4, 3
+	msgbox MauvilleCity_Text_1666E4, MSGBOX_SIGN
 	end
 
 MauvilleCity_EventScript_14C099:: @ 814C099
-	msgbox MauvilleCity_Text_16671C, 3
+	msgbox MauvilleCity_Text_16671C, MSGBOX_SIGN
 	end
 
 MauvilleCity_EventScript_14C0A2:: @ 814C0A2
 	lock
 	faceplayer
 	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA
-	msgbox MauvilleCity_Text_16674A, 4
+	msgbox MauvilleCity_Text_16674A, MSGBOX_DEFAULT
 	setflag FLAG_TV_EXPLAINED
 	release
 	end
 
 MauvilleCity_EventScript_14C0BA:: @ 814C0BA
-	msgbox MauvilleCity_Text_166879, 4
+	msgbox MauvilleCity_Text_166879, MSGBOX_DEFAULT
 	release
 	end
 
@@ -66,17 +66,17 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 	lock
 	faceplayer
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4
-	msgbox MauvilleCity_Text_165B76, 4
+	msgbox MauvilleCity_Text_165B76, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_1A083D
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 MauvilleCity_EventScript_14C0E4:: @ 814C0E4
-	msgbox MauvilleCity_Text_165E45, 4
+	msgbox MauvilleCity_Text_165E45, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, MauvilleCity_Movement_1A083D
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -84,17 +84,17 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4
 MauvilleCity_EventScript_14C0F9:: @ 814C0F9
 	lockall
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292
-	applymovement 6, MauvilleCity_Movement_1A0843
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_165BE3, 4
-	msgbox MauvilleCity_Text_165C57, 4
-	msgbox MauvilleCity_Text_165D01, 4
-	applymovement 6, MauvilleCity_Movement_1A0839
+	msgbox MauvilleCity_Text_165BE3, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_165C57, MSGBOX_DEFAULT
+	msgbox MauvilleCity_Text_165D01, MSGBOX_DEFAULT
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 6, MauvilleCity_Movement_1A0833
+	applymovement 6, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0835
+	applymovement 6, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_14C154
@@ -115,14 +115,14 @@ MauvilleCity_EventScript_14C187:: @ 814C187
 	applymovement 6, MauvilleCity_Movement_14C2AA
 	applymovement 7, MauvilleCity_Movement_14C2CC
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0843
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement 7, MauvilleCity_Movement_14C2D8
 	waitmovement 0
-	applymovement 255, MauvilleCity_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MauvilleCity_Text_1660FA, 4
+	msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, MauvilleCity_Movement_14C2B6
 	applymovement 7, MauvilleCity_Movement_14C2DF
@@ -134,14 +134,14 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9
 	applymovement 6, MauvilleCity_Movement_14C2B0
 	applymovement 7, MauvilleCity_Movement_14C2D2
 	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0843
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
 	applymovement 7, MauvilleCity_Movement_14C2DC
 	waitmovement 0
-	applymovement 255, MauvilleCity_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MauvilleCity_Text_1660FA, 4
+	msgbox MauvilleCity_Text_1660FA, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, MauvilleCity_Movement_14C2C1
 	applymovement 7, MauvilleCity_Movement_14C2E8
@@ -159,27 +159,27 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B
 	end
 
 MauvilleCity_EventScript_14C23C:: @ 814C23C
-	msgbox MauvilleCity_Text_165F0D, 4
-	trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38
-	applymovement 6, MauvilleCity_Movement_1A0843
+	msgbox MauvilleCity_Text_165F0D, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_165F38
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_165F85, 4
-	applymovement 6, MauvilleCity_Movement_1A0839
+	msgbox MauvilleCity_Text_165F85, MSGBOX_DEFAULT
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox MauvilleCity_Text_165FB3, 4
-	applymovement 6, MauvilleCity_Movement_1A0843
+	msgbox MauvilleCity_Text_165FB3, MSGBOX_DEFAULT
+	applymovement 6, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox MauvilleCity_Text_166050, 4
+	msgbox MauvilleCity_Text_166050, MSGBOX_DEFAULT
 	return
 
 MauvilleCity_EventScript_14C285:: @ 814C285
 	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
-	msgbox MauvilleCity_Text_165DE8, 4
+	msgbox MauvilleCity_Text_165DE8, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_EventScript_14C292:: @ 814C292
-	applymovement 6, MauvilleCity_Movement_1A0839
+	applymovement 6, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_14C154
@@ -191,7 +191,7 @@ MauvilleCity_Movement_14C2AA:: @ 814C2AA
 	walk_down
 	walk_down
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2B0:: @ 814C2B0
 	walk_down
@@ -199,7 +199,7 @@ MauvilleCity_Movement_14C2B0:: @ 814C2B0
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2B6:: @ 814C2B6
 	delay_16
@@ -212,7 +212,7 @@ MauvilleCity_Movement_14C2B6:: @ 814C2B6
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2C1:: @ 814C2C1
 	delay_16
@@ -225,7 +225,7 @@ MauvilleCity_Movement_14C2C1:: @ 814C2C1
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2CC:: @ 814C2CC
 	walk_left
@@ -233,7 +233,7 @@ MauvilleCity_Movement_14C2CC:: @ 814C2CC
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2D2:: @ 814C2D2
 	walk_left
@@ -241,18 +241,18 @@ MauvilleCity_Movement_14C2D2:: @ 814C2D2
 	walk_down
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2D8:: @ 814C2D8
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2DC:: @ 814C2DC
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2DF:: @ 814C2DF
 	walk_left
@@ -263,7 +263,7 @@ MauvilleCity_Movement_14C2DF:: @ 814C2DF
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_Movement_14C2E8:: @ 814C2E8
 	walk_down
@@ -275,7 +275,7 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	lock
@@ -284,29 +284,29 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_EventScript_14C33C
 	goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332
-	msgbox MauvilleCity_Text_1661C1, 4
-	giveitem_std ITEM_BASEMENT_KEY
+	msgbox MauvilleCity_Text_1661C1, MSGBOX_DEFAULT
+	giveitem ITEM_BASEMENT_KEY
 	setflag FLAG_RECEIVED_BASEMENT_KEY
-	msgbox MauvilleCity_Text_166331, 4
+	msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_EventScript_14C332:: @ 814C332
-	msgbox MauvilleCity_Text_166331, 4
+	msgbox MauvilleCity_Text_166331, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_EventScript_14C33C:: @ 814C33C
-	msgbox MauvilleCity_Text_1663EB, 4
-	giveitem_std ITEM_TM24_THUNDERBOLT
+	msgbox MauvilleCity_Text_1663EB, MSGBOX_DEFAULT
+	giveitem ITEM_TM24_THUNDERBOLT
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM24
-	msgbox MauvilleCity_Text_166488, 4
+	msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_EventScript_14C368:: @ 814C368
-	msgbox MauvilleCity_Text_166488, 4
+	msgbox MauvilleCity_Text_166488, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index c0dd433a3..4dd54a000 100644
--- a/data/maps/MauvilleCity_BikeShop/scripts.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
@@ -6,7 +6,7 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796
 	faceplayer
 	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E
 	goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1
-	msgbox MauvilleCity_BikeShop_Text_180F9F, 4
+	msgbox MauvilleCity_BikeShop_Text_180F9F, MSGBOX_DEFAULT
 	msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_BikeShop_EventScript_156824
@@ -33,7 +33,7 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0
 
 MauvilleCity_BikeShop_EventScript_156817:: @ 8156817
 	setflag FLAG_DECLINED_BIKE
-	msgbox MauvilleCity_BikeShop_Text_181067, 4
+	msgbox MauvilleCity_BikeShop_Text_181067, MSGBOX_DEFAULT
 	release
 	end
 
@@ -43,19 +43,19 @@ MauvilleCity_BikeShop_EventScript_156824:: @ 8156824
 	end
 
 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D
-	msgbox MauvilleCity_BikeShop_Text_181332, 4
-	giveitem_std ITEM_MACH_BIKE
+	msgbox MauvilleCity_BikeShop_Text_181332, MSGBOX_DEFAULT
+	giveitem ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_156847:: @ 8156847
-	msgbox MauvilleCity_BikeShop_Text_18134A, 4
-	giveitem_std ITEM_ACRO_BIKE
+	msgbox MauvilleCity_BikeShop_Text_18134A, MSGBOX_DEFAULT
+	giveitem ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_156861:: @ 8156861
-	msgbox MauvilleCity_BikeShop_Text_181362, 4
+	msgbox MauvilleCity_BikeShop_Text_181362, MSGBOX_DEFAULT
 	special SwapRegisteredBike
 	release
 	end
@@ -69,40 +69,40 @@ MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E
 	end
 
 MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D
-	msgbox MauvilleCity_BikeShop_Text_1813D4, 4
+	msgbox MauvilleCity_BikeShop_Text_1813D4, MSGBOX_DEFAULT
 	checkitem ITEM_ACRO_BIKE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9
 	checkitem ITEM_MACH_BIKE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA
-	msgbox MauvilleCity_BikeShop_Text_181498, 4
+	msgbox MauvilleCity_BikeShop_Text_181498, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF
-	msgbox MauvilleCity_BikeShop_Text_181469, 4
+	msgbox MauvilleCity_BikeShop_Text_181469, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9
 	incrementgamestat GAME_STAT_TRADED_BIKES
-	msgbox MauvilleCity_BikeShop_Text_181439, 4
-	takeitem ITEM_ACRO_BIKE, 1
-	giveitem_std ITEM_MACH_BIKE
+	msgbox MauvilleCity_BikeShop_Text_181439, MSGBOX_DEFAULT
+	removeitem ITEM_ACRO_BIKE
+	giveitem ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA
 	incrementgamestat GAME_STAT_TRADED_BIKES
-	msgbox MauvilleCity_BikeShop_Text_181408, 4
-	takeitem ITEM_MACH_BIKE, 1
-	giveitem_std ITEM_ACRO_BIKE
+	msgbox MauvilleCity_BikeShop_Text_181408, MSGBOX_DEFAULT
+	removeitem ITEM_MACH_BIKE
+	giveitem ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_156861
 	end
 
 MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B
-	msgbox MauvilleCity_BikeShop_Text_181568, 2
+	msgbox MauvilleCity_BikeShop_Text_181568, MSGBOX_NPC
 	end
 
 MauvilleCity_BikeShop_EventScript_156914:: @ 8156914
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 8026e3b08..3e439332f 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -4,7 +4,7 @@ MauvilleCity_GameCorner_MapScripts:: @ 8156A33
 MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_181C35, 4
+	msgbox MauvilleCity_GameCorner_Text_181C35, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B32
@@ -35,16 +35,16 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9950
 	goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C
-	checkmoney 0x3e8, 0
+	checkmoney 1000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
-	givecoins 50
-	takemoney 0x3e8, 0
+	addcoins 50
+	removemoney 1000, 0
 	updatemoneybox 0, 0
 	nop
 	updatecoinsbox 0, 5
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181CFE, 4
+	msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
@@ -54,42 +54,42 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 9500
 	goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C
-	checkmoney 0x2710, 0
+	checkmoney 10000, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
-	givecoins 500
-	takemoney 0x2710, 0
+	addcoins 500
+	removemoney 10000, 0
 	updatemoneybox 0, 0
 	nop
 	updatecoinsbox 0, 5
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181CFE, 4
+	msgbox MauvilleCity_GameCorner_Text_181CFE, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32
-	msgbox MauvilleCity_GameCorner_Text_181C53, 4
+	msgbox MauvilleCity_GameCorner_Text_181C53, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C
-	msgbox MauvilleCity_GameCorner_Text_181D28, 4
+	msgbox MauvilleCity_GameCorner_Text_181D28, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C
-	msgbox MauvilleCity_GameCorner_Text_181D73, 4
+	msgbox MauvilleCity_GameCorner_Text_181D73, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C
-	msgbox MauvilleCity_GameCorner_Text_181D57, 4
+	msgbox MauvilleCity_GameCorner_Text_181D57, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	hidecoinsbox 0, 5
 	release
@@ -98,7 +98,7 @@ MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C
 MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_181DE1, 4
+	msgbox MauvilleCity_GameCorner_Text_181DE1, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B88
@@ -160,11 +160,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46
 	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
-	takecoins 1000
-	givedecoration DECOR_TREECKO_DOLL
+	removecoins 1000
+	adddecoration DECOR_TREECKO_DOLL
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181E49, 4
+	msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156B9B
 	end
 
@@ -176,11 +176,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80
 	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
-	takecoins 1000
-	givedecoration DECOR_TORCHIC_DOLL
+	removecoins 1000
+	adddecoration DECOR_TORCHIC_DOLL
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181E49, 4
+	msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156B9B
 	end
 
@@ -192,26 +192,26 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA
 	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D02
-	takecoins 1000
-	givedecoration DECOR_MUDKIP_DOLL
+	removecoins 1000
+	adddecoration DECOR_MUDKIP_DOLL
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181E49, 4
+	msgbox MauvilleCity_GameCorner_Text_181E49, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156B9B
 	end
 
 MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4
-	msgbox MauvilleCity_GameCorner_Text_181E76, 4
+	msgbox MauvilleCity_GameCorner_Text_181E76, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156B9B
 	end
 
 MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02
-	call MauvilleCity_GameCorner_EventScript_1A02B8
+	call Common_EventScript_NoRoomForDecor
 	goto MauvilleCity_GameCorner_EventScript_156B9B
 	end
 
 MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D
-	msgbox MauvilleCity_GameCorner_Text_181EC2, 4
+	msgbox MauvilleCity_GameCorner_Text_181EC2, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
@@ -219,7 +219,7 @@ MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D
 MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_181DE1, 4
+	msgbox MauvilleCity_GameCorner_Text_181DE1, MSGBOX_DEFAULT
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156D36
@@ -294,11 +294,11 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C
 	checkitemspace ITEM_TM32_DOUBLE_TEAM, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
-	takecoins 1500
-	giveitem ITEM_TM32_DOUBLE_TEAM, 1
+	removecoins 1500
+	additem ITEM_TM32_DOUBLE_TEAM
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181F08, 4
+	msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
@@ -309,11 +309,11 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76
 	checkitemspace ITEM_TM29_PSYCHIC, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
-	takecoins 3500
-	giveitem ITEM_TM29_PSYCHIC, 1
+	removecoins 3500
+	additem ITEM_TM29_PSYCHIC
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181F08, 4
+	msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
@@ -324,11 +324,11 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0
 	checkitemspace ITEM_TM35_FLAMETHROWER, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
-	takecoins 4000
-	giveitem ITEM_TM35_FLAMETHROWER, 1
+	removecoins 4000
+	additem ITEM_TM35_FLAMETHROWER
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181F08, 4
+	msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
@@ -339,11 +339,11 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA
 	checkitemspace ITEM_TM24_THUNDERBOLT, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
-	takecoins 4000
-	giveitem ITEM_TM24_THUNDERBOLT, 1
+	removecoins 4000
+	additem ITEM_TM24_THUNDERBOLT
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181F08, 4
+	msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
@@ -354,36 +354,36 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24
 	checkitemspace ITEM_TM13_ICE_BEAM, 1
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C
-	takecoins 4000
-	giveitem ITEM_TM13_ICE_BEAM, 1
+	removecoins 4000
+	additem ITEM_TM13_ICE_BEAM
 	updatecoinsbox 0, 0
 	playse SE_REGI
-	msgbox MauvilleCity_GameCorner_Text_181F08, 4
+	msgbox MauvilleCity_GameCorner_Text_181F08, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
 MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E
-	msgbox MauvilleCity_GameCorner_Text_181E76, 4
+	msgbox MauvilleCity_GameCorner_Text_181E76, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
 MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C
-	call MauvilleCity_GameCorner_EventScript_1A02A5
+	call Common_EventScript_BagIsFull
 	goto MauvilleCity_GameCorner_EventScript_156D49
 	end
 
 MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77
-	msgbox MauvilleCity_GameCorner_Text_181EC2, 4
+	msgbox MauvilleCity_GameCorner_Text_181EC2, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_156F84:: @ 8156F84
-	msgbox MauvilleCity_GameCorner_Text_1821C1, 2
+	msgbox MauvilleCity_GameCorner_Text_1821C1, MSGBOX_NPC
 	end
 
 MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D
-	msgbox MauvilleCity_GameCorner_Text_1821F3, 2
+	msgbox MauvilleCity_GameCorner_Text_1821F3, MSGBOX_NPC
 	end
 
 MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96
@@ -404,8 +404,8 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB
 	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
-	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration_std DECOR_TREECKO_DOLL
+	msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT
+	givedecoration DECOR_TREECKO_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
@@ -415,8 +415,8 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005
 	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
-	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration_std DECOR_TORCHIC_DOLL
+	msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT
+	givedecoration DECOR_TORCHIC_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
@@ -426,25 +426,25 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F
 	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_157059
-	msgbox MauvilleCity_GameCorner_Text_181F89, 4
-	givedecoration_std DECOR_MUDKIP_DOLL
+	msgbox MauvilleCity_GameCorner_Text_181F89, MSGBOX_DEFAULT
+	givedecoration DECOR_MUDKIP_DOLL
 	setflag FLAG_RECEIVED_STARTER_DOLL
 	goto MauvilleCity_GameCorner_EventScript_157072
 	end
 
 MauvilleCity_GameCorner_EventScript_157059:: @ 8157059
-	call MauvilleCity_GameCorner_EventScript_1A02B8
-	msgbox MauvilleCity_GameCorner_Text_181F97, 4
+	call Common_EventScript_NoRoomForDecor
+	msgbox MauvilleCity_GameCorner_Text_181F97, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_157068:: @ 8157068
-	msgbox MauvilleCity_GameCorner_Text_181FBC, 4
+	msgbox MauvilleCity_GameCorner_Text_181FBC, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_GameCorner_EventScript_157072:: @ 8157072
-	msgbox MauvilleCity_GameCorner_Text_181FE9, 4
+	msgbox MauvilleCity_GameCorner_Text_181FE9, MSGBOX_DEFAULT
 	release
 	end
 
@@ -454,7 +454,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_GameCorner_EventScript_15709C
-	msgbox MauvilleCity_GameCorner_Text_18201E, 4
+	msgbox MauvilleCity_GameCorner_Text_18201E, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
@@ -464,41 +464,41 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C
 	compare VAR_TEMP_1, 1
 	goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA
 	setflag FLAG_RECEIVED_20_COINS
-	givecoins 20
-	msgbox MauvilleCity_GameCorner_Text_18208E, 4
+	addcoins 20
+	msgbox MauvilleCity_GameCorner_Text_18208E, MSGBOX_DEFAULT
 	playse SE_REGI
 	goto MauvilleCity_GameCorner_EventScript_1570CA
 	end
 
 MauvilleCity_GameCorner_EventScript_1570CA:: @ 81570CA
-	msgbox MauvilleCity_GameCorner_Text_1820DD, 4
+	msgbox MauvilleCity_GameCorner_Text_1820DD, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
 MauvilleCity_GameCorner_EventScript_1570D8:: @ 81570D8
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_182120, 4
+	msgbox MauvilleCity_GameCorner_Text_182120, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
 MauvilleCity_GameCorner_EventScript_1570E8:: @ 81570E8
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_18217C, 4
+	msgbox MauvilleCity_GameCorner_Text_18217C, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
 MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_182241, 4
+	msgbox MauvilleCity_GameCorner_Text_182241, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108
 	closemessage
-	applymovement VAR_LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -506,14 +506,14 @@ MauvilleCity_GameCorner_EventScript_157108:: @ 8157108
 MauvilleCity_GameCorner_EventScript_157115:: @ 8157115
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_182272, 4
+	msgbox MauvilleCity_GameCorner_Text_182272, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
 MauvilleCity_GameCorner_EventScript_157125:: @ 8157125
 	lock
 	faceplayer
-	msgbox MauvilleCity_GameCorner_Text_1822F4, 4
+	msgbox MauvilleCity_GameCorner_Text_1822F4, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_157108
 	end
 
@@ -650,6 +650,6 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295
 	end
 
 MauvilleCity_GameCorner_EventScript_1572B5:: @ 81572B5
-	msgbox MauvilleCity_GameCorner_Text_182420, 4
+	msgbox MauvilleCity_GameCorner_Text_182420, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 62f5303ec..f7af8e1d0 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -1,5 +1,5 @@
 MauvilleCity_Gym_MapScripts:: @ 8156450
-	map_script 1, MauvilleCity_Gym_MapScript1_156456
+	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_MapScript1_156456
 	.byte 0
 
 MauvilleCity_Gym_MapScript1_156456:: @ 8156456
@@ -66,26 +66,26 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7
 	end
 
 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
-	trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB
+	trainerbattle_single TRAINER_WATTSON, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq MauvilleCity_Gym_EventScript_156641
-	msgbox MauvilleCity_Gym_Text_180EDB, 4
+	msgbox MauvilleCity_Gym_Text_180EDB, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	message MauvilleCity_Gym_Text_180DAF
 	waitmessage
-	call MauvilleCity_Gym_EventScript_1A02C5
-	msgbox MauvilleCity_Gym_Text_180DDA, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox MauvilleCity_Gym_Text_180DDA, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_MAUVILLE_GYM
 	setflag FLAG_BADGE03_GET
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq MauvilleCity_Gym_EventScript_1A00FB
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	setvar VAR_0x8008, 3
-	call MauvilleCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	special MauvilleGymSpecial3
 	special DrawWholeMapView
 	playse SE_KI_GASYAN
@@ -93,16 +93,16 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	end
 
 MauvilleCity_Gym_EventScript_15661D:: @ 815661D
-	giveitem_std ITEM_TM34_SHOCK_WAVE
+	giveitem ITEM_TM34_SHOCK_WAVE
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_Gym_EventScript_1A029B
-	msgbox MauvilleCity_Gym_Text_180E76, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox MauvilleCity_Gym_Text_180E76, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM34
 	release
 	end
 
 MauvilleCity_Gym_EventScript_156641:: @ 8156641
-	msgbox MauvilleCity_Gym_Text_180F1D, 4
+	msgbox MauvilleCity_Gym_Text_180F1D, MSGBOX_DEFAULT
 	release
 	end
 
@@ -161,35 +161,35 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1
 	end
 
 MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6
-	trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997
-	msgbox MauvilleCity_Gym_Text_1809D1, 6
+	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997
+	msgbox MauvilleCity_Gym_Text_1809D1, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD
-	trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42
-	msgbox MauvilleCity_Gym_Text_180A5E, 6
+	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42
+	msgbox MauvilleCity_Gym_Text_180A5E, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_156714:: @ 8156714
-	trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06
-	msgbox MauvilleCity_Gym_Text_180B1D, 6
+	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06
+	msgbox MauvilleCity_Gym_Text_180B1D, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_15672B:: @ 815672B
-	trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93
-	msgbox MauvilleCity_Gym_Text_180BAE, 6
+	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93
+	msgbox MauvilleCity_Gym_Text_180BAE, MSGBOX_AUTOCLOSE
 	end
 
 MauvilleCity_Gym_EventScript_156742:: @ 8156742
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757
-	msgbox MauvilleCity_Gym_Text_180815, 4
+	msgbox MauvilleCity_Gym_Text_180815, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_Gym_EventScript_156757:: @ 8156757
-	msgbox MauvilleCity_Gym_Text_18091D, 4
+	msgbox MauvilleCity_Gym_Text_18091D, MSGBOX_DEFAULT
 	release
 	end
 
@@ -206,11 +206,11 @@ MauvilleCity_Gym_EventScript_156771:: @ 8156771
 	end
 
 MauvilleCity_Gym_EventScript_156781:: @ 8156781
-	msgbox MauvilleCity_Gym_Text_180F64, 4
+	msgbox MauvilleCity_Gym_Text_180F64, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MauvilleCity_Gym_EventScript_15678B:: @ 815678B
-	msgbox MauvilleCity_Gym_Text_180F4A, 4
+	msgbox MauvilleCity_Gym_Text_180F4A, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc
index 4caaef545..b49e103f3 100644
--- a/data/maps/MauvilleCity_House1/scripts.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
@@ -5,14 +5,14 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29
-	msgbox MauvilleCity_House1_Text_181B1A, 4
-	giveitem_std ITEM_HM06_ROCK_SMASH
+	msgbox MauvilleCity_House1_Text_181B1A, MSGBOX_DEFAULT
+	giveitem ITEM_HM06_ROCK_SMASH
 	setflag FLAG_RECEIVED_HM06
-	msgbox MauvilleCity_House1_Text_181B64, 4
+	msgbox MauvilleCity_House1_Text_181B64, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_House1_EventScript_156A29:: @ 8156A29
-	msgbox MauvilleCity_House1_Text_181BF6, 4
+	msgbox MauvilleCity_House1_Text_181BF6, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc
index 321905148..28b71f3ca 100644
--- a/data/maps/MauvilleCity_House2/scripts.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
@@ -5,7 +5,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D
-	msgbox MauvilleCity_House2_Text_18244E, 4
+	msgbox MauvilleCity_House2_Text_18244E, MSGBOX_DEFAULT
 	checkitem ITEM_HARBOR_MAIL, 1
 	compare VAR_RESULT, 1
 	goto_if_eq MauvilleCity_House2_EventScript_1572E5
@@ -14,9 +14,9 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0
 
 MauvilleCity_House2_EventScript_1572E5:: @ 81572E5
 	playse SE_PIN
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0833
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, MauvilleCity_House2_Movement_1A0835
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
 	msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -26,19 +26,19 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5
 	end
 
 MauvilleCity_House2_EventScript_15731B:: @ 815731B
-	msgbox MauvilleCity_House2_Text_182515, 4
-	takeitem ITEM_HARBOR_MAIL, 1
-	giveitem_std ITEM_COIN_CASE
+	msgbox MauvilleCity_House2_Text_182515, MSGBOX_DEFAULT
+	removeitem ITEM_HARBOR_MAIL
+	giveitem ITEM_COIN_CASE
 	setflag FLAG_RECEIVED_COIN_CASE
 	goto MauvilleCity_House2_EventScript_15733D
 	end
 
 MauvilleCity_House2_EventScript_15733D:: @ 815733D
-	msgbox MauvilleCity_House2_Text_182549, 4
+	msgbox MauvilleCity_House2_Text_182549, MSGBOX_DEFAULT
 	release
 	end
 
 MauvilleCity_House2_EventScript_157347:: @ 8157347
-	msgbox MauvilleCity_House2_Text_182578, 4
+	msgbox MauvilleCity_House2_Text_182578, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 0dd66eddf..e2ed4c05e 100644
--- a/data/maps/MauvilleCity_Mart/scripts.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
@@ -4,10 +4,10 @@ MauvilleCity_Mart_MapScripts:: @ 81573BD
 MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE
 	lock
 	faceplayer
-	message MauvilleCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart MauvilleCity_Mart_Items
-	msgbox MauvilleCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -30,9 +30,9 @@ MauvilleCity_Mart_Items:: @ 81573D8
 	end
 
 MauvilleCity_Mart_EventScript_1573F4:: @ 81573F4
-	msgbox MauvilleCity_Mart_Text_1827D3, 2
+	msgbox MauvilleCity_Mart_Text_1827D3, MSGBOX_NPC
 	end
 
 MauvilleCity_Mart_EventScript_1573FD:: @ 81573FD
-	msgbox MauvilleCity_Mart_Text_18287F, 2
+	msgbox MauvilleCity_Mart_Text_18287F, MSGBOX_NPC
 	end
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 29fcc1278..e5cfd2fb2 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -1,10 +1,10 @@
 MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351
-	map_script 3, MauvilleCity_PokemonCenter_1F_MapScript1_157357
+	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_MapScript1_157357
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357
 	setrespawn HEAL_LOCATION_MAUVILLE_CITY
-	call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	goto MauvilleCity_PokemonCenter_1F_EventScript_157365
 	end
 
@@ -14,20 +14,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365
 
 MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369
 	setvar VAR_0x800B, 1
-	call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_157377:: @ 8157377
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1825BD, 2
+	msgbox MauvilleCity_PokemonCenter_1F_Text_1825BD, MSGBOX_NPC
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_157380:: @ 8157380
-	msgbox MauvilleCity_PokemonCenter_1F_Text_182622, 2
+	msgbox MauvilleCity_PokemonCenter_1F_Text_182622, MSGBOX_NPC
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_157389:: @ 8157389
-	msgbox MauvilleCity_PokemonCenter_1F_Text_1826A6, 2
+	msgbox MauvilleCity_PokemonCenter_1F_Text_1826A6, MSGBOX_NPC
 	end
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index e85e80308..02d1a102a 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8157392
-	map_script 2, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, MauvilleCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MauvilleCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 MauvilleCity_PokemonCenter_2F_EventScript_1573A2:: @ 81573A2
@@ -17,5 +17,5 @@ MauvilleCity_PokemonCenter_2F_EventScript_1573AE:: @ 81573AE
 	end
 
 MauvilleCity_PokemonCenter_2F_EventScript_1573B4:: @ 81573B4
-	msgbox MauvilleCity_PokemonCenter_2F_Text_182724, 2
+	msgbox MauvilleCity_PokemonCenter_2F_Text_182724, MSGBOX_NPC
 	end
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index ee2c5b1dc..83d8bbf30 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -1,37 +1,37 @@
 MeteorFalls_1F_1R_MapScripts:: @ 815C490
-	map_script 3, MeteorFalls_1F_1R_MapScript1_15C496
+	map_script MAP_SCRIPT_ON_TRANSITION, MeteorFalls_1F_1R_MapScript1_15C496
 	.byte 0
 
 MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496
-	call MeteorFalls_1F_1R_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	lockall
-	applymovement 255, MeteorFalls_1F_1R_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0845
+	applymovement 5, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193237, 4
+	msgbox MeteorFalls_1F_1R_Text_193237, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0841
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A0841
+	applymovement 5, Common_Movement_WalkInPlaceFastestUp
+	applymovement 6, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0833
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0835
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193268, 4
+	msgbox MeteorFalls_1F_1R_Text_193268, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_1932C5, 4
+	msgbox MeteorFalls_1F_1R_Text_1932C5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	addobject 7
 	addobject 8
@@ -40,12 +40,12 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 8, MeteorFalls_1F_1R_Movement_15C60F
 	applymovement 9, MeteorFalls_1F_1R_Movement_15C617
 	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193320, 4
+	msgbox MeteorFalls_1F_1R_Text_193320, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_15C64F
+	applymovement OBJ_EVENT_ID_PLAYER, MeteorFalls_1F_1R_Movement_15C64F
 	applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1
 	applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC
 	waitmovement 0
@@ -54,21 +54,21 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 7, MeteorFalls_1F_1R_Movement_15C628
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox MeteorFalls_1F_1R_Text_1933EC, 4
+	msgbox MeteorFalls_1F_1R_Text_1933EC, MSGBOX_DEFAULT
 	.else
-	msgbox MeteorFalls_1F_1R_Text_193584, 4
+	msgbox MeteorFalls_1F_1R_Text_193584, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	applymovement 8, MeteorFalls_1F_1R_Movement_15C639
 	applymovement 9, MeteorFalls_1F_1R_Movement_15C64A
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193720, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_1A0845
+	msgbox MeteorFalls_1F_1R_Text_193720, MSGBOX_DEFAULT
+	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193747, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_1A083F
+	msgbox MeteorFalls_1F_1R_Text_193747, MSGBOX_DEFAULT
+	applymovement 7, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_1937AA, 4
+	msgbox MeteorFalls_1F_1R_Text_1937AA, MSGBOX_DEFAULT
 	closemessage
 	applymovement 7, MeteorFalls_1F_1R_Movement_15C61F
 	applymovement 8, MeteorFalls_1F_1R_Movement_15C62E
@@ -85,7 +85,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1
 	walk_fast_up
@@ -98,7 +98,7 @@ MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC
 	walk_fast_up
@@ -112,7 +112,7 @@ MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C608:: @ 815C608
 	walk_right
@@ -121,7 +121,7 @@ MeteorFalls_1F_1R_Movement_15C608:: @ 815C608
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F
 	delay_16
@@ -131,7 +131,7 @@ MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C617:: @ 815C617
 	delay_16
@@ -141,7 +141,7 @@ MeteorFalls_1F_1R_Movement_15C617:: @ 815C617
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F
 	walk_right
@@ -152,7 +152,7 @@ MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C628:: @ 815C628
 	walk_right
@@ -160,7 +160,7 @@ MeteorFalls_1F_1R_Movement_15C628:: @ 815C628
 	walk_up
 	walk_up
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E
 	walk_up
@@ -173,14 +173,14 @@ MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C639:: @ 815C639
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E
 	walk_up
@@ -194,14 +194,14 @@ MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
 	walk_in_place_fastest_down
@@ -210,18 +210,18 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
-	end_movement
+	step_end
 
 MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E
 	setflag FLAG_MET_PROF_COSMO
-	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
+	msgbox MeteorFalls_1F_1R_Text_1937EB, MSGBOX_DEFAULT
 	release
 	end
 
 MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E
-	msgbox MeteorFalls_1F_1R_Text_19396A, 4
+	msgbox MeteorFalls_1F_1R_Text_19396A, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 971b9c285..f0adda971 100644
--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -2,40 +2,40 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678
 	.byte 0
 
 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679
-	trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35
+	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0
-	msgbox MeteorFalls_1F_2R_Text_193A60, 6
+	msgbox MeteorFalls_1F_2R_Text_193A60, MSGBOX_AUTOCLOSE
 	end
 
 MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0
-	trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21
-	msgbox MeteorFalls_1F_2R_Text_193B4C, 6
+	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21
+	msgbox MeteorFalls_1F_2R_Text_193B4C, MSGBOX_AUTOCLOSE
 	end
 
 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7
-	trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2
-	msgbox MeteorFalls_1F_2R_Text_193C35, 6
+	msgbox MeteorFalls_1F_2R_Text_193C35, MSGBOX_AUTOCLOSE
 	end
 
 MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2
-	trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59
-	msgbox MeteorFalls_1F_2R_Text_193EF3, 6
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59
+	msgbox MeteorFalls_1F_2R_Text_193EF3, MSGBOX_AUTOCLOSE
 	end
 
 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD
-	trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB
+	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MeteorFalls_1F_2R_EventScript_15C728
-	msgbox MeteorFalls_1F_2R_Text_193D9A, 6
+	msgbox MeteorFalls_1F_2R_Text_193D9A, MSGBOX_AUTOCLOSE
 	end
 
 MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728
-	trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF
-	msgbox MeteorFalls_1F_2R_Text_194066, 6
+	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF
+	msgbox MeteorFalls_1F_2R_Text_194066, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index c9238ec9a..4c6f537c6 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -278,7 +278,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -286,7 +286,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -302,7 +302,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -310,7 +310,7 @@
       "y": 18,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "MossdeepCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index d34944bb6..470c95630 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -1,5 +1,5 @@
 MossdeepCity_MapScripts:: @ 814CF92
-	map_script 3, MossdeepCity_MapScript1_14CF98
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_MapScript1_14CF98
 	.byte 0
 
 MossdeepCity_MapScript1_14CF98:: @ 814CF98
@@ -7,47 +7,47 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 MossdeepCity_EventScript_14CFAE:: @ 814CFAE
-	msgbox MossdeepCity_Text_169266, 2
+	msgbox MossdeepCity_Text_169266, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFB7:: @ 814CFB7
-	msgbox MossdeepCity_Text_1692A1, 2
+	msgbox MossdeepCity_Text_1692A1, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFC0:: @ 814CFC0
-	msgbox MossdeepCity_Text_1691F2, 2
+	msgbox MossdeepCity_Text_1691F2, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFC9:: @ 814CFC9
-	msgbox MossdeepCity_Text_169370, 2
+	msgbox MossdeepCity_Text_169370, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFD2:: @ 814CFD2
-	msgbox MossdeepCity_Text_169314, 2
+	msgbox MossdeepCity_Text_169314, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFDB:: @ 814CFDB
-	msgbox MossdeepCity_Text_1694DA, 2
+	msgbox MossdeepCity_Text_1694DA, MSGBOX_NPC
 	end
 
 MossdeepCity_EventScript_14CFE4:: @ 814CFE4
-	msgbox MossdeepCity_Text_1695D3, 3
+	msgbox MossdeepCity_Text_1695D3, MSGBOX_SIGN
 	end
 
 MossdeepCity_EventScript_14CFED:: @ 814CFED
-	msgbox MossdeepCity_Text_1695E6, 3
+	msgbox MossdeepCity_Text_1695E6, MSGBOX_SIGN
 	end
 
 MossdeepCity_EventScript_14CFF6:: @ 814CFF6
-	msgbox MossdeepCity_Text_16962F, 3
+	msgbox MossdeepCity_Text_16962F, MSGBOX_SIGN
 	end
 
 MossdeepCity_EventScript_14CFFF:: @ 814CFFF
-	msgbox MossdeepCity_Text_16965C, 3
+	msgbox MossdeepCity_Text_16965C, MSGBOX_SIGN
 	end
 
 MossdeepCity_EventScript_14D008:: @ 814D008
@@ -58,8 +58,8 @@ MossdeepCity_EventScript_14D008:: @ 814D008
 MossdeepCity_EventScript_14D011:: @ 814D011
 	lock
 	faceplayer
-	msgbox MossdeepCity_Text_16944E, 4
-	applymovement VAR_LAST_TALKED, MossdeepCity_Movement_1A083D
+	msgbox MossdeepCity_Text_16944E, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -71,20 +71,20 @@ MossdeepCity_EventScript_14D027:: @ 814D027
 	msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_EventScript_14D073
-	msgbox MossdeepCity_Text_169117, 4
-	giveitem_std ITEM_KINGS_ROCK
+	msgbox MossdeepCity_Text_169117, MSGBOX_DEFAULT
+	giveitem ITEM_KINGS_ROCK
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 
 MossdeepCity_EventScript_14D069:: @ 814D069
-	msgbox MossdeepCity_Text_16916F, 4
+	msgbox MossdeepCity_Text_16916F, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_EventScript_14D073:: @ 814D073
-	msgbox MossdeepCity_Text_1691A7, 4
+	msgbox MossdeepCity_Text_1691A7, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index 38366ac43..d8f69554c 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -1,7 +1,7 @@
 MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
-	map_script 1, MossdeepCity_GameCorner_1F_MapScript1_15AC62
-	map_script 3, MossdeepCity_GameCorner_1F_MapScript1_15AC84
-	map_script 2, MossdeepCity_GameCorner_1F_MapScript2_15ACBB
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_GameCorner_1F_MapScript1_15AC62
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_1F_MapScript1_15AC84
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_MapScript2_15ACBB
 	.byte 0
 
 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
@@ -42,12 +42,12 @@ MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB
 
 MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
 	lockall
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AD3D
 	waitmovement 0
 	applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F
 	waitmovement 0
 	moveobjectoffscreen 1
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	compare VAR_GAME_CORNER_STATE, 1
 	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22
@@ -61,32 +61,32 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_15AD22:: @ 815AD22
-	msgbox MossdeepCity_GameCorner_1F_Text_18E80E, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E80E, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15AD2B:: @ 815AD2B
-	msgbox MossdeepCity_GameCorner_1F_Text_18E859, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E859, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34
-	msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D
 	walk_down
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
 	lock
 	faceplayer
 	compare VAR_TEMP_1, 1
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59
-	msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E59A, MSGBOX_DEFAULT
 	release
 	end
 
@@ -103,13 +103,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	compare VAR_RESULT, NO
 	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	special LoadPlayerParty
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
 	erasebox 0, 0, 15, 10
 	special SavePlayerParty
 	special ReducePlayerPartyToThree
-	msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E777, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04
@@ -124,32 +124,32 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 
 MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8
 	special LoadPlayerParty
-	msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4
+	msgbox MossdeepCity_GameCorner_1F_Text_18E698, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5
-	msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4
-	fadescreen 1
+	msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	special sub_80C5568
 	waitstate
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04
 	applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE3A
 	waitmovement 0
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16
 	applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE3E
 	waitmovement 0
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28
 	applymovement VAR_LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_1F_Movement_15AE42
 	waitmovement 0
 	return
 
@@ -157,30 +157,30 @@ MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A
 	delay_16
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E
 	delay_16
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42
 	delay_16
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49
 	walk_right
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C
-	msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3
+	msgbox MossdeepCity_GameCorner_1F_Text_18E631, MSGBOX_SIGN
 	end
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
index aa604b493..fecf1060f 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
@@ -1,6 +1,6 @@
 MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55
-	map_script 3, MossdeepCity_GameCorner_B1F_MapScript1_15AE60
-	map_script 2, MossdeepCity_GameCorner_B1F_MapScript2_15AE64
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_GameCorner_B1F_MapScript1_15AE60
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_B1F_MapScript2_15AE64
 	.byte 0
 
 MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60
@@ -13,10 +13,10 @@ MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64
 
 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	lockall
-	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_B1F_Movement_15AEF9
 	waitmovement 0
 	special PrintEReaderTrainerGreeting
-	msgbox gStringVar4, 4
+	msgbox gStringVar4, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
@@ -30,7 +30,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE
 	closemessage
 	special ScrSpecial_HealPlayerParty
-	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_GameCorner_B1F_Movement_15AEFF
 	waitmovement 0
 	special LoadPlayerParty
 	setvar VAR_TEMP_1, 1
@@ -41,7 +41,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 
 MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5
 	setvar VAR_GAME_CORNER_STATE, 3
-	msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4
+	msgbox MossdeepCity_GameCorner_B1F_Text_18E796, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
@@ -64,7 +64,7 @@ MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9
 	walk_down
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF
 	walk_left
@@ -74,4 +74,4 @@ MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index 695953c38..bc86b3ead 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -1,5 +1,5 @@
 MossdeepCity_Gym_MapScripts:: @ 815A4D3
-	map_script 1, MossdeepCity_Gym_MapScript1_15A4D9
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_MapScript1_15A4D9
 	.byte 0
 
 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
@@ -45,32 +45,32 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558
 	end
 
 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
-	trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
+	trainerbattle_double TRAINER_TATE_AND_LIZA, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6
-	msgbox MossdeepCity_Gym_Text_18D273, 4
+	msgbox MossdeepCity_Gym_Text_18D273, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	message MossdeepCity_Gym_Text_18D0F9
 	waitmessage
-	call MossdeepCity_Gym_EventScript_1A02C5
-	msgbox MossdeepCity_Gym_Text_18D128, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox MossdeepCity_Gym_Text_18D128, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_MOSSDEEP_GYM
 	setflag FLAG_BADGE07_GET
 	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
 	clearflag FLAG_UNKNOWN_393
 	setvar VAR_0x8008, 7
-	call MossdeepCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
 	goto MossdeepCity_Gym_EventScript_15A5C6
 	end
 
 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
-	giveitem_std ITEM_TM04_CALM_MIND
+	giveitem ITEM_TM04_CALM_MIND
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
-	msgbox MossdeepCity_Gym_Text_18D1CF, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox MossdeepCity_Gym_Text_18D1CF, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM04
 	release
 	end
@@ -79,7 +79,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Right, 0
 	setmetatile 2, 7, METATILE_MossdeepGym_Switch_Down, 1
@@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619
 
 MossdeepCity_Gym_EventScript_15A621:: @ 815A621
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 5, 5, METATILE_MossdeepGym_RedArrow_Left, 0
 	setmetatile 2, 7, METATILE_MossdeepGym_Switch_Up, 1
@@ -105,7 +105,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Right, 0
 	setmetatile 8, 10, METATILE_MossdeepGym_Switch_Down, 1
@@ -114,7 +114,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646
 
 MossdeepCity_Gym_EventScript_15A675:: @ 815A675
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 8, 14, METATILE_MossdeepGym_RedArrow_Down, 0
 	setmetatile 8, 10, METATILE_MossdeepGym_Switch_Up, 1
@@ -125,7 +125,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Left, 0
 	setmetatile 17, 15, METATILE_MossdeepGym_Switch_Down, 1
@@ -134,7 +134,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
 
 MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 15, 17, METATILE_MossdeepGym_RedArrow_Right, 0
 	setmetatile 17, 15, METATILE_MossdeepGym_Switch_Up, 1
@@ -145,7 +145,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Up, 0
 	setmetatile 5, 24, METATILE_MossdeepGym_Switch_Down, 1
@@ -154,7 +154,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
 
 MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_15A7F7
 	waitmovement 0
 	setmetatile 1, 23, METATILE_MossdeepGym_RedArrow_Right, 0
 	setmetatile 5, 24, METATILE_MossdeepGym_Switch_Up, 1
@@ -169,52 +169,52 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742
 	end
 
 MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E
-	trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA
-	msgbox MossdeepCity_Gym_Text_18C9E1, 6
+	trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA
+	msgbox MossdeepCity_Gym_Text_18C9E1, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A765:: @ 815A765
-	trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28
-	msgbox MossdeepCity_Gym_Text_18CA48, 6
+	trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28
+	msgbox MossdeepCity_Gym_Text_18CA48, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C
-	trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46
-	msgbox MossdeepCity_Gym_Text_18CB77, 6
+	trainerbattle_single TRAINER_FRITZ, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46
+	msgbox MossdeepCity_Gym_Text_18CB77, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A793:: @ 815A793
-	trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83
-	msgbox MossdeepCity_Gym_Text_18CC9B, 6
+	trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83
+	msgbox MossdeepCity_Gym_Text_18CC9B, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA
-	trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66
-	msgbox MossdeepCity_Gym_Text_18CD73, 6
+	trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66
+	msgbox MossdeepCity_Gym_Text_18CD73, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
-	trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47
-	msgbox MossdeepCity_Gym_Text_18CE6C, 6
+	trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47
+	msgbox MossdeepCity_Gym_Text_18CE6C, MSGBOX_AUTOCLOSE
 	end
 
 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED
-	msgbox MossdeepCity_Gym_Text_18C7E3, 4
+	msgbox MossdeepCity_Gym_Text_18C7E3, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED
-	msgbox MossdeepCity_Gym_Text_18C938, 4
+	msgbox MossdeepCity_Gym_Text_18C938, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
 	lockall
@@ -229,11 +229,11 @@ MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
 	end
 
 MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A
-	msgbox MossdeepCity_Gym_Text_18D424, 4
+	msgbox MossdeepCity_Gym_Text_18D424, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MossdeepCity_Gym_EventScript_15A824:: @ 815A824
-	msgbox MossdeepCity_Gym_Text_18D40A, 4
+	msgbox MossdeepCity_Gym_Text_18D40A, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 12b2bc2a5..585120fea 100644
--- a/data/maps/MossdeepCity_House1/scripts.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
@@ -5,19 +5,19 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox MossdeepCity_House1_Text_18D465, 4
+	msgbox MossdeepCity_House1_Text_18D465, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetPokeblockNameByMonNature
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_House1_EventScript_15A855
-	msgbox MossdeepCity_House1_Text_18D475, 4
+	msgbox MossdeepCity_House1_Text_18D475, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House1_EventScript_15A855:: @ 815A855
-	msgbox MossdeepCity_House1_Text_18D4C0, 4
+	msgbox MossdeepCity_House1_Text_18D4C0, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House1_EventScript_15A85F:: @ 815A85F
-	msgbox MossdeepCity_House1_Text_18D4F1, 2
+	msgbox MossdeepCity_House1_Text_18D4F1, MSGBOX_NPC
 	end
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index 53cb4511b..c88f644d8 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -2,11 +2,11 @@ MossdeepCity_House2_MapScripts:: @ 815A868
 	.byte 0
 
 MossdeepCity_House2_EventScript_15A869:: @ 815A869
-	msgbox MossdeepCity_House2_Text_18D536, 2
+	msgbox MossdeepCity_House2_Text_18D536, MSGBOX_NPC
 	end
 
 MossdeepCity_House2_EventScript_15A872:: @ 815A872
-	msgbox MossdeepCity_House2_Text_18D596, 2
+	msgbox MossdeepCity_House2_Text_18D596, MSGBOX_NPC
 	end
 
 MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
@@ -14,7 +14,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox MossdeepCity_House2_Text_18D61E, 4
+	msgbox MossdeepCity_House2_Text_18D61E, MSGBOX_DEFAULT
 	waitmoncry
 	closemessage
 	setflag FLAG_WINGULL_DELIVERED_MAIL
@@ -44,11 +44,11 @@ MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4
 	walk_fast_left
 	walk_fast_down
 	delay_8
-	end_movement
+	step_end
 
 MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
 	delay_8
-	end_movement
+	step_end
diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc
index ead159df5..68e3e28b2 100644
--- a/data/maps/MossdeepCity_House3/scripts.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
@@ -8,19 +8,19 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972
 	msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_House3_EventScript_15A9BB
-	msgbox MossdeepCity_House3_Text_18D9A9, 4
-	giveitem_std ITEM_SUPER_ROD
+	msgbox MossdeepCity_House3_Text_18D9A9, MSGBOX_DEFAULT
+	giveitem ITEM_SUPER_ROD
 	setflag FLAG_RECEIVED_SUPER_ROD
-	msgbox MossdeepCity_House3_Text_18D9E3, 4
+	msgbox MossdeepCity_House3_Text_18D9E3, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House3_EventScript_15A9B1:: @ 815A9B1
-	msgbox MossdeepCity_House3_Text_18DA44, 4
+	msgbox MossdeepCity_House3_Text_18DA44, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House3_EventScript_15A9BB:: @ 815A9BB
-	msgbox MossdeepCity_House3_Text_18DA26, 4
+	msgbox MossdeepCity_House3_Text_18DA26, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index dc5063c15..42acadb4a 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -5,12 +5,12 @@ MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46
-	msgbox MossdeepCity_House4_Text_18E0E3, 4
+	msgbox MossdeepCity_House4_Text_18E0E3, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House4_EventScript_15AB46:: @ 815AB46
-	msgbox MossdeepCity_House4_Text_18E125, 4
+	msgbox MossdeepCity_House4_Text_18E125, MSGBOX_DEFAULT
 	release
 	end
 
@@ -21,12 +21,12 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50
 	compare VAR_RESULT, 0
 	goto_if_eq MossdeepCity_House4_EventScript_15AB6D
 	special GetSecretBaseNearbyMapName
-	msgbox MossdeepCity_House4_Text_18E17E, 4
+	msgbox MossdeepCity_House4_Text_18E17E, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D
-	msgbox MossdeepCity_House4_Text_18E1A7, 4
+	msgbox MossdeepCity_House4_Text_18E1A7, MSGBOX_DEFAULT
 	release
 	end
 
@@ -35,7 +35,7 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox MossdeepCity_House4_Text_18E1E1, 4
+	msgbox MossdeepCity_House4_Text_18E1E1, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index ce5845c81..5e28e192d 100644
--- a/data/maps/MossdeepCity_Mart/scripts.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
@@ -4,10 +4,10 @@ MossdeepCity_Mart_MapScripts:: @ 815A925
 MossdeepCity_Mart_EventScript_15A926:: @ 815A926
 	lock
 	faceplayer
-	message MossdeepCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart MossdeepCity_Mart_Items
-	msgbox MossdeepCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -27,13 +27,13 @@ MossdeepCity_Mart_Items:: @ 815A940
 	end
 
 MossdeepCity_Mart_EventScript_15A956:: @ 815A956
-	msgbox MossdeepCity_Mart_Text_18D758, 2
+	msgbox MossdeepCity_Mart_Text_18D758, MSGBOX_NPC
 	end
 
 MossdeepCity_Mart_EventScript_15A95F:: @ 815A95F
-	msgbox MossdeepCity_Mart_Text_18D7E7, 2
+	msgbox MossdeepCity_Mart_Text_18D7E7, MSGBOX_NPC
 	end
 
 MossdeepCity_Mart_EventScript_15A968:: @ 815A968
-	msgbox MossdeepCity_Mart_Text_18D841, 2
+	msgbox MossdeepCity_Mart_Text_18D841, MSGBOX_NPC
 	end
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 5fe72062f..c0655f948 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0
-	map_script 3, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6
@@ -8,16 +8,16 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6
 
 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA
 	setvar VAR_0x800B, 1
-	call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 MossdeepCity_PokemonCenter_1F_EventScript_15A8E8:: @ 815A8E8
-	msgbox MossdeepCity_PokemonCenter_1F_Text_18D62F, 2
+	msgbox MossdeepCity_PokemonCenter_1F_Text_18D62F, MSGBOX_NPC
 	end
 
 MossdeepCity_PokemonCenter_1F_EventScript_15A8F1:: @ 815A8F1
-	msgbox MossdeepCity_PokemonCenter_1F_Text_18D69A, 2
+	msgbox MossdeepCity_PokemonCenter_1F_Text_18D69A, MSGBOX_NPC
 	end
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index a88147c08..996ba0a9e 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
@@ -1,11 +1,11 @@
 MossdeepCity_PokemonCenter_2F_MapScripts:: @ 815A8FA
-	map_script 2, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, MossdeepCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 MossdeepCity_PokemonCenter_2F_EventScript_15A90A:: @ 815A90A
-	msgbox MossdeepCity_PokemonCenter_2F_Text_18D6F5, 2
+	msgbox MossdeepCity_PokemonCenter_2F_Text_18D6F5, MSGBOX_NPC
 	end
 
 MossdeepCity_PokemonCenter_2F_EventScript_15A913:: @ 815A913
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 7ac7d5f4d..02e1a8660 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -4,7 +4,7 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A
 MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
 	compare VAR_RESULT, 0
@@ -12,51 +12,51 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
 	compare VAR_RESULT, 1
 	call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_15ABBA:: @ 815ABBA
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E1F3, 4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E1F3, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_SpaceCenter_1F_EventScript_15ABC3:: @ 815ABC3
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E214, 4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E214, MSGBOX_DEFAULT
 	return
 
 MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E251, 2
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E251, MSGBOX_NPC
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4
-	giveitem_std ITEM_SUN_STONE
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, MSGBOX_DEFAULT
+	giveitem ITEM_SUN_STONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_15AC0C:: @ 815AC0C
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, MSGBOX_DEFAULT
 	release
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_15AC16:: @ 815AC16
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E3E5, 2
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E3E5, MSGBOX_NPC
 	end
 
 MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F
 	lock
 	faceplayer
-	msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4
+	msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 97467f4e5..65b82ad02 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -2,13 +2,13 @@ MossdeepCity_SpaceCenter_2F_MapScripts:: @ 815AC36
 	.byte 0
 
 MossdeepCity_SpaceCenter_2F_EventScript_15AC37:: @ 815AC37
-	msgbox MossdeepCity_SpaceCenter_2F_Text_18E483, 2
+	msgbox MossdeepCity_SpaceCenter_2F_Text_18E483, MSGBOX_NPC
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_15AC40:: @ 815AC40
-	msgbox MossdeepCity_SpaceCenter_2F_Text_18E4EE, 2
+	msgbox MossdeepCity_SpaceCenter_2F_Text_18E4EE, MSGBOX_NPC
 	end
 
 MossdeepCity_SpaceCenter_2F_EventScript_15AC49:: @ 815AC49
-	msgbox MossdeepCity_SpaceCenter_2F_Text_18E564, 2
+	msgbox MossdeepCity_SpaceCenter_2F_Text_18E564, MSGBOX_NPC
 	end
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
index 96b29bc77..df63c5ca8 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.json
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -48,7 +48,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "MossdeepCity_StevensHouse_EventScript_15AB20",
-      "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1"
+      "flag": "FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_LITTLE_BOY_1",
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 6025a6b6b..07fe1b296 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -1,7 +1,7 @@
 MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
-	map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5
-	map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9
-	map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_15A9D5
+	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_MapScript1_15A9E9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_15AA01
 	.byte 0
 
 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
@@ -28,20 +28,20 @@ MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
 
 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
 	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
-	giveitem_std ITEM_HM08_DIVE
+	msgbox MossdeepCity_StevensHouse_Text_18DA77, MSGBOX_DEFAULT
+	giveitem ITEM_HM08_DIVE
 	setflag FLAG_RECEIVED_HM08
 	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
+	msgbox MossdeepCity_StevensHouse_Text_18DB22, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
@@ -58,7 +58,7 @@ MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
 	walk_up
@@ -66,7 +66,7 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	lockall
@@ -82,47 +82,47 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	message MossdeepCity_StevensHouse_Text_18DD61
 	waitfanfare
 	waitmessage
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	bufferspeciesname 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC
-	msgbox MossdeepCity_StevensHouse_Text_18DD77, 4
+	msgbox MossdeepCity_StevensHouse_Text_18DD77, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6
-	msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4
+	msgbox MossdeepCity_StevensHouse_Text_18DD9E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0
-	msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3
+	msgbox MossdeepCity_StevensHouse_Text_18E0A3, MSGBOX_SIGN
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
-	msgbox MossdeepCity_StevensHouse_Text_18DC25, 2
+	msgbox MossdeepCity_StevensHouse_Text_18DC25, MSGBOX_NPC
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
 	lockall
 	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
+	msgbox MossdeepCity_StevensHouse_Text_18DF1A, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4
+	msgbox MossdeepCity_StevensHouse_Text_18DDC2, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
-	giveitem_std ITEM_HM08_DIVE, 1, 1
+	finditem ITEM_HM08_DIVE
 	setflag FLAG_RECEIVED_HM08
 	end
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index e06433dfa..24ae13050 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -1,11 +1,11 @@
 MtChimney_MapScripts:: @ 815CF7C
-	map_script 5, MtChimney_MapScript1_15CF92
-	map_script 3, MtChimney_MapScript1_15CF87
+	map_script MAP_SCRIPT_ON_RESUME, MtChimney_MapScript1_15CF92
+	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_MapScript1_15CF87
 	.byte 0
 
 MtChimney_MapScript1_15CF87:: @ 815CF87
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
-	call MtChimney_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 MtChimney_MapScript1_15CF92:: @ 815CF92
@@ -23,11 +23,11 @@ MtChimney_EventScript_15CF95:: @ 815CF95
 	checkmoney 0xc8, 0
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_15D018
-	msgbox MtChimney_Text_1957A9, 4
+	msgbox MtChimney_Text_1957A9, MSGBOX_DEFAULT
 	checkitemspace ITEM_LAVA_COOKIE, 1
 	compare VAR_RESULT, 1
 	call_if_eq MtChimney_EventScript_15D000
-	giveitem_std ITEM_LAVA_COOKIE
+	giveitem ITEM_LAVA_COOKIE
 	compare VAR_RESULT, 0
 	goto_if_eq MtChimney_EventScript_15CFF3
 	hidemoneybox 0, 0
@@ -35,25 +35,25 @@ MtChimney_EventScript_15CF95:: @ 815CF95
 	end
 
 MtChimney_EventScript_15CFF3:: @ 815CFF3
-	msgbox MtChimney_Text_1A0CC2, 4
+	msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
 
 MtChimney_EventScript_15D000:: @ 815D000
-	takemoney 0xc8, 0
+	removemoney 200, 0
 	updatemoneybox 0, 0
 	nop
 	return
 
 MtChimney_EventScript_15D00B:: @ 815D00B
-	msgbox MtChimney_Text_1957F7, 4
+	msgbox MtChimney_Text_1957F7, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
 
 MtChimney_EventScript_15D018:: @ 815D018
-	msgbox MtChimney_Text_1957BA, 4
+	msgbox MtChimney_Text_1957BA, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
@@ -66,7 +66,7 @@ MtChimney_Movement_15D025:: @ 815D025
 	walk_up
 	walk_up
 	walk_right
-	end_movement
+	step_end
 
 MtChimney_Movement_15D02D:: @ 815D02D
 	walk_left
@@ -77,7 +77,7 @@ MtChimney_Movement_15D02D:: @ 815D02D
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 MtChimney_Movement_15D036:: @ 815D036
 	walk_up
@@ -87,7 +87,7 @@ MtChimney_Movement_15D036:: @ 815D036
 	walk_up
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
@@ -99,7 +99,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D048
 	walk_down
@@ -119,7 +119,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 @ 815D05A
 	walk_down
@@ -130,7 +130,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 @ 815D063
 	walk_right
@@ -147,7 +147,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D072
 	walk_fast_down
@@ -174,7 +174,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 @ 815D08B
 	delay_16
@@ -187,7 +187,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 @ 815D096
 	delay_16
@@ -205,7 +205,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0A6
 	delay_16
@@ -224,7 +224,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0B7
 	delay_16
@@ -234,7 +234,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 @ 815D0BF
 	walk_down
@@ -250,11 +250,11 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0CD
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0CF
 	walk_down
@@ -264,7 +264,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0D7
 	delay_16
@@ -276,7 +276,7 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0E1
 	delay_16
@@ -289,118 +289,118 @@ MtChimney_Movement_15D03E:: @ 815D03E
 	delay_16
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815D0EC
 	lock_facing_direction
 	walk_fast_left
 	unlock_facing_direction
 	face_right
-	end_movement
+	step_end
 
 @ 815D0F1
 	walk_left
 	walk_in_place_fastest_right
 	delay_16
-	end_movement
+	step_end
 
 MtChimney_EventScript_15D0F5:: @ 815D0F5
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B36F1, 3
+	msgbox MtChimney_Text_1B36F1, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B40EA, 3
+	msgbox MtChimney_Text_1B40EA, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D0FE:: @ 815D0FE
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B372E, 3
+	msgbox MtChimney_Text_1B372E, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B4128, 3
+	msgbox MtChimney_Text_1B4128, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D107:: @ 815D107
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3778, 3
+	msgbox MtChimney_Text_1B3778, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B416E, 3
+	msgbox MtChimney_Text_1B416E, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D110:: @ 815D110
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
-	msgbox MtChimney_Text_1B3239, 6
+	trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
+	msgbox MtChimney_Text_1B3239, MSGBOX_AUTOCLOSE
 	.else
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
-	msgbox MtChimney_Text_1B3C07, 6
+	trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_1, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
+	msgbox MtChimney_Text_1B3C07, MSGBOX_AUTOCLOSE
 	.endif
 	end
 
 MtChimney_EventScript_15D127:: @ 815D127
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
-	msgbox MtChimney_Text_1B338D, 6
+	trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
+	msgbox MtChimney_Text_1B338D, MSGBOX_AUTOCLOSE
 	.else
-	trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
-	msgbox MtChimney_Text_1B3D3D, 6
+	trainerbattle_single TRAINER_MT_CHIMNEY_GRUNT_2, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
+	msgbox MtChimney_Text_1B3D3D, MSGBOX_AUTOCLOSE
 	.endif
 	end
 
 MtChimney_EventScript_15D13E:: @ 815D13E
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B33EA, 3
+	msgbox MtChimney_Text_1B33EA, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3D9A, 3
+	msgbox MtChimney_Text_1B3D9A, MSGBOX_SIGN
 	.endif
 	end
 
 @ 815D147
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3427, 3
+	msgbox MtChimney_Text_1B3427, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3DD6, 3
+	msgbox MtChimney_Text_1B3DD6, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D150:: @ 815D150
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3446, 3
+	msgbox MtChimney_Text_1B3446, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3DF5, 3
+	msgbox MtChimney_Text_1B3DF5, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D159:: @ 815D159
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3470, 3
+	msgbox MtChimney_Text_1B3470, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3E1F, 3
+	msgbox MtChimney_Text_1B3E1F, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D162:: @ 815D162
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B34C6, 3
+	msgbox MtChimney_Text_1B34C6, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3E7A, 3
+	msgbox MtChimney_Text_1B3E7A, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D16B:: @ 815D16B
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3503, 3
+	msgbox MtChimney_Text_1B3503, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B3EBA, 3
+	msgbox MtChimney_Text_1B3EBA, MSGBOX_SIGN
 	.endif
 	end
 
 MtChimney_EventScript_15D174:: @ 815D174
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B37B4, 3
+	msgbox MtChimney_Text_1B37B4, MSGBOX_SIGN
 	.else
-	msgbox MtChimney_Text_1B41B0, 3
+	msgbox MtChimney_Text_1B41B0, MSGBOX_SIGN
 	.endif
 	end
 
@@ -411,55 +411,55 @@ MtChimney_EventScript_15D17D:: @ 815D17D
 	msgbox MtChimney_Text_195870, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MtChimney_EventScript_15D1BC
-	msgbox MtChimney_Text_1958C6, 4
-	giveitem_std ITEM_METEORITE
+	msgbox MtChimney_Text_1958C6, MSGBOX_DEFAULT
+	giveitem ITEM_METEORITE
 	setflag FLAG_RECEIVED_METEORITE
 	releaseall
 	end
 
 MtChimney_EventScript_15D1BC:: @ 815D1BC
-	msgbox MtChimney_Text_1958FC, 4
+	msgbox MtChimney_Text_1958FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MtChimney_EventScript_15D1C6:: @ 815D1C6
-	msgbox MtChimney_Text_195920, 4
+	msgbox MtChimney_Text_195920, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MtChimney_EventScript_15D1D0:: @ 815D1D0
-	msgbox MtChimney_Text_195806, 4
+	msgbox MtChimney_Text_195806, MSGBOX_DEFAULT
 	releaseall
 	end
 
 MtChimney_EventScript_15D1DA:: @ 815D1DA
-	msgbox MtChimney_Text_19595C, 3
+	msgbox MtChimney_Text_19595C, MSGBOX_SIGN
 	end
 
 MtChimney_EventScript_15D1E3:: @ 815D1E3
-	trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
+	trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_19597F, MtChimney_Text_1959D8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MtChimney_EventScript_15D20A
-	msgbox MtChimney_Text_195A04, 6
+	msgbox MtChimney_Text_195A04, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_15D20A:: @ 815D20A
-	trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD
-	msgbox MtChimney_Text_195AD9, 6
+	trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_195A45, MtChimney_Text_195AAD
+	msgbox MtChimney_Text_195AD9, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_15D221:: @ 815D221
-	trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F
-	msgbox MtChimney_Text_195B84, 6
+	trainerbattle_single TRAINER_MELISSA, MtChimney_Text_195B1C, MtChimney_Text_195B5F
+	msgbox MtChimney_Text_195B84, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_15D238:: @ 815D238
-	trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9
-	msgbox MtChimney_Text_195C31, 6
+	trainerbattle_single TRAINER_SHEILA, MtChimney_Text_195BB2, MtChimney_Text_195BF9
+	msgbox MtChimney_Text_195C31, MSGBOX_AUTOCLOSE
 	end
 
 MtChimney_EventScript_15D24F:: @ 815D24F
-	trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F
-	msgbox MtChimney_Text_195D5C, 6
+	trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_195CD8, MtChimney_Text_195D2F
+	msgbox MtChimney_Text_195D5C, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index cf80ed39c..34ea0520b 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -1,6 +1,6 @@
 MtChimney_CableCarStation_MapScripts:: @ 815C0FA
-	map_script 3, MtChimney_CableCarStation_MapScript1_15C105
-	map_script 2, MtChimney_CableCarStation_MapScript2_15C11D
+	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_MapScript1_15C105
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_MapScript2_15C11D
 	.byte 0
 
 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105
@@ -19,7 +19,7 @@ MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D
 
 MtChimney_CableCarStation_EventScript_15C127:: @ 815C127
 	lockall
-	applymovement 255, MtChimney_CableCarStation_Movement_15C1B4
+	applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_15C1B4
 	applymovement 1, MtChimney_CableCarStation_Movement_15C1AA
 	waitmovement 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 0
@@ -39,10 +39,10 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B
 	end
 
 MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
-	msgbox MtChimney_CableCarStation_Text_1925A9, 4
+	msgbox MtChimney_CableCarStation_Text_1925A9, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, MtChimney_CableCarStation_Movement_15C1A5
-	applymovement 255, MtChimney_CableCarStation_Movement_15C1AF
+	applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_15C1AF
 	waitmovement 0
 	setvar VAR_0x8004, 1
 	setvar VAR_CABLE_CAR_STATION_STATE, 2
@@ -54,7 +54,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
 	end
 
 MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B
-	msgbox MtChimney_CableCarStation_Text_1925BF, 4
+	msgbox MtChimney_CableCarStation_Text_1925BF, MSGBOX_DEFAULT
 	release
 	end
 
@@ -63,25 +63,25 @@ MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5
 	walk_up
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA
 	delay_16
 	walk_right
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF
 	walk_up
 	walk_up
 	walk_up
 	delay_16
-	end_movement
+	step_end
 
 MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4
 	walk_down
 	walk_down
 	walk_down
 	delay_16
-	end_movement
+	step_end
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
index 3629c375f..8c2757f3a 100644
--- a/data/maps/MtPyre_1F/scripts.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -5,23 +5,23 @@ MtPyre_1F_EventScript_15D323:: @ 815D323
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352
-	msgbox MtPyre_1F_Text_196151, 4
-	giveitem_std ITEM_CLEANSE_TAG
+	msgbox MtPyre_1F_Text_196151, MSGBOX_DEFAULT
+	giveitem ITEM_CLEANSE_TAG
 	compare VAR_RESULT, 0
-	goto_if_eq MtPyre_1F_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CLEANSE_TAG
 	release
 	end
 
 MtPyre_1F_EventScript_15D352:: @ 815D352
-	msgbox MtPyre_1F_Text_1961CE, 4
+	msgbox MtPyre_1F_Text_1961CE, MSGBOX_DEFAULT
 	release
 	end
 
 MtPyre_1F_EventScript_15D35C:: @ 815D35C
-	msgbox MtPyre_1F_Text_196218, 2
+	msgbox MtPyre_1F_Text_196218, MSGBOX_NPC
 	end
 
 MtPyre_1F_EventScript_15D365:: @ 815D365
-	msgbox MtPyre_1F_Text_196283, 2
+	msgbox MtPyre_1F_Text_196283, MSGBOX_NPC
 	end
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index d2ef2894e..3a42c7d0d 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -1,7 +1,7 @@
 MtPyre_2F_MapScripts:: @ 815D36E
-	map_script 2, MtPyre_2F_MapScript2_1C6BB5
-	map_script 3, MtPyre_2F_MapScript1_1C6BBF
-	map_script 5, MtPyre_2F_MapScript1_15D37E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+	map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_15D37E
 	.byte 0
 
 MtPyre_2F_MapScript1_15D37E:: @ 815D37E
@@ -10,24 +10,24 @@ MtPyre_2F_MapScript1_15D37E:: @ 815D37E
 	end
 
 MtPyre_2F_EventScript_15D389:: @ 815D389
-	msgbox MtPyre_2F_Text_1965BB, 2
+	msgbox MtPyre_2F_Text_1965BB, MSGBOX_NPC
 	end
 
 MtPyre_2F_EventScript_15D392:: @ 815D392
-	msgbox MtPyre_2F_Text_196600, 2
+	msgbox MtPyre_2F_Text_196600, MSGBOX_NPC
 	end
 
 MtPyre_2F_EventScript_15D39B:: @ 815D39B
-	trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE
-	msgbox MtPyre_2F_Text_1966E7, 6
+	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE
+	msgbox MtPyre_2F_Text_1966E7, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_2F_EventScript_15D3B2:: @ 815D3B2
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB
-	msgbox MtPyre_2F_Text_196368, 6
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB
+	msgbox MtPyre_2F_Text_196368, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_2F_EventScript_15D3CD:: @ 815D3CD
-	trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539
-	msgbox MtPyre_2F_Text_196504, 6
+	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539
+	msgbox MtPyre_2F_Text_196504, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index 69a57df19..69410b4ae 100644
--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8
 	.byte 0
 
 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9
-	trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D
-	msgbox MtPyre_3F_Text_1967B5, 6
+	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D
+	msgbox MtPyre_3F_Text_1967B5, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_3F_EventScript_15D400:: @ 815D400
-	trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B
-	msgbox MtPyre_3F_Text_196842, 6
+	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B
+	msgbox MtPyre_3F_Text_196842, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc
index 3910d6f45..228e6f6c9 100644
--- a/data/maps/MtPyre_4F/scripts.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417
 	.byte 0
 
 MtPyre_4F_EventScript_15D418:: @ 815D418
-	trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0
-	msgbox MtPyre_4F_Text_1968EE, 6
+	trainerbattle_single TRAINER_ATSUSHI, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0
+	msgbox MtPyre_4F_Text_1968EE, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc
index 8cec3a32f..709a2f810 100644
--- a/data/maps/MtPyre_5F/scripts.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F
 	.byte 0
 
 MtPyre_5F_EventScript_15D430:: @ 815D430
-	trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997
-	msgbox MtPyre_5F_Text_1969AC, 6
+	trainerbattle_single TRAINER_TASHA, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997
+	msgbox MtPyre_5F_Text_1969AC, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index 5bf36092b..1a92d5b02 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -2,14 +2,14 @@ MtPyre_6F_MapScripts:: @ 815D447
 	.byte 0
 
 MtPyre_6F_EventScript_15D448:: @ 815D448
-	trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30
+	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq MtPyre_6F_EventScript_15D46F
-	msgbox MtPyre_6F_Text_196A4C, 6
+	msgbox MtPyre_6F_Text_196A4C, MSGBOX_AUTOCLOSE
 	end
 
 MtPyre_6F_EventScript_15D46F:: @ 815D46F
-	trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1
-	msgbox MtPyre_6F_Text_196AC9, 6
+	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1
+	msgbox MtPyre_6F_Text_196AC9, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index f8b4141d7..ab8c8475e 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -1,5 +1,5 @@
 MtPyre_Exterior_MapScripts:: @ 815D486
-	map_script 3, MtPyre_Exterior_MapScript1_15D48C
+	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_MapScript1_15D48C
 	.byte 0
 
 MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index 90e41c233..fc0776fb5 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -1,9 +1,9 @@
 MtPyre_Summit_MapScripts:: @ 815D4B1
-	map_script 3, MtPyre_Summit_MapScript1_15D4B7
+	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_MapScript1_15D4B7
 	.byte 0
 
 MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7
-	call MtPyre_Summit_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD
@@ -25,9 +25,9 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5
 	end
 
 MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
-	applymovement 255, MtPyre_Summit_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_1A0845
+	applymovement 2, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	compare VAR_0x8008, 0
@@ -37,19 +37,19 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_15D59F
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B52B0, 4
+	msgbox UnknownString_81B52B0, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B5EEC, 4
+	msgbox MtPyre_Summit_Text_1B5EEC, MSGBOX_DEFAULT
 	.endif
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 4
 	removeobject 5
 	removeobject 6
 	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
 	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	delay 20
 	call MtPyre_Summit_EventScript_15D57A
 	compare VAR_0x8008, 0
@@ -59,11 +59,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_15D5CA
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B53AB, 4
+	msgbox UnknownString_81B53AB, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B5FE6, 4
+	msgbox MtPyre_Summit_Text_1B5FE6, MSGBOX_DEFAULT
 	.endif
-	giveitem_std ITEM_RED_OR_BLUE_ORB
+	giveitem ITEM_RED_OR_BLUE_ORB
 	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
 	releaseall
 	end
@@ -93,7 +93,7 @@ MtPyre_Summit_EventScript_15D59F:: @ 815D59F
 MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA
 	applymovement 3, MtPyre_Summit_Movement_15D5DF
 	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -105,7 +105,7 @@ MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF
 MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA
 	applymovement 3, MtPyre_Summit_Movement_15D5E5
 	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -113,27 +113,27 @@ MtPyre_Summit_Movement_15D5DF:: @ 815D5DF
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D5E3:: @ 815D5E3
 	walk_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D5E5:: @ 815D5E5
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D5E9:: @ 815D5E9
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D5EC:: @ 815D5EC
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 	lock
@@ -152,17 +152,17 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
 
 MtPyre_Summit_EventScript_15D611:: @ 815D611
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5992, 4
+	msgbox UnknownString_81B5992, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B65D6, 4
+	msgbox MtPyre_Summit_Text_1B65D6, MSGBOX_DEFAULT
 	.endif
 	return
 
 MtPyre_Summit_EventScript_15D61A:: @ 815D61A
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5BD7, 4
+	msgbox UnknownString_81B5BD7, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B6823, 4
+	msgbox MtPyre_Summit_Text_1B6823, MSGBOX_DEFAULT
 	.endif
 	return
 
@@ -173,9 +173,9 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A
 	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B54BE, 4
+	msgbox UnknownString_81B54BE, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B60F9, 4
+	msgbox MtPyre_Summit_Text_1B60F9, MSGBOX_DEFAULT
 	.endif
 	release
 	end
@@ -194,18 +194,18 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 
 MtPyre_Summit_EventScript_15D669:: @ 815D669
 	setvar VAR_0x8004, ITEM_RED_OR_BLUE_ORB
-	call MtPyre_Summit_EventScript_1A067F
+	call Common_EventScript_PlayerHandedOverTheItem
 	closemessage
-	applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0841
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 40
-	applymovement VAR_LAST_TALKED, MtPyre_Summit_Movement_1A0839
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 10
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5762, 4
+	msgbox UnknownString_81B5762, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B639C, 4
+	msgbox MtPyre_Summit_Text_1B639C, MSGBOX_DEFAULT
 	.endif
 	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
@@ -225,18 +225,18 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B
 
 MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5540, 4
+	msgbox UnknownString_81B5540, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B617B, 4
+	msgbox MtPyre_Summit_Text_1B617B, MSGBOX_DEFAULT
 	.endif
 	release
 	end
 
 MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B57BE, 4
+	msgbox UnknownString_81B57BE, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B63F8, 4
+	msgbox MtPyre_Summit_Text_1B63F8, MSGBOX_DEFAULT
 	.endif
 	release
 	end
@@ -260,9 +260,9 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6
 	end
 
 MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
-	applymovement 255, MtPyre_Summit_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_1A0845
+	applymovement 2, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	compare VAR_0x8008, 0
@@ -272,9 +272,9 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
 	compare VAR_0x8008, 2
 	call_if_eq MtPyre_Summit_EventScript_15D774
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5BFC, 4
+	msgbox UnknownString_81B5BFC, MSGBOX_DEFAULT
 	.else
-	msgbox MtPyre_Summit_Text_1B6848, 4
+	msgbox MtPyre_Summit_Text_1B6848, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	compare VAR_0x8008, 0
@@ -321,15 +321,15 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795
 MtPyre_Summit_Movement_15D7A0:: @ 815D7A0
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D7A3:: @ 815D7A3
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D7A4:: @ 815D7A4
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D7A7:: @ 815D7A7
 	walk_right
@@ -340,7 +340,7 @@ MtPyre_Summit_Movement_15D7A7:: @ 815D7A7
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D7B0:: @ 815D7B0
 	walk_right
@@ -351,7 +351,7 @@ MtPyre_Summit_Movement_15D7B0:: @ 815D7B0
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 MtPyre_Summit_Movement_15D7B9:: @ 815D7B9
 	walk_left
@@ -362,4 +362,4 @@ MtPyre_Summit_Movement_15D7B9:: @ 815D7B9
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index b954c69c8..ecc52cfa0 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -1,6 +1,6 @@
 NewMauville_Entrance_MapScripts:: @ 815E48A
-	map_script 1, NewMauville_Entrance_MapScript1_15E495
-	map_script 3, NewMauville_Entrance_MapScript1_15E4D8
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_MapScript1_15E495
+	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_MapScript1_15E4D8
 	.byte 0
 
 NewMauville_Entrance_MapScript1_15E495:: @ 815E495
@@ -23,16 +23,16 @@ NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8
 
 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC
 	lockall
-	applymovement 255, NewMauville_Entrance_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox NewMauville_Entrance_Text_1982C0, 4
+	msgbox NewMauville_Entrance_Text_1982C0, MSGBOX_DEFAULT
 	checkitem ITEM_BASEMENT_KEY, 1
 	compare VAR_RESULT, 0
 	goto_if_eq NewMauville_Entrance_EventScript_15E55D
 	msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq NewMauville_Entrance_EventScript_15E55D
-	msgbox NewMauville_Entrance_Text_1982EA, 4
+	msgbox NewMauville_Entrance_Text_1982EA, MSGBOX_DEFAULT
 	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile0, 0
 	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile1, 0
 	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Open_Tile2, 0
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index d995b1f69..d8744cd87 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -1,7 +1,7 @@
 NewMauville_Inside_MapScripts:: @ 815E55F
-	map_script 5, NewMauville_Inside_MapScript1_15E56F
-	map_script 3, NewMauville_Inside_MapScript1_15E593
-	map_script 1, NewMauville_Inside_MapScript1_15E59E
+	map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_MapScript1_15E56F
+	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_MapScript1_15E593
+	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_MapScript1_15E59E
 	.byte 0
 
 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F
@@ -128,7 +128,7 @@ NewMauville_Inside_EventScript_15E728:: @ 815E728
 
 NewMauville_Inside_EventScript_15E876:: @ 815E876
 	lockall
-	msgbox NewMauville_Inside_Text_1983B1, 4
+	msgbox NewMauville_Inside_Text_1983B1, MSGBOX_DEFAULT
 	call NewMauville_Inside_EventScript_15E88B
 	setvar VAR_NEW_MAUVILLE_STATE, 2
 	releaseall
@@ -151,12 +151,12 @@ NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0
 	lockall
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq NewMauville_Inside_EventScript_15E8F6
-	msgbox NewMauville_Inside_Text_198315, 4
+	msgbox NewMauville_Inside_Text_198315, MSGBOX_DEFAULT
 	releaseall
 	end
 
 NewMauville_Inside_EventScript_15E8F6:: @ 815E8F6
-	msgbox NewMauville_Inside_Text_198395, 4
+	msgbox NewMauville_Inside_Text_198395, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/OldaleTown/map.json b/data/maps/OldaleTown/map.json
index 103d384a7..45b3ce38a 100644
--- a/data/maps/OldaleTown/map.json
+++ b/data/maps/OldaleTown/map.json
@@ -163,7 +163,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -171,7 +171,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -179,7 +179,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -187,7 +187,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "OldaleTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     }
   ]
 }
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index ad30b2014..ba3a1868e 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -1,9 +1,9 @@
 OldaleTown_MapScripts:: @ 814DD62
-	map_script 3, OldaleTown_MapScript1_14DD68
+	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_MapScript1_14DD68
 	.byte 0
 
 OldaleTown_MapScript1_14DD68:: @ 814DD68
-	call OldaleTown_EventScript_1A014E
+	call Common_EventScript_SetupRivalGfxId
 	setflag FLAG_VISITED_OLDALE_TOWN
 	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
 	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
@@ -25,11 +25,11 @@ OldaleTown_EventScript_14DD9E:: @ 814DD9E
 	return
 
 OldaleTown_EventScript_14DDAA:: @ 814DDAA
-	msgbox OldaleTown_Text_16B20E, 3
+	msgbox OldaleTown_Text_16B20E, MSGBOX_SIGN
 	end
 
 OldaleTown_EventScript_14DDB3:: @ 814DDB3
-	msgbox OldaleTown_Text_16AEC0, 2
+	msgbox OldaleTown_Text_16AEC0, MSGBOX_NPC
 	end
 
 OldaleTown_EventScript_14DDBC:: @ 814DDBC
@@ -39,7 +39,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
 	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
 	setflag FLAG_TEMP_1
 	playbgm MUS_TSURETEK, FALSE
-	msgbox OldaleTown_Text_16AEF2, 4
+	msgbox OldaleTown_Text_16AEF2, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
 	case 1, OldaleTown_EventScript_14DE07
@@ -49,43 +49,43 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
 
 OldaleTown_EventScript_14DE07:: @ 814DE07
 	applymovement 2, OldaleTown_Movement_14DE97
-	applymovement 255, OldaleTown_Movement_14DEC1
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEC1
 	waitmovement 0
 	goto OldaleTown_EventScript_14DE4C
 	end
 
 OldaleTown_EventScript_14DE1E:: @ 814DE1E
 	applymovement 2, OldaleTown_Movement_14DEA2
-	applymovement 255, OldaleTown_Movement_14DECB
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DECB
 	waitmovement 0
 	goto OldaleTown_EventScript_14DE4C
 	end
 
 OldaleTown_EventScript_14DE35:: @ 814DE35
-	applymovement 255, OldaleTown_Movement_14DEB9
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DEB9
 	applymovement 2, OldaleTown_Movement_14DE8E
 	waitmovement 0
 	goto OldaleTown_EventScript_14DE4C
 	end
 
 OldaleTown_EventScript_14DE4C:: @ 814DE4C
-	msgbox OldaleTown_Text_16AF2F, 4
-	giveitem_std ITEM_POTION
+	msgbox OldaleTown_Text_16AF2F, MSGBOX_DEFAULT
+	giveitem ITEM_POTION
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_EventScript_14DE83
-	msgbox OldaleTown_Text_16AFE1, 4
+	msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_POTION_OLDALE
 	fadedefaultbgm
 	release
 	end
 
 OldaleTown_EventScript_14DE79:: @ 814DE79
-	msgbox OldaleTown_Text_16AFE1, 4
+	msgbox OldaleTown_Text_16AFE1, MSGBOX_DEFAULT
 	release
 	end
 
 OldaleTown_EventScript_14DE83:: @ 814DE83
-	msgbox OldaleTown_Text_1A0CC2, 4
+	msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
 	fadedefaultbgm
 	release
 	end
@@ -99,7 +99,7 @@ OldaleTown_Movement_14DE8E:: @ 814DE8E
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DE97:: @ 814DE97
 	walk_left
@@ -112,7 +112,7 @@ OldaleTown_Movement_14DE97:: @ 814DE97
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DEA2:: @ 814DEA2
 	walk_up
@@ -123,7 +123,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 @ 814DEAB
 	walk_up
@@ -139,7 +139,7 @@ OldaleTown_Movement_14DEA2:: @ 814DEA2
 	walk_up
 	delay_8
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DEB9:: @ 814DEB9
 	walk_right
@@ -149,7 +149,7 @@ OldaleTown_Movement_14DEB9:: @ 814DEB9
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DEC1:: @ 814DEC1
 	delay_16
@@ -161,7 +161,7 @@ OldaleTown_Movement_14DEC1:: @ 814DEC1
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DECB:: @ 814DECB
 	walk_up
@@ -171,7 +171,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 @ 814DED3
 	walk_left
@@ -185,25 +185,25 @@ OldaleTown_Movement_14DECB:: @ 814DECB
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	lock
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
-	msgbox OldaleTown_Text_16B0CC, 4
+	msgbox OldaleTown_Text_16B0CC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, OldaleTown_Movement_1A083D
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 OldaleTown_EventScript_14DEFF:: @ 814DEFF
 	lockall
-	applymovement 255, OldaleTown_Movement_14DFEC
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_14DFEC
 	applymovement 3, OldaleTown_Movement_14DFEF
 	waitmovement 0
-	msgbox OldaleTown_Text_16B045, 4
+	msgbox OldaleTown_Text_16B045, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, OldaleTown_Movement_14DFF5
 	waitmovement 0
@@ -211,13 +211,13 @@ OldaleTown_EventScript_14DEFF:: @ 814DEFF
 	end
 
 OldaleTown_EventScript_14DF26:: @ 814DF26
-	msgbox OldaleTown_Text_16B12A, 4
+	msgbox OldaleTown_Text_16B12A, MSGBOX_DEFAULT
 	release
 	end
 
 OldaleTown_EventScript_14DF30:: @ 814DF30
 	lockall
-	applymovement 4, OldaleTown_Movement_1A0839
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	goto OldaleTown_EventScript_14DF92
 	end
@@ -226,7 +226,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41
 	lockall
 	applymovement 4, OldaleTown_Movement_14DFDE
 	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto OldaleTown_EventScript_14DF92
 	end
@@ -235,7 +235,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C
 	lockall
 	applymovement 4, OldaleTown_Movement_14DFE1
 	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto OldaleTown_EventScript_14DF92
 	end
@@ -244,7 +244,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77
 	lockall
 	applymovement 4, OldaleTown_Movement_14DFE3
 	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto OldaleTown_EventScript_14DF92
 	end
@@ -258,12 +258,12 @@ OldaleTown_EventScript_14DF92:: @ 814DF92
 	end
 
 OldaleTown_EventScript_14DFAA:: @ 814DFAA
-	msgbox OldaleTown_Text_16B196, 4
+	msgbox OldaleTown_Text_16B196, MSGBOX_DEFAULT
 	goto OldaleTown_EventScript_14DFC6
 	end
 
 OldaleTown_EventScript_14DFB8:: @ 814DFB8
-	msgbox OldaleTown_Text_16B1BE, 4
+	msgbox OldaleTown_Text_16B1BE, MSGBOX_DEFAULT
 	goto OldaleTown_EventScript_14DFC6
 	end
 
@@ -280,15 +280,15 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6
 OldaleTown_Movement_14DFDE:: @ 814DFDE
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFE1:: @ 814DFE1
 	walk_left
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFE3:: @ 814DFE3
 	face_left
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFE5:: @ 814DFE5
 	walk_down
@@ -297,12 +297,12 @@ OldaleTown_Movement_14DFE5:: @ 814DFE5
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFEC:: @ 814DFEC
 	delay_8
 	walk_right
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFEF:: @ 814DFEF
 	walk_fast_up
@@ -310,9 +310,9 @@ OldaleTown_Movement_14DFEF:: @ 814DFEF
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
-	end_movement
+	step_end
 
 OldaleTown_Movement_14DFF5:: @ 814DFF5
 	walk_down
 	walk_left
-	end_movement
+	step_end
diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc
index 1e519a737..96cc583a5 100644
--- a/data/maps/OldaleTown_House1/scripts.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
@@ -2,5 +2,5 @@ OldaleTown_House1_MapScripts:: @ 8152EEB
 	.byte 0
 
 OldaleTown_House1_EventScript_152EEC:: @ 8152EEC
-	msgbox OldaleTown_House1_Text_17476D, 2
+	msgbox OldaleTown_House1_Text_17476D, MSGBOX_NPC
 	end
diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc
index 57a9ab8ac..a8679e59f 100644
--- a/data/maps/OldaleTown_House2/scripts.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
@@ -2,9 +2,9 @@ OldaleTown_House2_MapScripts:: @ 8152EF5
 	.byte 0
 
 OldaleTown_House2_EventScript_152EF6:: @ 8152EF6
-	msgbox OldaleTown_House2_Text_174838, 2
+	msgbox OldaleTown_House2_Text_174838, MSGBOX_NPC
 	end
 
 OldaleTown_House2_EventScript_152EFF:: @ 8152EFF
-	msgbox OldaleTown_House2_Text_17487B, 2
+	msgbox OldaleTown_House2_Text_17487B, MSGBOX_NPC
 	end
diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 15cf40027..4edec1843 100644
--- a/data/maps/OldaleTown_Mart/scripts.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
@@ -4,11 +4,11 @@ OldaleTown_Mart_MapScripts:: @ 8152F78
 OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	lock
 	faceplayer
-	message OldaleTown_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8
 	pokemart OldaleTown_Mart_Items1
-	msgbox OldaleTown_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -24,7 +24,7 @@ OldaleTown_Mart_Items1:: @ 8152F9C
 
 OldaleTown_Mart_EventScript_152FA8:: @ 8152FA8
 	pokemart OldaleTown_Mart_Items2
-	msgbox OldaleTown_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -43,15 +43,15 @@ OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6
 	lock
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB
-	msgbox OldaleTown_Mart_Text_174A8A, 4
+	msgbox OldaleTown_Mart_Text_174A8A, MSGBOX_DEFAULT
 	release
 	end
 
 OldaleTown_Mart_EventScript_152FDB:: @ 8152FDB
-	msgbox OldaleTown_Mart_Text_174ACB, 4
+	msgbox OldaleTown_Mart_Text_174ACB, MSGBOX_DEFAULT
 	release
 	end
 
 OldaleTown_Mart_EventScript_152FE5:: @ 8152FE5
-	msgbox OldaleTown_Mart_Text_174B10, 2
+	msgbox OldaleTown_Mart_Text_174B10, MSGBOX_NPC
 	end
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index a3f05e593..c91239d86 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -1,37 +1,37 @@
 OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08
-	map_script 3, OldaleTown_PokemonCenter_1F_MapScript1_152F0E
+	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_MapScript1_152F0E
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E
 	setrespawn HEAL_LOCATION_OLDALE_TOWN
-	call OldaleTown_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17
 	setvar VAR_0x800B, 1
-	call OldaleTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_152F25:: @ 8152F25
-	msgbox OldaleTown_PokemonCenter_1F_Text_1748D1, 2
+	msgbox OldaleTown_PokemonCenter_1F_Text_1748D1, MSGBOX_NPC
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E
-	msgbox OldaleTown_PokemonCenter_1F_Text_174945, 2
+	msgbox OldaleTown_PokemonCenter_1F_Text_174945, MSGBOX_NPC
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C
-	msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4
+	msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, MSGBOX_DEFAULT
 	release
 	end
 
 OldaleTown_PokemonCenter_1F_EventScript_152F4C:: @ 8152F4C
-	msgbox OldaleTown_PokemonCenter_1F_Text_174A2E, 4
+	msgbox OldaleTown_PokemonCenter_1F_Text_174A2E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 622f50c29..b309c1548 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 OldaleTown_PokemonCenter_2F_MapScripts:: @ 8152F56
-	map_script 2, OldaleTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, OldaleTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, OldaleTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, OldaleTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, OldaleTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 OldaleTown_PokemonCenter_2F_EventScript_152F66:: @ 8152F66
diff --git a/data/maps/PacifidlogTown/map.json b/data/maps/PacifidlogTown/map.json
index 19d9ee42c..50e30456b 100644
--- a/data/maps/PacifidlogTown/map.json
+++ b/data/maps/PacifidlogTown/map.json
@@ -114,7 +114,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PacifidlogTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -130,7 +130,7 @@
       "y": 15,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PacifidlogTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     }
   ]
 }
diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc
index d7ac80a0a..4c77ce15b 100644
--- a/data/maps/PacifidlogTown/scripts.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
@@ -1,6 +1,6 @@
 PacifidlogTown_MapScripts:: @ 814E8EE
-	map_script 3, PacifidlogTown_MapScript1_14E8F9
-	map_script 5, PacifidlogTown_MapScript1_14E8FD
+	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_MapScript1_14E8F9
+	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_MapScript1_14E8FD
 	.byte 0
 
 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9
@@ -12,17 +12,17 @@ PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD
 	end
 
 PacifidlogTown_EventScript_14E900:: @ 814E900
-	msgbox PacifidlogTown_Text_16D04A, 2
+	msgbox PacifidlogTown_Text_16D04A, MSGBOX_NPC
 	end
 
 PacifidlogTown_EventScript_14E909:: @ 814E909
-	msgbox PacifidlogTown_Text_16CFC5, 2
+	msgbox PacifidlogTown_Text_16CFC5, MSGBOX_NPC
 	end
 
 PacifidlogTown_EventScript_14E912:: @ 814E912
-	msgbox PacifidlogTown_Text_16D08A, 2
+	msgbox PacifidlogTown_Text_16D08A, MSGBOX_NPC
 	end
 
 PacifidlogTown_EventScript_14E91B:: @ 814E91B
-	msgbox PacifidlogTown_Text_16D0CE, 3
+	msgbox PacifidlogTown_Text_16D0CE, MSGBOX_SIGN
 	end
diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index 4b3586a16..eb0d30057 100644
--- a/data/maps/PacifidlogTown_House1/scripts.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
@@ -2,9 +2,9 @@ PacifidlogTown_House1_MapScripts:: @ 8154154
 	.byte 0
 
 PacifidlogTown_House1_EventScript_154155:: @ 8154155
-	msgbox PacifidlogTown_House1_Text_178F9F, 2
+	msgbox PacifidlogTown_House1_Text_178F9F, MSGBOX_NPC
 	end
 
 PacifidlogTown_House1_EventScript_15415E:: @ 815415E
-	msgbox PacifidlogTown_House1_Text_17906A, 2
+	msgbox PacifidlogTown_House1_Text_17906A, MSGBOX_NPC
 	end
diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 5798680bd..8e20d83a6 100644
--- a/data/maps/PacifidlogTown_House2/scripts.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
@@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8154167
 PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	call PacifidlogTown_House2_EventScript_1541B4
 	goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254
 	call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE
@@ -20,19 +20,19 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168
 	end
 
 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4
-	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC
+	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_Return
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare VAR_RESULT, 0
 	call_if_eq PacifidlogTown_House2_EventScript_1541E8
 	return
 
 PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE
-	msgbox PacifidlogTown_House2_Text_179155, 4
+	msgbox PacifidlogTown_House2_Text_179155, MSGBOX_DEFAULT
 	return
 
 PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7
-	msgbox PacifidlogTown_House2_Text_1790C1, 4
-	msgbox PacifidlogTown_House2_Text_179155, 4
+	msgbox PacifidlogTown_House2_Text_1790C1, MSGBOX_DEFAULT
+	msgbox PacifidlogTown_House2_Text_179155, MSGBOX_DEFAULT
 	return
 
 PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8
@@ -40,36 +40,36 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8
 	return
 
 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC
-	msgbox PacifidlogTown_House2_Text_179169, 4
-	giveitem_std ITEM_TM27_RETURN
+	msgbox PacifidlogTown_House2_Text_179169, MSGBOX_DEFAULT
+	giveitem ITEM_TM27_RETURN
 	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
-	msgbox PacifidlogTown_House2_Text_179283, 4
+	msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House2_EventScript_15421B:: @ 815421B
-	msgbox PacifidlogTown_House2_Text_1791CA, 4
+	msgbox PacifidlogTown_House2_Text_1791CA, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House2_EventScript_154225:: @ 8154225
-	msgbox PacifidlogTown_House2_Text_17922D, 4
-	giveitem_std ITEM_TM21_FRUSTRATION
+	msgbox PacifidlogTown_House2_Text_17922D, MSGBOX_DEFAULT
+	giveitem ITEM_TM21_FRUSTRATION
 	compare VAR_RESULT, 0
-	goto_if_eq PacifidlogTown_House2_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	special SetPacifidlogTMReceivedDay
-	msgbox PacifidlogTown_House2_Text_179283, 4
+	msgbox PacifidlogTown_House2_Text_179283, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House2_EventScript_154254:: @ 8154254
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	buffernumberstring 0, VAR_RESULT
-	msgbox PacifidlogTown_House2_Text_1792F2, 4
+	msgbox PacifidlogTown_House2_Text_1792F2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -78,9 +78,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 0
-	msgbox PacifidlogTown_House2_Text_17938B, 4
+	msgbox PacifidlogTown_House2_Text_17938B, MSGBOX_DEFAULT
 	waitmoncry
-	msgbox PacifidlogTown_House2_Text_17939B, 4
+	msgbox PacifidlogTown_House2_Text_17939B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -89,8 +89,8 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZURILL, 2
-	msgbox PacifidlogTown_House2_Text_1793CC, 4
+	msgbox PacifidlogTown_House2_Text_1793CC, MSGBOX_DEFAULT
 	waitmoncry
-	msgbox PacifidlogTown_House2_Text_1793DD, 4
+	msgbox PacifidlogTown_House2_Text_1793DD, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 055287bfb..fdb64f50a 100644
--- a/data/maps/PacifidlogTown_House3/scripts.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
@@ -28,27 +28,27 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E
 	special DoInGameTradeScene
 	waitstate
 	bufferspeciesname 0, VAR_0x8009
-	msgbox PacifidlogTown_House3_Text_1794C4, 4
+	msgbox PacifidlogTown_House3_Text_1794C4, MSGBOX_DEFAULT
 	setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED
 	release
 	end
 
 PacifidlogTown_House3_EventScript_154320:: @ 8154320
-	msgbox PacifidlogTown_House3_Text_1794ED, 4
+	msgbox PacifidlogTown_House3_Text_1794ED, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House3_EventScript_15432A:: @ 815432A
 	bufferspeciesname 0, VAR_0x8009
-	msgbox PacifidlogTown_House3_Text_1794DF, 4
+	msgbox PacifidlogTown_House3_Text_1794DF, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House3_EventScript_154338:: @ 8154338
-	msgbox PacifidlogTown_House3_Text_17950A, 4
+	msgbox PacifidlogTown_House3_Text_17950A, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House3_EventScript_154342:: @ 8154342
-	msgbox PacifidlogTown_House3_Text_179541, 2
+	msgbox PacifidlogTown_House3_Text_179541, MSGBOX_NPC
 	end
diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index 84a477156..f8e0d6e26 100644
--- a/data/maps/PacifidlogTown_House4/scripts.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
@@ -2,11 +2,11 @@ PacifidlogTown_House4_MapScripts:: @ 815434B
 	.byte 0
 
 PacifidlogTown_House4_EventScript_15434C:: @ 815434C
-	msgbox PacifidlogTown_House4_Text_17961F, 2
+	msgbox PacifidlogTown_House4_Text_17961F, MSGBOX_NPC
 	end
 
 PacifidlogTown_House4_EventScript_154355:: @ 8154355
-	msgbox PacifidlogTown_House4_Text_17959B, 2
+	msgbox PacifidlogTown_House4_Text_17959B, MSGBOX_NPC
 	end
 
 PacifidlogTown_House4_EventScript_15435E:: @ 815435E
@@ -20,11 +20,11 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E
 	end
 
 PacifidlogTown_House4_EventScript_15437F:: @ 815437F
-	msgbox PacifidlogTown_House4_Text_179656, 4
+	msgbox PacifidlogTown_House4_Text_179656, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House4_EventScript_154389:: @ 8154389
-	msgbox PacifidlogTown_House4_Text_17968C, 4
+	msgbox PacifidlogTown_House4_Text_17968C, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index 8c24cddcb..2219e51b8 100644
--- a/data/maps/PacifidlogTown_House5/scripts.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
@@ -7,15 +7,15 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394
 	specialvar VAR_RESULT, IsMirageIslandPresent
 	compare VAR_RESULT, 1
 	goto_if_eq PacifidlogTown_House5_EventScript_1543B0
-	msgbox PacifidlogTown_House5_Text_179718, 4
+	msgbox PacifidlogTown_House5_Text_179718, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House5_EventScript_1543B0:: @ 81543B0
-	msgbox PacifidlogTown_House5_Text_17973B, 4
+	msgbox PacifidlogTown_House5_Text_17973B, MSGBOX_DEFAULT
 	release
 	end
 
 PacifidlogTown_House5_EventScript_1543BA:: @ 81543BA
-	msgbox PacifidlogTown_House5_Text_179765, 2
+	msgbox PacifidlogTown_House5_Text_179765, MSGBOX_NPC
 	end
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index e5756cd71..287349c78 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF
-	map_script 3, PacifidlogTown_PokemonCenter_1F_MapScript1_154105
+	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_MapScript1_154105
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
@@ -8,20 +8,20 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
 
 @ 8154109
 	setvar VAR_0x800B, 1
-	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 PacifidlogTown_PokemonCenter_1F_EventScript_154117:: @ 8154117
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_178E47, 2
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_178E47, MSGBOX_NPC
 	end
 
 PacifidlogTown_PokemonCenter_1F_EventScript_154120:: @ 8154120
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_178E79, 2
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_178E79, MSGBOX_NPC
 	end
 
 PacifidlogTown_PokemonCenter_1F_EventScript_154129:: @ 8154129
-	msgbox PacifidlogTown_PokemonCenter_1F_Text_178ED9, 2
+	msgbox PacifidlogTown_PokemonCenter_1F_Text_178ED9, MSGBOX_NPC
 	end
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 2bff37736..3fd5bad3b 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8154132
-	map_script 2, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PacifidlogTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, PacifidlogTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 @ 8154142
diff --git a/data/maps/PetalburgCity/map.json b/data/maps/PetalburgCity/map.json
index 7e0462022..aaddb65cb 100644
--- a/data/maps/PetalburgCity/map.json
+++ b/data/maps/PetalburgCity/map.json
@@ -237,7 +237,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PetalburgCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -245,7 +245,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PetalburgCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -261,7 +261,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PetalburgCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -269,7 +269,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "PetalburgCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index fee198977..7c02a67f7 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -1,6 +1,6 @@
 PetalburgCity_MapScripts:: @ 814B70C
-	map_script 3, PetalburgCity_MapScript1_14B717
-	map_script 2, PetalburgCity_MapScript2_14B73D
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_MapScript1_14B717
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_MapScript2_14B73D
 	.byte 0
 
 PetalburgCity_MapScript1_14B717:: @ 814B717
@@ -29,20 +29,21 @@ PetalburgCity_EventScript_14B747:: @ 814B747
 	special SavePlayerParty
 	special PutZigzagoonInPlayerParty
 	applymovement 2, PetalburgCity_Movement_14B7ED
-	applymovement 255, PetalburgCity_Movement_14B7CC
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14B7CC
 	waitmovement 0
-	msgbox PetalburgCity_Text_16D361, 4
+	msgbox PetalburgCity_Text_16D361, MSGBOX_DEFAULT
 	special ScrSpecial_StartWallyTutorialBattle
 	waitstate
-	msgbox PetalburgCity_Text_16D3DE, 4
-	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
-	waitmovement 0, 0, 2
-	msgbox PetalburgCity_Text_16D408, 4
+	msgbox PetalburgCity_Text_16D3DE, MSGBOX_DEFAULT
+	applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
+	@ Local id and map num were swapped here (0, 0, 2 vs 2, 0, 0). Fixed to waitmovement 2, MAP_PETALBURG_CITY in Emerald
+	waitmovement 0, MAP_MAUVILLE_CITY
+	msgbox PetalburgCity_Text_16D408, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_SPECIAL_FLAG_0
 	setvar VAR_PETALBURG_STATE, 3
 	fadedefaultbgm
-	clearflag FLAG_SPECIAL_FLAG_1
+	clearflag FLAG_DONT_TRANSITION_MUSIC
 	special LoadPlayerParty
 	setvar VAR_PETALBURG_GYM_STATE, 1
 	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
@@ -53,15 +54,15 @@ PetalburgCity_EventScript_14B747:: @ 814B747
 PetalburgCity_EventScript_14B7AC:: @ 814B7AC
 	lock
 	faceplayer
-	msgbox PetalburgCity_Text_164490, 4
+	msgbox PetalburgCity_Text_164490, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, PetalburgCity_Movement_1A083D
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 PetalburgCity_EventScript_14B7C3:: @ 814B7C3
-	msgbox PetalburgCity_Text_16433E, 2
+	msgbox PetalburgCity_Text_16433E, MSGBOX_NPC
 	end
 
 PetalburgCity_Movement_14B7CC:: @ 814B7CC
@@ -97,7 +98,7 @@ PetalburgCity_Movement_14B7CC:: @ 814B7CC
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B7ED:: @ 814B7ED
 	delay_8
@@ -136,22 +137,22 @@ PetalburgCity_Movement_14B7ED:: @ 814B7ED
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 PetalburgCity_EventScript_14B812:: @ 814B812
-	msgbox PetalburgCity_Text_1645BB, 3
+	msgbox PetalburgCity_Text_1645BB, MSGBOX_SIGN
 	end
 
 PetalburgCity_EventScript_14B81B:: @ 814B81B
-	msgbox PetalburgCity_Text_164602, 3
+	msgbox PetalburgCity_Text_164602, MSGBOX_SIGN
 	end
 
 PetalburgCity_EventScript_14B824:: @ 814B824
-	msgbox PetalburgCity_Text_16453F, 2
+	msgbox PetalburgCity_Text_16453F, MSGBOX_NPC
 	end
 
 PetalburgCity_EventScript_14B82D:: @ 814B82D
-	msgbox PetalburgCity_Text_164634, 3
+	msgbox PetalburgCity_Text_164634, MSGBOX_SIGN
 	end
 
 PetalburgCity_EventScript_14B836:: @ 814B836
@@ -179,13 +180,13 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A
 	end
 
 PetalburgCity_EventScript_14B866:: @ 814B866
-	applymovement 9, PetalburgCity_Movement_1A0839
+	applymovement 9, Common_Movement_FacePlayer
 	waitmovement 0
 	playbgm MUS_TSURETEK, FALSE
 	playse SE_PIN
-	applymovement 9, PetalburgCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_EventScript_14B91B
@@ -195,7 +196,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 	call_if_eq PetalburgCity_EventScript_14B93B
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_EventScript_14B950
-	msgbox PetalburgCity_Text_16438A, 4
+	msgbox PetalburgCity_Text_16438A, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_EventScript_14B965
@@ -205,11 +206,11 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 	call_if_eq PetalburgCity_EventScript_14B989
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_EventScript_14B99B
-	msgbox PetalburgCity_Text_164426, 4
-	applymovement 9, PetalburgCity_Movement_1A0843
-	applymovement 255, PetalburgCity_Movement_1A0843
+	msgbox PetalburgCity_Text_164426, MSGBOX_DEFAULT
+	applymovement 9, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox PetalburgCity_Text_164449, 4
+	msgbox PetalburgCity_Text_164449, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, PetalburgCity_Movement_14B9F4
 	waitmovement 0
@@ -220,7 +221,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 PetalburgCity_EventScript_14B91B:: @ 814B91B
 	applymovement 9, PetalburgCity_Movement_14B9B1
 	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -232,38 +233,38 @@ PetalburgCity_EventScript_14B930:: @ 814B930
 PetalburgCity_EventScript_14B93B:: @ 814B93B
 	applymovement 9, PetalburgCity_Movement_14B9B9
 	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_14B950:: @ 814B950
 	applymovement 9, PetalburgCity_Movement_14B9BE
 	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_14B965:: @ 814B965
 	applymovement 9, PetalburgCity_Movement_14B9C4
-	applymovement 255, PetalburgCity_Movement_14BA01
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA01
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_14B977:: @ 814B977
 	applymovement 9, PetalburgCity_Movement_14B9CF
-	applymovement 255, PetalburgCity_Movement_14BA0B
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA0B
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_14B989:: @ 814B989
 	applymovement 9, PetalburgCity_Movement_14B9DD
-	applymovement 255, PetalburgCity_Movement_14BA18
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA18
 	waitmovement 0
 	return
 
 PetalburgCity_EventScript_14B99B:: @ 814B99B
 	applymovement 9, PetalburgCity_Movement_14B9E8
-	applymovement 255, PetalburgCity_Movement_14BA22
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_14BA22
 	waitmovement 0
 	return
 
@@ -271,26 +272,26 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B
 	delay_16
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9B1:: @ 814B9B1
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9B6:: @ 814B9B6
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9B9:: @ 814B9B9
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9BE:: @ 814B9BE
 	walk_down
@@ -298,7 +299,7 @@ PetalburgCity_Movement_14B9BE:: @ 814B9BE
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9C4:: @ 814B9C4
 	walk_right
@@ -311,7 +312,7 @@ PetalburgCity_Movement_14B9C4:: @ 814B9C4
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9CF:: @ 814B9CF
 	walk_down
@@ -327,7 +328,7 @@ PetalburgCity_Movement_14B9CF:: @ 814B9CF
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9DD:: @ 814B9DD
 	walk_right
@@ -340,7 +341,7 @@ PetalburgCity_Movement_14B9DD:: @ 814B9DD
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9E8:: @ 814B9E8
 	walk_right
@@ -354,7 +355,7 @@ PetalburgCity_Movement_14B9E8:: @ 814B9E8
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14B9F4:: @ 814B9F4
 	walk_down
@@ -369,7 +370,7 @@ PetalburgCity_Movement_14B9F4:: @ 814B9F4
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14BA01:: @ 814BA01
 	walk_down
@@ -381,7 +382,7 @@ PetalburgCity_Movement_14BA01:: @ 814BA01
 	walk_right
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14BA0B:: @ 814BA0B
 	delay_16
@@ -396,7 +397,7 @@ PetalburgCity_Movement_14BA0B:: @ 814BA0B
 	walk_right
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14BA18:: @ 814BA18
 	walk_up
@@ -408,7 +409,7 @@ PetalburgCity_Movement_14BA18:: @ 814BA18
 	walk_right
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 PetalburgCity_Movement_14BA22:: @ 814BA22
 	walk_up
@@ -421,8 +422,8 @@ PetalburgCity_Movement_14BA22:: @ 814BA22
 	walk_right
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 PetalburgCity_EventScript_14BA2D:: @ 814BA2D
-	msgbox PetalburgCity_Text_16438A, 2
+	msgbox PetalburgCity_Text_16438A, MSGBOX_NPC
 	end
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index 09d969ec8..07e1394a7 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -1,8 +1,8 @@
 PetalburgCity_Gym_MapScripts:: @ 8154477
-	map_script 1, PetalburgCity_Gym_MapScript1_15448C
-	map_script 3, PetalburgCity_Gym_MapScript1_15451B
-	map_script 4, PetalburgCity_Gym_MapScript2_154553
-	map_script 2, PetalburgCity_Gym_MapScript2_154562
+	map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_MapScript1_15448C
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_MapScript1_15451B
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_MapScript2_154553
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_MapScript2_154562
 	.byte 0
 
 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
@@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
 PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
 	setvar VAR_0x8005, 1
 	call PetalburgCity_Gym_EventScript_154F9A
-	call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB
-	call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC
-	call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD
-	call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E
-	call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F
-	call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060
-	call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081
+	call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB
+	call_if_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC
+	call_if_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD
+	call_if_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E
+	call_if_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F
+	call_if_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060
+	call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081
 	end
 
 PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
@@ -61,7 +61,7 @@ PetalburgCity_Gym_MapScript2_154553:: @ 8154553
 	.2byte 0
 
 PetalburgCity_Gym_EventScript_15455D:: @ 815455D
-	turnobject 255, 2
+	turnobject OBJ_EVENT_ID_PLAYER, 2
 	end
 
 PetalburgCity_Gym_MapScript2_154562:: @ 8154562
@@ -70,19 +70,19 @@ PetalburgCity_Gym_MapScript2_154562:: @ 8154562
 
 PetalburgCity_Gym_EventScript_15456C:: @ 815456C
 	lockall
-	msgbox PetalburgCity_Gym_Text_17A196, 4
-	msgbox PetalburgCity_Gym_Text_17A1B0, 4
+	msgbox PetalburgCity_Gym_Text_17A196, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_17A1B0, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	applymovement 10, PetalburgCity_Gym_Movement_1545B4
 	waitmovement 0
 	playse SE_KAIDAN
 	removeobject 10
 	setflag FLAG_HIDE_WALLY_PETALBURG
 	delay 30
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox PetalburgCity_Gym_Text_17A2A4, 4
+	msgbox PetalburgCity_Gym_Text_17A2A4, MSGBOX_DEFAULT
 	setvar VAR_PETALBURG_GYM_STATE, 2
 	releaseall
 	end
@@ -92,7 +92,7 @@ PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
 	walk_down
 	walk_down
 	delay_16
-	end_movement
+	step_end
 
 PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
 	lock
@@ -104,7 +104,7 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
 	case 5, PetalburgCity_Gym_EventScript_154925
 	case 6, PetalburgCity_Gym_EventScript_1549D6
 	case 7, PetalburgCity_Gym_EventScript_15493D
-	msgbox PetalburgCity_Gym_Text_179DF6, 4
+	msgbox PetalburgCity_Gym_Text_179DF6, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
 	case 1, PetalburgCity_Gym_EventScript_15463D
@@ -144,10 +144,10 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	call_if_eq PetalburgCity_Gym_EventScript_15481C
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_Gym_EventScript_15481C
-	msgbox PetalburgCity_Gym_Text_179F07, 4
-	msgbox PetalburgCity_Gym_Text_179F37, 4
-	msgbox PetalburgCity_Gym_Text_179F70, 4
-	msgbox PetalburgCity_Gym_Text_17A03A, 4
+	msgbox PetalburgCity_Gym_Text_179F07, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_179F37, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_179F70, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_17A03A, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_Gym_EventScript_154884
 	compare VAR_0x8008, 1
@@ -156,7 +156,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	call_if_eq PetalburgCity_Gym_EventScript_1548A1
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_Gym_EventScript_1548B3
-	msgbox PetalburgCity_Gym_Text_17A04A, 4
+	msgbox PetalburgCity_Gym_Text_17A04A, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_Gym_EventScript_1548C5
 	compare VAR_0x8008, 1
@@ -165,9 +165,9 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	call_if_eq PetalburgCity_Gym_EventScript_1548DB
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_Gym_EventScript_1548E6
-	msgbox PetalburgCity_Gym_Text_17A0A8, 4
-	msgbox PetalburgCity_Gym_Text_17A0EB, 4
-	msgbox PetalburgCity_Gym_Text_17A156, 4
+	msgbox PetalburgCity_Gym_Text_17A0A8, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_17A0EB, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_17A156, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_Gym_EventScript_15492F
 	compare VAR_0x8008, 1
@@ -184,9 +184,9 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	call_if_eq PetalburgCity_Gym_EventScript_1548F1
 	compare VAR_0x8008, 3
 	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	msgbox PetalburgCity_Gym_Text_17A171, 4
+	msgbox PetalburgCity_Gym_Text_17A171, MSGBOX_DEFAULT
 	closemessage
-	setflag FLAG_SPECIAL_FLAG_1
+	setflag FLAG_DONT_TRANSITION_MUSIC
 	playbgm MUS_TSURETEK, FALSE
 	compare VAR_0x8008, 0
 	call_if_eq PetalburgCity_Gym_EventScript_154835
@@ -210,7 +210,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	end
 
 PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	applymovement 10, PetalburgCity_Gym_Movement_154B27
 	waitmovement 0
 	return
@@ -218,113 +218,113 @@ PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
 PetalburgCity_Gym_EventScript_154800:: @ 8154800
 	applymovement 10, PetalburgCity_Gym_Movement_154B1D
 	waitmovement 0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_15481C:: @ 815481C
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	applymovement 10, PetalburgCity_Gym_Movement_154B27
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154835:: @ 8154835
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B4D
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B4D
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_15484E:: @ 815484E
 	applymovement 10, PetalburgCity_Gym_Movement_154B2E
-	applymovement 255, PetalburgCity_Gym_Movement_154B45
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B45
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154860:: @ 8154860
 	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B57
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B57
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154872:: @ 8154872
 	applymovement 10, PetalburgCity_Gym_Movement_154B36
-	applymovement 255, PetalburgCity_Gym_Movement_154B5F
+	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_154B5F
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154884:: @ 8154884
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_15488F:: @ 815488F
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1
-	applymovement 10, PetalburgCity_Gym_Movement_1A0839
+	applymovement 10, Common_Movement_FacePlayer
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC
-	applymovement 10, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154907:: @ 8154907
-	msgbox PetalburgCity_Gym_Text_17A41E, 4
+	msgbox PetalburgCity_Gym_Text_17A41E, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_Gym_EventScript_154911:: @ 8154911
-	msgbox PetalburgCity_Gym_Text_17A518, 4
+	msgbox PetalburgCity_Gym_Text_17A518, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_Gym_EventScript_15491B:: @ 815491B
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	msgbox PetalburgCity_Gym_Text_17A5F3, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_Gym_EventScript_154925:: @ 8154925
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	msgbox PetalburgCity_Gym_Text_17A5F3, MSGBOX_DEFAULT
 	release
 	end
 
@@ -332,7 +332,7 @@ PetalburgCity_Gym_EventScript_15492F:: @ 815492F
 	return
 
 PetalburgCity_Gym_EventScript_154930:: @ 8154930
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -348,7 +348,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
 	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
 	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
-	msgbox PetalburgCity_Gym_Text_17AA6B, 4
+	msgbox PetalburgCity_Gym_Text_17AA6B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -364,7 +364,7 @@ PetalburgCity_Gym_EventScript_154969:: @ 8154969
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
 	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
 	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	msgbox PetalburgCity_Gym_Text_1C5570, 4
+	msgbox PetalburgCity_Gym_Text_1C5570, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 1
 	return
 
@@ -373,28 +373,28 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
 	return
 
 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
-	giveitem_std ITEM_ENIGMA_BERRY
+	giveitem ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
 	release
 	end
 
 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
-	msgbox PetalburgCity_Gym_Text_17A653, 4
-	trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
+	msgbox PetalburgCity_Gym_Text_17A653, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_NORMAN, PetalburgCity_Gym_Text_17A77A
 	message PetalburgCity_Gym_Text_17A7DD
 	waitmessage
-	call PetalburgCity_Gym_EventScript_1A02C5
-	msgbox PetalburgCity_Gym_Text_17A805, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox PetalburgCity_Gym_Text_17A805, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_PETALBURG_GYM
 	setvar VAR_PETALBURG_GYM_STATE, 7
 	setflag FLAG_BADGE05_GET
-	call PetalburgCity_Gym_EventScript_1A0424
+	call EventScript_HideMrBriney
 	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
 	clearflag FLAG_HIDE_WATTSON_MAUVILLE
 	setvar VAR_0x8008, 5
-	call PetalburgCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
 	call PetalburgCity_Gym_EventScript_1544ED
 	special DrawWholeMapView
@@ -402,12 +402,12 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	end
 
 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
-	giveitem_std ITEM_TM42_FACADE
+	giveitem ITEM_TM42_FACADE
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM42
-	msgbox PetalburgCity_Gym_Text_17A8CF, 4
-	msgbox PetalburgCity_Gym_Text_17A976, 4
+	msgbox PetalburgCity_Gym_Text_17A8CF, MSGBOX_DEFAULT
+	msgbox PetalburgCity_Gym_Text_17A976, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if_eq PetalburgCity_Gym_EventScript_154ABC
@@ -426,47 +426,47 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
 	call_if_eq PetalburgCity_Gym_EventScript_154AFE
 	compare VAR_FACING, 4
 	call_if_eq PetalburgCity_Gym_EventScript_154B09
-	msgbox PetalburgCity_Gym_Text_17A9F6, 4
+	msgbox PetalburgCity_Gym_Text_17A9F6, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -479,7 +479,7 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
 	delay_16
 	delay_8
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
 	delay_16
@@ -491,7 +491,7 @@ PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
 	walk_up
 	walk_up
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B27:: @ 8154B27
 	delay_16
@@ -500,7 +500,7 @@ PetalburgCity_Gym_Movement_154B27:: @ 8154B27
 	delay_8
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
 	walk_down
@@ -510,7 +510,7 @@ PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_down
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B36:: @ 8154B36
 	walk_down
@@ -520,7 +520,7 @@ PetalburgCity_Gym_Movement_154B36:: @ 8154B36
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_down
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
 	walk_down
@@ -529,7 +529,7 @@ PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_down
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B45:: @ 8154B45
 	delay_16
@@ -539,7 +539,7 @@ PetalburgCity_Gym_Movement_154B45:: @ 8154B45
 	walk_down
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
 	delay_16
@@ -551,7 +551,7 @@ PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
 	walk_down
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B57:: @ 8154B57
 	delay_16
@@ -561,7 +561,7 @@ PetalburgCity_Gym_Movement_154B57:: @ 8154B57
 	walk_down
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
 	walk_in_place_fastest_down
@@ -573,10 +573,10 @@ PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
 	walk_right
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
-	msgbox PetalburgCity_Gym_Text_17AB17, 4
+	msgbox PetalburgCity_Gym_Text_17AB17, MSGBOX_DEFAULT
 	release
 	end
 
@@ -606,7 +606,7 @@ PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7
 	end
 
 PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
-	msgbox PetalburgCity_Gym_Text_17B844, 4
+	msgbox PetalburgCity_Gym_Text_17B844, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
 
 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
 	lockall
-	goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 46
 	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
@@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
 
 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
 	lockall
-	goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
 
 PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
 	lockall
-	goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 59
 	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
@@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
 
 PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
 	lockall
-	goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 72
 	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
@@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
 
 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
 	lockall
-	goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
 
 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
 	lockall
-	goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 20
 	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
@@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
 
 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
 	lockall
-	goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
 
 PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
 	lockall
-	goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 33
 	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
@@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
 
 PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
 	lockall
-	goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 1
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
@@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
 
 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 	lockall
-	goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9
+	goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9
 	setvar VAR_0x8008, 7
 	setvar VAR_0x8009, 7
 	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
@@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
 	end
 
 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
-	trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
+	trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
-	msgbox PetalburgCity_Gym_Text_17AE30, 6
+	msgbox PetalburgCity_Gym_Text_17AE30, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
@@ -757,13 +757,13 @@ PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
 	end
 
 PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
-	msgbox PetalburgCity_Gym_Text_17AEBB, 2
+	msgbox PetalburgCity_Gym_Text_17AEBB, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
-	trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
+	trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
-	msgbox PetalburgCity_Gym_Text_17AFD3, 6
+	msgbox PetalburgCity_Gym_Text_17AFD3, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
@@ -774,13 +774,13 @@ PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
 	end
 
 PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
-	msgbox PetalburgCity_Gym_Text_17B016, 2
+	msgbox PetalburgCity_Gym_Text_17B016, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
-	trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
+	trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
-	msgbox PetalburgCity_Gym_Text_17B12C, 6
+	msgbox PetalburgCity_Gym_Text_17B12C, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
@@ -791,13 +791,13 @@ PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
 	end
 
 PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
-	msgbox PetalburgCity_Gym_Text_17B1F4, 2
+	msgbox PetalburgCity_Gym_Text_17B1F4, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
-	trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
+	trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
-	msgbox PetalburgCity_Gym_Text_17B2E4, 6
+	msgbox PetalburgCity_Gym_Text_17B2E4, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
@@ -808,13 +808,13 @@ PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
 	end
 
 PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
-	msgbox PetalburgCity_Gym_Text_17B39B, 2
+	msgbox PetalburgCity_Gym_Text_17B39B, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
-	trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
+	trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
-	msgbox PetalburgCity_Gym_Text_17B46F, 6
+	msgbox PetalburgCity_Gym_Text_17B46F, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
@@ -825,13 +825,13 @@ PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
 	end
 
 PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
-	msgbox PetalburgCity_Gym_Text_17B521, 2
+	msgbox PetalburgCity_Gym_Text_17B521, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
-	trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
+	trainerbattle_single TRAINER_LORI, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
-	msgbox PetalburgCity_Gym_Text_17B5EA, 6
+	msgbox PetalburgCity_Gym_Text_17B5EA, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
@@ -842,13 +842,13 @@ PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
 	end
 
 PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
-	msgbox PetalburgCity_Gym_Text_17B6B5, 2
+	msgbox PetalburgCity_Gym_Text_17B6B5, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
-	trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
+	trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
-	msgbox PetalburgCity_Gym_Text_17B749, 6
+	msgbox PetalburgCity_Gym_Text_17B749, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
@@ -859,7 +859,7 @@ PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
 	end
 
 PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
-	msgbox PetalburgCity_Gym_Text_17B7C0, 2
+	msgbox PetalburgCity_Gym_Text_17B7C0, MSGBOX_NPC
 	end
 
 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
@@ -995,12 +995,12 @@ PetalburgCity_Gym_EventScript_15518B:: @ 815518B
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
-	msgbox PetalburgCity_Gym_Text_17AB96, 4
+	msgbox PetalburgCity_Gym_Text_17AB96, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
-	msgbox PetalburgCity_Gym_Text_17AD49, 4
+	msgbox PetalburgCity_Gym_Text_17AD49, MSGBOX_DEFAULT
 	release
 	end
 
@@ -1017,11 +1017,11 @@ PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
 	end
 
 PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA
-	msgbox PetalburgCity_Gym_Text_17BAC0, 4
+	msgbox PetalburgCity_Gym_Text_17BAC0, MSGBOX_DEFAULT
 	releaseall
 	end
 
 PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4
-	msgbox PetalburgCity_Gym_Text_17BAA5, 4
+	msgbox PetalburgCity_Gym_Text_17BAA5, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc
index 7a3b7c1b1..f398a86bc 100644
--- a/data/maps/PetalburgCity_House1/scripts.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
@@ -2,9 +2,9 @@ PetalburgCity_House1_MapScripts:: @ 81551DE
 	.byte 0
 
 PetalburgCity_House1_EventScript_1551DF:: @ 81551DF
-	msgbox PetalburgCity_House1_Text_17BAFB, 2
+	msgbox PetalburgCity_House1_Text_17BAFB, MSGBOX_NPC
 	end
 
 PetalburgCity_House1_EventScript_1551E8:: @ 81551E8
-	msgbox PetalburgCity_House1_Text_17BB4A, 2
+	msgbox PetalburgCity_House1_Text_17BB4A, MSGBOX_NPC
 	end
diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 4cc1325a2..a526b9d1d 100644
--- a/data/maps/PetalburgCity_House2/scripts.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
@@ -2,9 +2,9 @@ PetalburgCity_House2_MapScripts:: @ 81551F1
 	.byte 0
 
 PetalburgCity_House2_EventScript_1551F2:: @ 81551F2
-	msgbox PetalburgCity_House2_Text_17BC4F, 2
+	msgbox PetalburgCity_House2_Text_17BC4F, MSGBOX_NPC
 	end
 
 PetalburgCity_House2_EventScript_1551FB:: @ 81551FB
-	msgbox PetalburgCity_House2_Text_17BCB1, 2
+	msgbox PetalburgCity_House2_Text_17BCB1, MSGBOX_NPC
 	end
diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index 7584f6f19..094c2a252 100644
--- a/data/maps/PetalburgCity_Mart/scripts.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
@@ -4,11 +4,11 @@ PetalburgCity_Mart_MapScripts:: @ 81552AF
 PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	lock
 	faceplayer
-	message PetalburgCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
-	msgbox PetalburgCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -31,7 +31,7 @@ PetalburgCity_Mart_Items1:: @ 81552D0
 
 PetalburgCity_Mart_EventScript_1552EA:: @ 81552EA
 	pokemart PetalburgCity_Mart_Items2
-	msgbox PetalburgCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -55,13 +55,13 @@ PetalburgCity_Mart_Items2:: @ 81552FC
 	end
 
 PetalburgCity_Mart_EventScript_15531A:: @ 815531A
-	msgbox PetalburgCity_Mart_Text_17BFFD, 2
+	msgbox PetalburgCity_Mart_Text_17BFFD, MSGBOX_NPC
 	end
 
 PetalburgCity_Mart_EventScript_155323:: @ 8155323
-	msgbox PetalburgCity_Mart_Text_17C06C, 2
+	msgbox PetalburgCity_Mart_Text_17C06C, MSGBOX_NPC
 	end
 
 PetalburgCity_Mart_EventScript_15532C:: @ 815532C
-	msgbox PetalburgCity_Mart_Text_17C0BC, 2
+	msgbox PetalburgCity_Mart_Text_17C0BC, MSGBOX_NPC
 	end
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index eff4c8650..4edcb9555 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -1,32 +1,32 @@
 PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204
-	map_script 3, PetalburgCity_PokemonCenter_1F_MapScript1_15520A
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_MapScript1_15520A
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A
 	setrespawn HEAL_LOCATION_PETALBURG_CITY
-	call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213
 	setvar VAR_0x800B, 1
-	call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_155221:: @ 8155221
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BD30, 2
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BD30, MSGBOX_NPC
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_15522A:: @ 815522A
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BD92, 2
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BD92, MSGBOX_NPC
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233
 	lock
 	faceplayer
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, IsStarterInParty
 	compare VAR_RESULT, 1
 	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F
@@ -44,13 +44,13 @@ PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_155272:: @ 8155272
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BE6C, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BE6C, MSGBOX_DEFAULT
 	return
 
 PetalburgCity_PokemonCenter_1F_EventScript_15527B:: @ 815527B
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BEF1, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BEF1, MSGBOX_DEFAULT
 	return
 
 PetalburgCity_PokemonCenter_1F_EventScript_155284:: @ 8155284
-	msgbox PetalburgCity_PokemonCenter_1F_Text_17BF73, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_17BF73, MSGBOX_DEFAULT
 	return
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index a95823736..589ae82fd 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 PetalburgCity_PokemonCenter_2F_MapScripts:: @ 815528D
-	map_script 2, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, PetalburgCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 PetalburgCity_PokemonCenter_2F_EventScript_15529D:: @ 815529D
diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index 1a1605817..cfc7c0e80 100644
--- a/data/maps/PetalburgCity_WallysHouse/scripts.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
@@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4
 	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406
 	goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B
-	msgbox PetalburgCity_WallysHouse_Text_179805, 4
+	msgbox PetalburgCity_WallysHouse_Text_179805, MSGBOX_DEFAULT
 	setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY
 	release
 	end
@@ -19,25 +19,25 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7
 	end
 
 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406
-	msgbox PetalburgCity_WallysHouse_Text_179996, 4
-	giveitem_std ITEM_HM03_SURF
+	msgbox PetalburgCity_WallysHouse_Text_179996, MSGBOX_DEFAULT
+	giveitem ITEM_HM03_SURF
 	setflag FLAG_RECEIVED_HM03
-	msgbox PetalburgCity_WallysHouse_Text_179B14, 4
+	msgbox PetalburgCity_WallysHouse_Text_179B14, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_154427:: @ 8154427
-	msgbox PetalburgCity_WallysHouse_Text_179B5B, 4
+	msgbox PetalburgCity_WallysHouse_Text_179B5B, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_154431:: @ 8154431
-	msgbox PetalburgCity_WallysHouse_Text_179B92, 4
+	msgbox PetalburgCity_WallysHouse_Text_179B92, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B
-	msgbox PetalburgCity_WallysHouse_Text_179975, 4
+	msgbox PetalburgCity_WallysHouse_Text_179975, MSGBOX_DEFAULT
 	release
 	end
 
@@ -46,16 +46,16 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463
-	msgbox PetalburgCity_WallysHouse_Text_179C2C, 4
+	msgbox PetalburgCity_WallysHouse_Text_179C2C, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_154463:: @ 8154463
-	msgbox PetalburgCity_WallysHouse_Text_179CA1, 4
+	msgbox PetalburgCity_WallysHouse_Text_179CA1, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_WallysHouse_EventScript_15446D:: @ 815446D
-	msgbox PetalburgCity_WallysHouse_Text_179D12, 4
+	msgbox PetalburgCity_WallysHouse_Text_179D12, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index 57e4d1478..4762d29c8 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -1,9 +1,9 @@
 PetalburgWoods_MapScripts:: @ 815CC9C
-	map_script 3, PetalburgWoods_MapScript1_15CCA2
+	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgWoods_MapScript1_15CCA2
 	.byte 0
 
 PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
-	call PetalburgWoods_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
@@ -11,26 +11,26 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
 	call PetalburgWoods_EventScript_15CDE6
 	applymovement 4, PetalburgWoods_Movement_15CE89
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
+	msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_EVIL_TEAM, FALSE
 	applymovement 3, PetalburgWoods_Movement_15CEC3
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
+	msgbox PetalburgWoods_Text_194DED, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEB0
 	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
+	msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, PetalburgWoods_Movement_15CE9E
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
+	msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT
 	applymovement 3, PetalburgWoods_Movement_15CEC8
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83
 	applymovement 3, PetalburgWoods_Movement_15CEB3
 	waitmovement 0
 	call PetalburgWoods_EventScript_15CDFA
@@ -44,28 +44,28 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 	call PetalburgWoods_EventScript_15CDE6
 	applymovement 4, PetalburgWoods_Movement_15CE8E
 	waitmovement 0
-	applymovement 255, PetalburgWoods_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
+	msgbox PetalburgWoods_Text_194D92, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_EVIL_TEAM, FALSE
 	applymovement 3, PetalburgWoods_Movement_15CEC3
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
+	msgbox PetalburgWoods_Text_194DED, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEBF
 	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
+	msgbox PetalburgWoods_Text_194E6B, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, PetalburgWoods_Movement_15CEA4
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
-	applymovement 255, PetalburgWoods_Movement_1A0841
+	msgbox PetalburgWoods_Text_194E9A, MSGBOX_DEFAULT
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	msgbox PetalburgWoods_Text_194EE8, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_PETALBURG_WOODS_GRUNT, PetalburgWoods_Text_194F83
 	applymovement 3, PetalburgWoods_Movement_15CEB3
 	waitmovement 0
 	call PetalburgWoods_EventScript_15CDFA
@@ -77,35 +77,35 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
 	applymovement 4, PetalburgWoods_Movement_15CE73
 	waitmovement 0
-	msgbox PetalburgWoods_Text_194D71, 4
+	msgbox PetalburgWoods_Text_194D71, MSGBOX_DEFAULT
 	closemessage
 	return
 
 PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
-	msgbox PetalburgWoods_Text_194FA4, 4
+	msgbox PetalburgWoods_Text_194FA4, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEB7
 	waitmovement 0
 	removeobject 3
-	applymovement 255, PetalburgWoods_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox PetalburgWoods_Text_19507E, 4
-	giveitem_std ITEM_GREAT_BALL
+	msgbox PetalburgWoods_Text_19507E, MSGBOX_DEFAULT
+	giveitem ITEM_GREAT_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq PetalburgWoods_EventScript_15CE3F
 	goto PetalburgWoods_EventScript_15CE4D
 	end
 
 PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
-	msgbox PetalburgWoods_Text_195182, 4
+	msgbox PetalburgWoods_Text_195182, MSGBOX_DEFAULT
 	goto PetalburgWoods_EventScript_15CE4D
 	end
 
 PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
-	msgbox PetalburgWoods_Text_19510A, 4
+	msgbox PetalburgWoods_Text_19510A, MSGBOX_DEFAULT
 	applymovement 4, PetalburgWoods_Movement_15CEA8
 	waitmovement 0
-	msgbox PetalburgWoods_Text_195153, 4
+	msgbox PetalburgWoods_Text_195153, MSGBOX_DEFAULT
 	closemessage
 	return
 
@@ -128,7 +128,7 @@ PetalburgWoods_Movement_15CE73:: @ 815CE73
 	delay_16
 	face_up
 	delay_16
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CE80:: @ 815CE80
 	walk_fast_right
@@ -139,14 +139,14 @@ PetalburgWoods_Movement_15CE80:: @ 815CE80
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CE89:: @ 815CE89
 	delay_16
 	face_player
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CE8E:: @ 815CE8E
 	delay_16
@@ -155,7 +155,7 @@ PetalburgWoods_Movement_15CE8E:: @ 815CE8E
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CE95:: @ 815CE95
 	walk_fast_left
@@ -166,7 +166,7 @@ PetalburgWoods_Movement_15CE95:: @ 815CE95
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CE9E:: @ 815CE9E
 	walk_fast_right
@@ -174,13 +174,13 @@ PetalburgWoods_Movement_15CE9E:: @ 815CE9E
 	walk_fast_down
 	walk_fast_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEA4:: @ 815CEA4
 	walk_fast_down
 	walk_fast_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEA8:: @ 815CEA8
 	walk_in_place_fastest_down
@@ -190,18 +190,18 @@ PetalburgWoods_Movement_15CEA8:: @ 815CEA8
 	delay_16
 	delay_16
 	face_up
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEB0:: @ 815CEB0
 	walk_fast_down
 	walk_fast_down
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEB3:: @ 815CEB3
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEB7:: @ 815CEB7
 	walk_fast_up
@@ -211,72 +211,72 @@ PetalburgWoods_Movement_15CEB7:: @ 815CEB7
 	walk_fast_up
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEBF:: @ 815CEBF
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEC3:: @ 815CEC3
 	walk_down
 	walk_down
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 PetalburgWoods_Movement_15CEC8:: @ 815CEC8
 	walk_down
-	end_movement
+	step_end
 
 PetalburgWoods_EventScript_15CECA:: @ 815CECA
-	msgbox PetalburgWoods_Text_1953AC, 2
+	msgbox PetalburgWoods_Text_1953AC, MSGBOX_NPC
 	end
 
 PetalburgWoods_EventScript_15CED3:: @ 815CED3
-	msgbox PetalburgWoods_Text_19542B, 2
+	msgbox PetalburgWoods_Text_19542B, MSGBOX_NPC
 	end
 
 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
-	msgbox PetalburgWoods_Text_19549E, 4
-	giveitem_std ITEM_MIRACLE_SEED
+	msgbox PetalburgWoods_Text_19549E, MSGBOX_DEFAULT
+	giveitem ITEM_MIRACLE_SEED
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MIRACLE_SEED
 	release
 	end
 
 PetalburgWoods_EventScript_15CF0B:: @ 815CF0B
-	msgbox PetalburgWoods_Text_195503, 4
+	msgbox PetalburgWoods_Text_195503, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgWoods_EventScript_15CF15:: @ 815CF15
-	msgbox PetalburgWoods_Text_1955B0, 3
+	msgbox PetalburgWoods_Text_1955B0, MSGBOX_SIGN
 	end
 
 PetalburgWoods_EventScript_15CF1E:: @ 815CF1E
-	msgbox PetalburgWoods_Text_1956A6, 3
+	msgbox PetalburgWoods_Text_1956A6, MSGBOX_SIGN
 	end
 
 PetalburgWoods_EventScript_15CF27:: @ 815CF27
-	trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
-	msgbox PetalburgWoods_Text_195232, 6
+	trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
+	msgbox PetalburgWoods_Text_195232, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
-	trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
+	trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq PetalburgWoods_EventScript_15CF65
-	msgbox PetalburgWoods_Text_1952CC, 6
+	msgbox PetalburgWoods_Text_1952CC, MSGBOX_AUTOCLOSE
 	end
 
 PetalburgWoods_EventScript_15CF65:: @ 815CF65
-	trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
-	msgbox PetalburgWoods_Text_195356, 6
+	trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
+	msgbox PetalburgWoods_Text_195356, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route101/map.json b/data/maps/Route101/map.json
index 4f1a18acd..24d4c2360 100644
--- a/data/maps/Route101/map.json
+++ b/data/maps/Route101/map.json
@@ -84,7 +84,7 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route101_EventScript_1A037F",
+      "script": "ProfBirch_EventScript_AskRatePokedex",
       "flag": "FLAG_HIDE_BIRCH_ROUTE101"
     },
     {
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index c7f570044..60e67565d 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,10 +1,10 @@
 Route101_MapScripts:: @ 814E924
-	map_script 3, Route101_MapScript1_14E92F
-	map_script 2, Route101_MapScript2_14E935
+	map_script MAP_SCRIPT_ON_TRANSITION, Route101_MapScript1_14E92F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_14E935
 	.byte 0
 
 Route101_MapScript1_14E92F:: @ 814E92F
-	call Route101_EventScript_1A02F4
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route101_MapScript2_14E935:: @ 814E935
@@ -19,23 +19,23 @@ Route101_EventScript_14E93F:: @ 814E93F
 Route101_EventScript_14E948:: @ 814E948
 	lockall
 	playbgm MUS_EVENT0, TRUE
-	msgbox Route101_Text_16D10E, 4
+	msgbox Route101_Text_16D10E, MSGBOX_DEFAULT
 	closemessage
 	setobjectxy 2, 0, 15
 	setobjectxy 4, 0, 16
-	applymovement 255, Route101_Movement_14EA2C
+	applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14EA2C
 	applymovement 2, Route101_Movement_14EA50
 	applymovement 4, Route101_Movement_14EA1F
 	waitmovement 0
 	applymovement 4, Route101_Movement_14EA00
 	applymovement 2, Route101_Movement_14EA31
 	waitmovement 0
-	applymovement 2, Route101_Movement_1A0843
+	applymovement 2, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement 4, Route101_Movement_14EA27
 	applymovement 2, Route101_Movement_14EA58
 	waitmovement 0
-	msgbox Route101_Text_16D119, 4
+	msgbox Route101_Text_16D119, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_ROUTE101_STATE, 2
 	releaseall
@@ -43,42 +43,42 @@ Route101_EventScript_14E948:: @ 814E948
 
 Route101_EventScript_14E9B8:: @ 814E9B8
 	lockall
-	msgbox Route101_Text_16D15E, 4
+	msgbox Route101_Text_16D15E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route101_Movement_14E9FA
+	applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FA
 	waitmovement 0
 	releaseall
 	end
 
 Route101_EventScript_14E9CE:: @ 814E9CE
 	lockall
-	msgbox Route101_Text_16D15E, 4
+	msgbox Route101_Text_16D15E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route101_Movement_14E9FC
+	applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FC
 	waitmovement 0
 	releaseall
 	end
 
 Route101_EventScript_14E9E4:: @ 814E9E4
 	lockall
-	msgbox Route101_Text_16D15E, 4
+	msgbox Route101_Text_16D15E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route101_Movement_14E9FE
+	applymovement OBJ_EVENT_ID_PLAYER, Route101_Movement_14E9FE
 	waitmovement 0
 	releaseall
 	end
 
 Route101_Movement_14E9FA:: @ 814E9FA
 	walk_up
-	end_movement
+	step_end
 
 Route101_Movement_14E9FC:: @ 814E9FC
 	walk_right
-	end_movement
+	step_end
 
 Route101_Movement_14E9FE:: @ 814E9FE
 	walk_down
-	end_movement
+	step_end
 
 Route101_Movement_14EA00:: @ 814EA00
 	walk_fast_up
@@ -111,7 +111,7 @@ Route101_Movement_14EA00:: @ 814EA00
 	walk_fast_down
 	walk_fast_left
 	walk_fast_left
-	end_movement
+	step_end
 
 Route101_Movement_14EA1F:: @ 814EA1F
 	walk_fast_up
@@ -120,24 +120,24 @@ Route101_Movement_14EA1F:: @ 814EA1F
 	walk_fast_right
 	walk_fast_right
 	walk_fast_up
-	end_movement
+	step_end
 
 @ 814EA26
-	end_movement
+	step_end
 
 Route101_Movement_14EA27:: @ 814EA27
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
-	end_movement
+	step_end
 
 Route101_Movement_14EA2C:: @ 814EA2C
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route101_Movement_14EA31:: @ 814EA31
 	walk_fast_up
@@ -170,7 +170,7 @@ Route101_Movement_14EA31:: @ 814EA31
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
-	end_movement
+	step_end
 
 Route101_Movement_14EA50:: @ 814EA50
 	walk_fast_right
@@ -179,39 +179,39 @@ Route101_Movement_14EA50:: @ 814EA50
 	walk_fast_right
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 @ 814EA57
-	end_movement
+	step_end
 
 Route101_Movement_14EA58:: @ 814EA58
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
-	end_movement
+	step_end
 
 @ 814EA5D
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 @ 814EA60
 	walk_up
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 Route101_EventScript_14EA64:: @ 814EA64
-	msgbox Route101_Text_16D25E, 2
+	msgbox Route101_Text_16D25E, MSGBOX_NPC
 	end
 
 Route101_EventScript_14EA6D:: @ 814EA6D
-	msgbox Route101_Text_16D2CB, 2
+	msgbox Route101_Text_16D2CB, MSGBOX_NPC
 	end
 
 Route101_EventScript_14EA76:: @ 814EA76
-	msgbox Route101_Text_16D349, 3
+	msgbox Route101_Text_16D349, MSGBOX_SIGN
 	end
 
 Route101_EventScript_14EA7F:: @ 814EA7F
@@ -219,16 +219,16 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 	faceplayer
 	setflag FLAG_SYS_POKEMON_GET
 	setflag FLAG_RESCUED_BIRCH
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 4
-	setobjectxy 255, 6, 13
-	applymovement 255, Route101_Movement_1A083F
+	setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	special ScrSpecial_ChooseStarter
 	waitstate
 	applymovement 2, Route101_Movement_14EAD7
 	waitmovement 0
-	msgbox Route101_Text_16D191, 4
+	msgbox Route101_Text_16D191, MSGBOX_DEFAULT
 	special ScrSpecial_HealPlayerParty
 	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
 	clearflag FLAG_HIDE_BIRCH_IN_LAB
@@ -243,4 +243,4 @@ Route101_EventScript_14EA7F:: @ 814EA7F
 
 Route101_Movement_14EAD7:: @ 814EAD7
 	walk_right
-	end_movement
+	step_end
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc
index bdc1803c2..56a788780 100644
--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -2,45 +2,45 @@ Route102_MapScripts:: @ 814EAD9
 	.byte 0
 
 Route102_EventScript_14EADA:: @ 814EADA
-	msgbox Route102_Text_16D431, 2
+	msgbox Route102_Text_16D431, MSGBOX_NPC
 	end
 
 Route102_EventScript_14EAE3:: @ 814EAE3
-	msgbox Route102_Text_16D547, 3
+	msgbox Route102_Text_16D547, MSGBOX_SIGN
 	end
 
 Route102_EventScript_14EAEC:: @ 814EAEC
-	msgbox Route102_Text_16D55F, 3
+	msgbox Route102_Text_16D55F, MSGBOX_SIGN
 	end
 
 Route102_EventScript_14EAF5:: @ 814EAF5
-	msgbox Route102_Text_16D51A, 2
+	msgbox Route102_Text_16D51A, MSGBOX_NPC
 	end
 
 Route102_EventScript_14EAFE:: @ 814EAFE
-	trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C
+	trainerbattle_single TRAINER_CALVIN_1, Route102_Text_1B79C3, Route102_Text_1B7A2C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route102_EventScript_14EB25
-	msgbox Route102_Text_1B7A60, 6
+	msgbox Route102_Text_1B7A60, MSGBOX_AUTOCLOSE
 	end
 
 Route102_EventScript_14EB25:: @ 814EB25
-	trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD
-	msgbox Route102_Text_1B7B2F, 6
+	trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_1B7A9F, Route102_Text_1B7AFD
+	msgbox Route102_Text_1B7B2F, MSGBOX_AUTOCLOSE
 	end
 
 Route102_EventScript_14EB3C:: @ 814EB3C
-	trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40
-	msgbox Route102_Text_1B7C52, 6
+	trainerbattle_single TRAINER_RICK, Route102_Text_1B7C05, Route102_Text_1B7C40
+	msgbox Route102_Text_1B7C52, MSGBOX_AUTOCLOSE
 	end
 
 Route102_EventScript_14EB53:: @ 814EB53
-	trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC
-	msgbox Route102_Text_1B7D11, 6
+	trainerbattle_single TRAINER_TIANA, Route102_Text_1B7C97, Route102_Text_1B7CEC
+	msgbox Route102_Text_1B7D11, MSGBOX_AUTOCLOSE
 	end
 
 Route102_EventScript_14EB6A:: @ 814EB6A
-	trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D
-	msgbox Route102_Text_1B7BD0, 6
+	trainerbattle_single TRAINER_ALLEN, Route102_Text_1B7B68, Route102_Text_1B7B9D
+	msgbox Route102_Text_1B7BD0, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route103/map.json b/data/maps/Route103/map.json
index fdf6241f4..691cc719a 100644
--- a/data/maps/Route103/map.json
+++ b/data/maps/Route103/map.json
@@ -162,7 +162,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route103_EventScript_1A037F",
+      "script": "ProfBirch_EventScript_AskRatePokedex",
       "flag": "FLAG_HIDE_BIRCH_ROUTE103"
     },
     {
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index ec9ae2420..637a2a85a 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -1,10 +1,10 @@
 Route103_MapScripts:: @ 814EB81
-	map_script 3, Route103_MapScript1_14EB87
+	map_script MAP_SCRIPT_ON_TRANSITION, Route103_MapScript1_14EB87
 	.byte 0
 
 Route103_MapScript1_14EB87:: @ 814EB87
-	call Route103_EventScript_1A014E
-	call Route103_EventScript_1A02F4
+	call Common_EventScript_SetupRivalGfxId
+	call ProfBirch_EventScript_UpdateLocation
 	end
 
 Route103_EventScript_14EB92:: @ 814EB92
@@ -17,15 +17,15 @@ Route103_EventScript_14EB92:: @ 814EB92
 	end
 
 Route103_EventScript_14EBAB:: @ 814EBAB
-	msgbox Route103_Text_16D57A, 4
+	msgbox Route103_Text_16D57A, MSGBOX_DEFAULT
 	playbgm MUS_GIRL_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route103_Text_16D5B6, 4
+	msgbox Route103_Text_16D5B6, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_14EC5D
 	case 1, Route103_EventScript_14EC6D
@@ -33,15 +33,15 @@ Route103_EventScript_14EBAB:: @ 814EBAB
 	end
 
 Route103_EventScript_14EC04:: @ 814EC04
-	msgbox Route103_Text_16D762, 4
+	msgbox Route103_Text_16D762, MSGBOX_DEFAULT
 	playbgm MUS_BOY_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route103_Text_16D7A9, 4
+	msgbox Route103_Text_16D7A9, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route103_EventScript_14EC8D
 	case 1, Route103_EventScript_14EC9D
@@ -49,42 +49,42 @@ Route103_EventScript_14EC04:: @ 814EC04
 	end
 
 Route103_EventScript_14EC5D:: @ 814EC5D
-	trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_4, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC6D:: @ 814EC6D
-	trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_7, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC7D:: @ 814EC7D
-	trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B
+	trainerbattle_no_intro TRAINER_MAY_1, Route103_Text_16D65B
 	goto Route103_EventScript_14ECBD
 	end
 
 Route103_EventScript_14EC8D:: @ 814EC8D
-	trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_4, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14EC9D:: @ 814EC9D
-	trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_7, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14ECAD:: @ 814ECAD
-	trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836
+	trainerbattle_no_intro TRAINER_BRENDAN_1, Route103_Text_16D836
 	goto Route103_EventScript_14ECCB
 	end
 
 Route103_EventScript_14ECBD:: @ 814ECBD
-	msgbox Route103_Text_16D688, 4
+	msgbox Route103_Text_16D688, MSGBOX_DEFAULT
 	goto Route103_EventScript_14ECD9
 	end
 
 Route103_EventScript_14ECCB:: @ 814ECCB
-	msgbox Route103_Text_16D856, 4
+	msgbox Route103_Text_16D856, MSGBOX_DEFAULT
 	goto Route103_EventScript_14ECD9
 	end
 
@@ -132,7 +132,7 @@ Route103_Movement_14ED67:: @ 814ED67
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route103_Movement_14ED6B:: @ 814ED6B
 	jump_2_down
@@ -140,77 +140,77 @@ Route103_Movement_14ED6B:: @ 814ED6B
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route103_Movement_14ED71:: @ 814ED71
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route103_Movement_14ED74:: @ 814ED74
 	jump_2_down
 	delay_16
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route103_EventScript_14ED79:: @ 814ED79
-	msgbox Route103_Text_16D950, 2
+	msgbox Route103_Text_16D950, MSGBOX_NPC
 	end
 
 Route103_EventScript_14ED82:: @ 814ED82
-	msgbox Route103_Text_16D996, 2
+	msgbox Route103_Text_16D996, MSGBOX_NPC
 	end
 
 Route103_EventScript_14ED8B:: @ 814ED8B
-	msgbox Route103_Text_16D9FB, 3
+	msgbox Route103_Text_16D9FB, MSGBOX_SIGN
 	end
 
 Route103_EventScript_14ED94:: @ 814ED94
-	trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
-	msgbox Route103_Text_1B7DB2, 6
+	trainerbattle_single TRAINER_DAISY, Route103_Text_1B7D55, Route103_Text_1B7D8B
+	msgbox Route103_Text_1B7DB2, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EDAB:: @ 814EDAB
-	trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EDD6
-	msgbox Route103_Text_1B7E50, 6
+	msgbox Route103_Text_1B7E50, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EDD6:: @ 814EDD6
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
-	msgbox Route103_Text_1B8053, 6
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
+	msgbox Route103_Text_1B8053, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EDF1:: @ 814EDF1
-	trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
+	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EE1C
-	msgbox Route103_Text_1B7F40, 6
+	msgbox Route103_Text_1B7F40, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EE1C:: @ 814EE1C
-	trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
-	msgbox Route103_Text_1B814D, 6
+	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
+	msgbox Route103_Text_1B814D, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EE37:: @ 814EE37
-	trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
-	msgbox Route103_Text_1B8281, 6
+	trainerbattle_single TRAINER_ANDREW, Route103_Text_1B81FA, Route103_Text_1B8258
+	msgbox Route103_Text_1B8281, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EE4E:: @ 814EE4E
-	trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
+	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_1B82A9, Route103_Text_1B82EC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route103_EventScript_14EE75
-	msgbox Route103_Text_1B830D, 6
+	msgbox Route103_Text_1B830D, MSGBOX_AUTOCLOSE
 	end
 
 Route103_EventScript_14EE75:: @ 814EE75
-	trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
-	msgbox Route103_Text_1B83A4, 6
+	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_1B8349, Route103_Text_1B838C
+	msgbox Route103_Text_1B83A4, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index 9e475791f..d00f4141c 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -1,6 +1,6 @@
 Route104_MapScripts:: @ 814EE8C
-	map_script 2, Route104_MapScript2_14EE97
-	map_script 3, Route104_MapScript1_14EEA8
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_MapScript2_14EE97
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_MapScript1_14EEA8
 	.byte 0
 
 Route104_MapScript2_14EE97:: @ 814EE97
@@ -30,17 +30,17 @@ Route104_EventScript_14EEC8:: @ 814EEC8
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF
-	msgbox Route104_Text_1C55B9, 4
-	giveitem_std ITEM_CHESTO_BERRY
+	msgbox Route104_Text_1C55B9, MSGBOX_DEFAULT
+	giveitem ITEM_CHESTO_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
-	msgbox Route104_Text_1C5665, 4
+	msgbox Route104_Text_1C5665, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_EventScript_14EEFF:: @ 814EEFF
-	msgbox Route104_Text_1C5665, 4
+	msgbox Route104_Text_1C5665, MSGBOX_DEFAULT
 	release
 	end
 
@@ -48,74 +48,74 @@ Route104_EventScript_14EF09:: @ 814EF09
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38
-	msgbox Route104_Text_16DD91, 4
-	giveitem_std ITEM_WHITE_HERB
+	msgbox Route104_Text_16DD91, MSGBOX_DEFAULT
+	giveitem ITEM_WHITE_HERB
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WHITE_HERB
 	release
 	end
 
 Route104_EventScript_14EF38:: @ 814EF38
-	msgbox Route104_Text_16DE36, 4
+	msgbox Route104_Text_16DE36, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_EventScript_14EF42:: @ 814EF42
-	msgbox Route104_Text_16DA13, 2
+	msgbox Route104_Text_16DA13, MSGBOX_NPC
 	end
 
 Route104_EventScript_14EF4B:: @ 814EF4B
-	msgbox Route104_Text_16DA89, 3
+	msgbox Route104_Text_16DA89, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF54:: @ 814EF54
-	msgbox Route104_Text_16DEB3, 3
+	msgbox Route104_Text_16DEB3, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF5D:: @ 814EF5D
-	msgbox Route104_Text_16DEC8, 3
+	msgbox Route104_Text_16DEC8, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF66:: @ 814EF66
-	msgbox Route104_Text_16DEE3, 3
+	msgbox Route104_Text_16DEE3, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF6F:: @ 814EF6F
-	msgbox Route104_Text_16DEFD, 3
+	msgbox Route104_Text_16DEFD, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF78:: @ 814EF78
-	msgbox Route104_Text_16DF16, 3
+	msgbox Route104_Text_16DF16, MSGBOX_SIGN
 	end
 
 Route104_EventScript_14EF81:: @ 814EF81
-	msgbox Route104_Text_16DAC9, 2
+	msgbox Route104_Text_16DAC9, MSGBOX_NPC
 	end
 
 Route104_EventScript_14EF8A:: @ 814EF8A
-	msgbox Route104_Text_16DB5C, 2
+	msgbox Route104_Text_16DB5C, MSGBOX_NPC
 	end
 
 Route104_EventScript_14EF93:: @ 814EF93
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2
-	msgbox Route104_Text_16DC5F, 4
-	giveitem_std ITEM_TM09_BULLET_SEED
+	msgbox Route104_Text_16DC5F, MSGBOX_DEFAULT
+	giveitem ITEM_TM09_BULLET_SEED
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM09
 	release
 	end
 
 Route104_EventScript_14EFC2:: @ 814EFC2
-	msgbox Route104_Text_16DD0E, 4
+	msgbox Route104_Text_16DD0E, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_EventScript_14EFCC:: @ 814EFCC
-	msgbox Route104_Text_16DBC9, 2
+	msgbox Route104_Text_16DBC9, MSGBOX_NPC
 	end
 
 Route104_EventScript_14EFD5:: @ 814EFD5
@@ -124,18 +124,18 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	applymovement 8, Route104_Movement_14F16C
 	waitmovement 0
 	removeobject 8
-	applymovement 255, Route104_Movement_14F162
+	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F162
 	waitmovement 0
-	hideobjectat 255, MAP_ROUTE104
-	call Route104_EventScript_1A02E7
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
+	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement 7, Route104_Movement_14F09F
-	applymovement 255, Route104_Movement_14F09F
+	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F09F
 	waitmovement 0
-	applymovement 255, Route104_Movement_14F166
+	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F166
 	waitmovement 0
-	call Route104_EventScript_1A02EF
-	showobjectat 255, MAP_DEWFORD_TOWN
-	applymovement 255, Route104_Movement_14F168
+	call Common_EventScript_StopBrineysBoatMusic
+	showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
+	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_14F168
 	waitmovement 0
 	setobjectxyperm 2, 12, 8
 	addobject 2
@@ -145,11 +145,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	waitmovement 0
 	addobject 4
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	call Route104_EventScript_1A02EF
+	call Common_EventScript_StopBrineysBoatMusic
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
 	hideobjectat 7, MAP_ROUTE104
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
-	resetobjectpriority 255, MAP_ROUTE104
+	resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
 	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
@@ -158,12 +158,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	end
 
 Route104_EventScript_14F08B:: @ 814F08B
-	msgbox Route104_Text_16B347, 4
+	msgbox Route104_Text_16B347, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route104_EventScript_14F095:: @ 814F095
-	msgbox Route104_Text_16B4B5, 4
+	msgbox Route104_Text_16B4B5, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -362,93 +362,93 @@ Route104_Movement_14F09F:: @ 814F09F
 	walk_fast_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route104_Movement_14F162:: @ 814F162
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route104_Movement_14F166:: @ 814F166
 	walk_down
-	end_movement
+	step_end
 
 Route104_Movement_14F168:: @ 814F168
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 Route104_Movement_14F16C:: @ 814F16C
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route104_Movement_14F16F:: @ 814F16F
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 Route104_EventScript_14F172:: @ 814F172
-	trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637
-	msgbox Route104_Text_1B8680, 6
+	trainerbattle_single TRAINER_IVAN, Route104_Text_1B85EB, Route104_Text_1B8637
+	msgbox Route104_Text_1B8680, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F189:: @ 814F189
-	trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8
-	msgbox Route104_Text_1B871C, 6
+	trainerbattle_single TRAINER_BILLY, Route104_Text_1B86BE, Route104_Text_1B86E8
+	msgbox Route104_Text_1B871C, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F1A0:: @ 814F1A0
-	trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7
+	trainerbattle_single TRAINER_HALEY_1, Route104_Text_1B8770, Route104_Text_1B87A7
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route104_EventScript_14F1C7
-	msgbox Route104_Text_1B87C3, 6
+	msgbox Route104_Text_1B87C3, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F1C7:: @ 814F1C7
-	trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852
-	msgbox Route104_Text_1B8872, 6
+	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_1B8839, Route104_Text_1B8852
+	msgbox Route104_Text_1B8872, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F1DE:: @ 814F1DE
-	trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911
+	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_1B88D4, Route104_Text_1B8911
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route104_EventScript_14F205
-	msgbox Route104_Text_1B8925, 6
+	msgbox Route104_Text_1B8925, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F205:: @ 814F205
-	trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E
-	msgbox Route104_Text_1B89C0, 6
+	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_1B895E, Route104_Text_1B899E
+	msgbox Route104_Text_1B89C0, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F21C:: @ 814F21C
-	trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61
+	trainerbattle_single TRAINER_CINDY_1, Route104_Text_1B8A24, Route104_Text_1B8A61
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route104_EventScript_14F243
-	msgbox Route104_Text_1B8A69, 6
+	msgbox Route104_Text_1B8A69, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F243:: @ 814F243
-	trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9
-	msgbox Route104_Text_1B8B02, 6
+	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_1B8AA7, Route104_Text_1B8AD9
+	msgbox Route104_Text_1B8B02, MSGBOX_AUTOCLOSE
 	end
 
 Route104_EventScript_14F25A:: @ 814F25A
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_1B842C, 4
+	msgbox Route104_Text_1B842C, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_EventScript_14F279:: @ 814F279
-	trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577
+	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577
 	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_1B853B, 4
+	msgbox Route104_Text_1B853B, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 708cc249c..3bcafcadc 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route104_MrBrineysHouse_MapScripts:: @ 815BCB2
-	map_script 3, Route104_MrBrineysHouse_MapScript1_15BCB8
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_MapScript1_15BCB8
 	.byte 0
 
 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8
@@ -31,7 +31,7 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
 
 Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E
 	setflag FLAG_MR_BRINEY_SAILING_INTRO
-	msgbox Route104_MrBrineysHouse_Text_191A82, 4
+	msgbox Route104_MrBrineysHouse_Text_191A82, MSGBOX_DEFAULT
 	msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97
@@ -63,18 +63,18 @@ Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E
 	end
 
 Route104_MrBrineysHouse_EventScript_15BD97:: @ 815BD97
-	msgbox Route104_MrBrineysHouse_Text_191C57, 4
+	msgbox Route104_MrBrineysHouse_Text_191C57, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1
-	msgbox Route104_MrBrineysHouse_Text_191EDB, 4
+	msgbox Route104_MrBrineysHouse_Text_191EDB, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB
-	msgbox Route104_MrBrineysHouse_Text_191BFD, 4
-	call Route104_MrBrineysHouse_EventScript_1A010C
+	msgbox Route104_MrBrineysHouse_Text_191BFD, MSGBOX_DEFAULT
+	call EventScript_BackupMrBrineyLocation
 	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1
 	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104
 	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
@@ -89,7 +89,7 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox Route104_MrBrineysHouse_Text_191FB9, 4
+	msgbox Route104_MrBrineysHouse_Text_191FB9, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index fa9d98c16..ad98c5d16 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -1,5 +1,5 @@
 Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4
-	map_script 3, Route104_PrettyPetalFlowerShop_MapScript1_15BDEA
+	map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_MapScript1_15BDEA
 	.byte 0
 
 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
@@ -17,7 +17,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, MSGBOX_DEFAULT
 	goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A
 	setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER
 	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO
@@ -38,18 +38,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE6A:: @ 815BE6A
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F9D, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C5F9D, MSGBOX_DEFAULT
 	return
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C6121, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C6121, MSGBOX_DEFAULT
 	return
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C
-	message Route104_PrettyPetalFlowerShop_Text_1A0C42
+	message Text_PlayerWhatCanIDoForYou
 	waitmessage
 	pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items
-	msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -69,14 +69,14 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4
 	lock
 	faceplayer
 	goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4
-	giveitem_std ITEM_WAILMER_PAIL
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, MSGBOX_DEFAULT
+	giveitem ITEM_WAILMER_PAIL
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_WAILMER_PAIL
 	release
 	end
@@ -84,20 +84,20 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9
 Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, MSGBOX_DEFAULT
 	random 8
 	addvar VAR_RESULT, ITEM_CHERI_BERRY
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BF1A:: @ 815BF1A
-	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4
+	msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc
index 1b8458e62..91ef90261 100644
--- a/data/maps/Route104_Prototype/scripts.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
@@ -4,47 +4,47 @@ Route104_Prototype_MapScripts:: @ 8160C4A
 Route104_Prototype_EventScript_160C4B:: @ 8160C4B
 	lock
 	faceplayer
-	goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99
-	goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99
-	goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99
-	goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99
-	goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99
-	goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99
+	goto_if_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99
 	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1
-	msgbox Route104_Prototype_Text_19B267, 4
+	msgbox Route104_Prototype_Text_19B267, MSGBOX_DEFAULT
 	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB
 	release
 	end
 
 Route104_Prototype_EventScript_160C99:: @ 8160C99
-	msgbox Route104_Prototype_Text_19B22E, 4
+	msgbox Route104_Prototype_Text_19B22E, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_Prototype_EventScript_160CA3:: @ 8160CA3
 	lock
 	faceplayer
-	goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1
-	goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1
-	goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1
-	goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1
-	goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1
-	goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1
+	goto_if_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1
 	setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2
-	msgbox Route104_Prototype_Text_19B2E9, 4
+	msgbox Route104_Prototype_Text_19B2E9, MSGBOX_DEFAULT
 	goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB
 	release
 	end
 
 Route104_Prototype_EventScript_160CF1:: @ 8160CF1
-	msgbox Route104_Prototype_Text_19B2B6, 4
+	msgbox Route104_Prototype_Text_19B2B6, MSGBOX_DEFAULT
 	release
 	end
 
 Route104_Prototype_EventScript_160CFB:: @ 8160CFB
 	closemessage
 	delay 60
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	delay 60
 	special DoSoftReset
 	waitstate
@@ -52,47 +52,47 @@ Route104_Prototype_EventScript_160CFB:: @ 8160CFB
 	end
 
 Route104_Prototype_EventScript_160D0A:: @ 8160D0A
-	msgbox Route104_Prototype_Text_19B33B, 2
+	msgbox Route104_Prototype_Text_19B33B, MSGBOX_NPC
 	end
 
 Route104_Prototype_EventScript_160D13:: @ 8160D13
-	msgbox Route104_Prototype_Text_19B37F, 2
+	msgbox Route104_Prototype_Text_19B37F, MSGBOX_NPC
 	end
 
 Route104_Prototype_EventScript_160D1C:: @ 8160D1C
-	msgbox Route104_Prototype_Text_19B3DE, 3
+	msgbox Route104_Prototype_Text_19B3DE, MSGBOX_SIGN
 	end
 
 Route104_Prototype_EventScript_160D25:: @ 8160D25
-	msgbox Route104_Prototype_Text_19B3FF, 3
+	msgbox Route104_Prototype_Text_19B3FF, MSGBOX_SIGN
 	end
 
 Route104_Prototype_EventScript_160D2E:: @ 8160D2E
-	trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA
-	msgbox Route104_Prototype_Text_19ADF7, 6
+	trainerbattle_single TRAINER_CINDY_2, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA
+	msgbox Route104_Prototype_Text_19ADF7, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Prototype_EventScript_160D45:: @ 8160D45
-	trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9
-	msgbox Route104_Prototype_Text_19AE6A, 6
+	trainerbattle_double TRAINER_AMY_AND_LIV_3, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9
+	msgbox Route104_Prototype_Text_19AE6A, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Prototype_EventScript_160D60:: @ 8160D60
-	trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD
-	msgbox Route104_Prototype_Text_19B18D, 6
+	trainerbattle_double TRAINER_GINA_AND_MIA_2, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD
+	msgbox Route104_Prototype_Text_19B18D, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Prototype_EventScript_160D7B:: @ 8160D7B
-	trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E
-	msgbox Route104_Prototype_Text_19AF56, 6
+	trainerbattle_single TRAINER_MIKE_1, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E
+	msgbox Route104_Prototype_Text_19AF56, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Prototype_EventScript_160D92:: @ 8160D92
-	trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB
-	msgbox Route104_Prototype_Text_19B00D, 6
+	trainerbattle_single TRAINER_BRIANNA_1, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB
+	msgbox Route104_Prototype_Text_19B00D, MSGBOX_AUTOCLOSE
 	end
 
 Route104_Prototype_EventScript_160DA9:: @ 8160DA9
-	trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7
-	msgbox Route104_Prototype_Text_19B0EF, 6
+	trainerbattle_single TRAINER_LUCAS_2, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7
+	msgbox Route104_Prototype_Text_19B0EF, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index f979ab60b..75c3ab742 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
@@ -2,5 +2,5 @@ Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 8160DC0
 	.byte 0
 
 Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1:: @ 8160DC1
-	msgbox Route104_PrototypePrettyPetalFlowerShop_Text_19B436, 2
+	msgbox Route104_PrototypePrettyPetalFlowerShop_Text_19B436, MSGBOX_NPC
 	end
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index 7d0eeb62d..0b00a06de 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,5 +1,5 @@
 Route105_MapScripts:: @ 814F298
-	map_script 1, Route105_MapScript1_14F29E
+	map_script MAP_SCRIPT_ON_LOAD, Route105_MapScript1_14F29E
 	.byte 0
 
 Route105_MapScript1_14F29E:: @ 814F29E
@@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8
 	return
 
 Route105_EventScript_14F2BB:: @ 814F2BB
-	trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93
-	msgbox Route105_Text_1B8BDE, 6
+	trainerbattle_single TRAINER_FOSTER, Route105_Text_1B8B40, Route105_Text_1B8B93
+	msgbox Route105_Text_1B8BDE, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_14F2D2:: @ 814F2D2
-	trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99
-	msgbox Route105_Text_1B8CA9, 6
+	trainerbattle_single TRAINER_LUIS, Route105_Text_1B8C28, Route105_Text_1B8C99
+	msgbox Route105_Text_1B8CA9, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_14F2E9:: @ 814F2E9
-	trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23
-	msgbox Route105_Text_1B8D45, 6
+	trainerbattle_single TRAINER_AUSTIN, Route105_Text_1B8CEE, Route105_Text_1B8D23
+	msgbox Route105_Text_1B8D45, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_14F300:: @ 814F300
-	trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD
-	msgbox Route105_Text_1B8DED, 6
+	trainerbattle_single TRAINER_BEVERLY, Route105_Text_1B8D99, Route105_Text_1B8DDD
+	msgbox Route105_Text_1B8DED, MSGBOX_AUTOCLOSE
 	end
 
 Route105_EventScript_14F317:: @ 814F317
-	trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0
-	msgbox Route105_Text_1B8EBD, 6
+	trainerbattle_single TRAINER_DAWN, Route105_Text_1B8E66, Route105_Text_1B8EA0
+	msgbox Route105_Text_1B8EBD, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
index 1fe49235b..8a6204f08 100644
--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -2,33 +2,33 @@ Route106_MapScripts:: @ 814F32E
 	.byte 0
 
 Route106_EventScript_14F32F:: @ 814F32F
-	msgbox Route106_Text_16E026, 3
+	msgbox Route106_Text_16E026, MSGBOX_SIGN
 	end
 
 Route106_EventScript_14F338:: @ 814F338
-	trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F
-	msgbox Route106_Text_1B918A, 6
+	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_1B913D, Route106_Text_1B917F
+	msgbox Route106_Text_1B918A, MSGBOX_AUTOCLOSE
 	end
 
 Route106_EventScript_14F34F:: @ 814F34F
-	trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8
-	msgbox Route106_Text_1B9222, 6
+	trainerbattle_single TRAINER_NICOLE, Route106_Text_1B91AC, Route106_Text_1B91F8
+	msgbox Route106_Text_1B9222, MSGBOX_AUTOCLOSE
 	end
 
 Route106_EventScript_14F366:: @ 814F366
-	trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25
+	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_1B8EF0, Route106_Text_1B8F25
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route106_EventScript_14F38D
-	msgbox Route106_Text_1B8F55, 6
+	msgbox Route106_Text_1B8F55, MSGBOX_AUTOCLOSE
 	end
 
 Route106_EventScript_14F38D:: @ 814F38D
-	trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5
-	msgbox Route106_Text_1B9011, 6
+	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_1B8FAC, Route106_Text_1B8FF5
+	msgbox Route106_Text_1B9011, MSGBOX_AUTOCLOSE
 	end
 
 Route106_EventScript_14F3A4:: @ 814F3A4
-	trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3
-	msgbox Route106_Text_1B910A, 6
+	trainerbattle_single TRAINER_NED, Route106_Text_1B9052, Route106_Text_1B90D3
+	msgbox Route106_Text_1B910A, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
index 5ad30f9f4..43fc45825 100644
--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -2,39 +2,39 @@ Route107_MapScripts:: @ 814F3BB
 	.byte 0
 
 Route107_EventScript_14F3BC:: @ 814F3BC
-	trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7
-	msgbox Route107_Text_1B92E7, 6
+	trainerbattle_single TRAINER_DARRIN, Route107_Text_1B926B, Route107_Text_1B92B7
+	msgbox Route107_Text_1B92E7, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F3D3:: @ 814F3D3
-	trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365
+	trainerbattle_single TRAINER_TONY_1, Route107_Text_1B933A, Route107_Text_1B9365
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route107_EventScript_14F3FA
-	msgbox Route107_Text_1B938E, 6
+	msgbox Route107_Text_1B938E, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F3FA:: @ 814F3FA
-	trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429
-	msgbox Route107_Text_1B9477, 6
+	trainerbattle_rematch TRAINER_TONY_1, Route107_Text_1B93EB, Route107_Text_1B9429
+	msgbox Route107_Text_1B9477, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F411:: @ 814F411
-	trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2
-	msgbox Route107_Text_1B94FF, 6
+	trainerbattle_single TRAINER_DENISE, Route107_Text_1B94C8, Route107_Text_1B94F2
+	msgbox Route107_Text_1B94FF, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F428:: @ 814F428
-	trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B
-	msgbox Route107_Text_1B9589, 6
+	trainerbattle_single TRAINER_BETH, Route107_Text_1B9538, Route107_Text_1B956B
+	msgbox Route107_Text_1B9589, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F43F:: @ 814F43F
-	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672
-	msgbox Route107_Text_1B9630, 6
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672
+	msgbox Route107_Text_1B9630, MSGBOX_AUTOCLOSE
 	end
 
 Route107_EventScript_14F45A:: @ 814F45A
-	trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788
-	msgbox Route107_Text_1B9735, 6
+	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788
+	msgbox Route107_Text_1B9735, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc
index 498a52a51..561aca8e8 100644
--- a/data/maps/Route108/scripts.inc
+++ b/data/maps/Route108/scripts.inc
@@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475
 	.byte 0
 
 Route108_EventScript_14F476:: @ 814F476
-	trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF
-	msgbox Route108_Text_1B9823, 6
+	trainerbattle_single TRAINER_JEROME, Route108_Text_1B97C3, Route108_Text_1B97EF
+	msgbox Route108_Text_1B9823, MSGBOX_AUTOCLOSE
 	end
 
 Route108_EventScript_14F48D:: @ 814F48D
-	trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F
-	msgbox Route108_Text_1B98BC, 6
+	trainerbattle_single TRAINER_MATTHEW, Route108_Text_1B9864, Route108_Text_1B989F
+	msgbox Route108_Text_1B98BC, MSGBOX_AUTOCLOSE
 	end
 
 Route108_EventScript_14F4A4:: @ 814F4A4
-	trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C
-	msgbox Route108_Text_1B9935, 6
+	trainerbattle_single TRAINER_TARA, Route108_Text_1B98EC, Route108_Text_1B992C
+	msgbox Route108_Text_1B9935, MSGBOX_AUTOCLOSE
 	end
 
 Route108_EventScript_14F4BB:: @ 814F4BB
-	trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB
-	msgbox Route108_Text_1B99E9, 6
+	trainerbattle_single TRAINER_MISSY, Route108_Text_1B9986, Route108_Text_1B99BB
+	msgbox Route108_Text_1B99E9, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index eeb21cacf..a0099f5ec 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -2,7 +2,7 @@ Route109_MapScripts:: @ 814F4D2
 	.byte 0
 
 Route109_EventScript_14F4D3:: @ 814F4D3
-	call Route109_EventScript_1A010C
+	call EventScript_BackupMrBrineyLocation
 	setobjectpriority 2, MAP_ROUTE109, 0
 	setobjectpriority 255, MAP_ROUTE109, 0
 	applymovement 2, Route109_Movement_14F67B
@@ -15,32 +15,32 @@ Route109_EventScript_14F4D3:: @ 814F4D3
 	end
 
 Route109_EventScript_14F518:: @ 814F518
-	applymovement 255, Route109_Movement_14F66D
+	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F66D
 	waitmovement 0
 	goto Route109_EventScript_14F548
 	end
 
 Route109_EventScript_14F528:: @ 814F528
-	applymovement 255, Route109_Movement_14F675
+	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F675
 	waitmovement 0
 	goto Route109_EventScript_14F548
 	end
 
 Route109_EventScript_14F538:: @ 814F538
-	applymovement 255, Route109_Movement_14F678
+	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F678
 	waitmovement 0
 	goto Route109_EventScript_14F548
 	end
 
 Route109_EventScript_14F548:: @ 814F548
-	hideobjectat 255, MAP_ROUTE109
-	call Route109_EventScript_1A02E7
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
+	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement 1, Route109_Movement_14F5BF
-	applymovement 255, Route109_Movement_14F5BF
+	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F5BF
 	waitmovement 0
-	call Route109_EventScript_1A02EF
-	showobjectat 255, MAP_DEWFORD_TOWN
-	applymovement 255, Route109_Movement_14F670
+	call Common_EventScript_StopBrineysBoatMusic
+	showobjectat OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
+	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_14F670
 	waitmovement 0
 	addobject 4
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
@@ -52,10 +52,10 @@ Route109_EventScript_14F548:: @ 814F548
 	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
 	hideobjectat 1, MAP_ROUTE109
-	msgbox Route109_Text_16B4B5, 4
+	msgbox Route109_Text_16B4B5, MSGBOX_DEFAULT
 	closemessage
 	copyvar VAR_BRINEY_LOCATION, VAR_0x8008
-	resetobjectpriority 255, MAP_ROUTE109
+	resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
 	resetobjectpriority 2, MAP_DEWFORD_TOWN
 	moveobjectoffscreen 2
 	release
@@ -235,38 +235,38 @@ Route109_Movement_14F5BF:: @ 814F5BF
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route109_Movement_14F66D:: @ 814F66D
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route109_Movement_14F670:: @ 814F670
 	walk_down
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 Route109_Movement_14F675:: @ 814F675
 	walk_right
 	walk_down
-	end_movement
+	step_end
 
 Route109_Movement_14F678:: @ 814F678
 	walk_left
 	walk_down
-	end_movement
+	step_end
 
 Route109_Movement_14F67B:: @ 814F67B
 	walk_down
-	end_movement
+	step_end
 
 Route109_Movement_14F67D:: @ 814F67D
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 Route109_EventScript_14F680:: @ 814F680
 	lock
@@ -294,31 +294,31 @@ Route109_EventScript_14F6AF:: @ 814F6AF
 	end
 
 Route109_EventScript_14F6E2:: @ 814F6E2
-	msgbox Route109_Text_16E159, 4
+	msgbox Route109_Text_16E159, MSGBOX_DEFAULT
 	closemessage
 	goto Route109_EventScript_14F4D3
 	end
 
 Route109_EventScript_14F6F1:: @ 814F6F1
-	msgbox Route109_Text_16E1B1, 4
+	msgbox Route109_Text_16E1B1, MSGBOX_DEFAULT
 	release
 	end
 
 Route109_EventScript_14F6FB:: @ 814F6FB
-	msgbox Route109_Text_16E2C5, 4
+	msgbox Route109_Text_16E2C5, MSGBOX_DEFAULT
 	release
 	end
 
 Route109_EventScript_14F705:: @ 814F705
-	msgbox Route109_Text_16E307, 2
+	msgbox Route109_Text_16E307, MSGBOX_NPC
 	end
 
 Route109_EventScript_14F70E:: @ 814F70E
 	lock
 	faceplayer
-	msgbox Route109_Text_16E405, 4
+	msgbox Route109_Text_16E405, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -328,30 +328,30 @@ Route109_EventScript_14F725:: @ 814F725
 	faceplayer
 	special GetPlayerBigGuyGirlString
 	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
-	msgbox Route109_Text_16E433, 4
-	giveitem_std ITEM_SOFT_SAND
+	msgbox Route109_Text_16E433, MSGBOX_DEFAULT
+	giveitem ITEM_SOFT_SAND
 	compare VAR_RESULT, 0
-	goto_if_eq Route109_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	closemessage
-	applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_RECEIVED_SOFT_SAND
 	release
 	end
 
 Route109_EventScript_14F762:: @ 814F762
-	msgbox Route109_Text_16E446, 4
-	applymovement VAR_LAST_TALKED, Route109_Movement_1A083D
+	msgbox Route109_Text_16E446, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 Route109_EventScript_14F776:: @ 814F776
-	msgbox Route109_Text_16E35B, 2
+	msgbox Route109_Text_16E35B, MSGBOX_NPC
 	end
 
 Route109_EventScript_14F77F:: @ 814F77F
-	msgbox Route109_Text_16E4D5, 2
+	msgbox Route109_Text_16E4D5, MSGBOX_NPC
 	end
 
 Route109_EventScript_14F788:: @ 814F788
@@ -359,86 +359,86 @@ Route109_EventScript_14F788:: @ 814F788
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox Route109_Text_16E5CA, 4
+	msgbox Route109_Text_16E5CA, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
 Route109_EventScript_14F79B:: @ 814F79B
-	msgbox Route109_Text_16E5DC, 3
+	msgbox Route109_Text_16E5DC, MSGBOX_SIGN
 	end
 
 Route109_EventScript_14F7A4:: @ 814F7A4
-	msgbox Route109_Text_16E62C, 3
+	msgbox Route109_Text_16E62C, MSGBOX_SIGN
 	end
 
 Route109_EventScript_14F7AD:: @ 814F7AD
-	trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59
-	msgbox Route109_Text_1B9A6D, 6
+	trainerbattle_single TRAINER_DAVID, Route109_Text_1B9A1C, Route109_Text_1B9A59
+	msgbox Route109_Text_1B9A6D, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F7C4:: @ 814F7C4
-	trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9
-	msgbox Route109_Text_1B9AEB, 6
+	trainerbattle_single TRAINER_ALICE, Route109_Text_1B9AAD, Route109_Text_1B9AD9
+	msgbox Route109_Text_1B9AEB, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F7DB:: @ 814F7DB
-	trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57
-	msgbox Route109_Text_1B9B68, 6
+	trainerbattle_single TRAINER_HUEY, Route109_Text_1B9B11, Route109_Text_1B9B57
+	msgbox Route109_Text_1B9B68, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F7F2:: @ 814F7F2
-	trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE
-	msgbox Route109_Text_1B9BD3, 6
+	trainerbattle_single TRAINER_EDMOND, Route109_Text_1B9B91, Route109_Text_1B9BAE
+	msgbox Route109_Text_1B9BD3, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F809:: @ 814F809
-	trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
+	trainerbattle_single TRAINER_RICKY_1, Route109_Text_1B9C23, Route109_Text_1B9C65
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route109_EventScript_14F830
-	msgbox Route109_Text_1B9C6E, 6
+	msgbox Route109_Text_1B9C6E, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F830:: @ 814F830
-	trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB
-	msgbox Route109_Text_1B9D10, 6
+	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_1B9CB3, Route109_Text_1B9CEB
+	msgbox Route109_Text_1B9D10, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F847:: @ 814F847
-	trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
+	trainerbattle_single TRAINER_LOLA_1, Route109_Text_1B9D54, Route109_Text_1B9D87
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route109_EventScript_14F86E
-	msgbox Route109_Text_1B9D8E, 6
+	msgbox Route109_Text_1B9D8E, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F86E:: @ 814F86E
-	trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16
-	msgbox Route109_Text_1B9E1D, 6
+	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_1B9DD8, Route109_Text_1B9E16
+	msgbox Route109_Text_1B9E1D, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F885:: @ 814F885
-	trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1
-	msgbox Route109_Text_1B9ECA, 6
+	trainerbattle_single TRAINER_CARMEN, Route109_Text_1B9E60, Route109_Text_1B9EA1
+	msgbox Route109_Text_1B9ECA, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F89C:: @ 814F89C
-	trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31
-	msgbox Route109_Text_1B9F44, 6
+	trainerbattle_single TRAINER_GWEN, Route109_Text_1B9F07, Route109_Text_1B9F31
+	msgbox Route109_Text_1B9F44, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F8B3:: @ 814F8B3
-	trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C
-	msgbox Route109_Text_1B9FB7, 6
+	trainerbattle_single TRAINER_CARTER, Route109_Text_1B9F65, Route109_Text_1B9F9C
+	msgbox Route109_Text_1B9FB7, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F8CA:: @ 814F8CA
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
-	msgbox Route109_Text_1BA069, 6
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
+	msgbox Route109_Text_1BA069, MSGBOX_AUTOCLOSE
 	end
 
 Route109_EventScript_14F8E5:: @ 814F8E5
-	trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
-	msgbox Route109_Text_1BA193, 6
+	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
+	msgbox Route109_Text_1BA193, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index b4a731471..436152b3e 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route109_SeashoreHouse_MapScripts:: @ 8160DCA
-	map_script 3, Route109_SeashoreHouse_MapScript1_160DD0
+	map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_MapScript1_160DD0
 	.byte 0
 
 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0
@@ -12,19 +12,19 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4
 	goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36
 	goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08
 	goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE
-	msgbox Route109_SeashoreHouse_Text_19B4D9, 4
+	msgbox Route109_SeashoreHouse_Text_19B4D9, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE
-	msgbox Route109_SeashoreHouse_Text_19B5B9, 4
+	msgbox Route109_SeashoreHouse_Text_19B5B9, MSGBOX_DEFAULT
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08
-	msgbox Route109_SeashoreHouse_Text_19B609, 4
-	giveitem_std ITEM_SODA_POP, 6
+	msgbox Route109_SeashoreHouse_Text_19B609, MSGBOX_DEFAULT
+	giveitem ITEM_SODA_POP, 6
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E2C
 	setflag FLAG_RECEIVED_6_SODA_POP
@@ -32,7 +32,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08
 	end
 
 Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C
-	msgbox Route109_SeashoreHouse_Text_19B6BE, 4
+	msgbox Route109_SeashoreHouse_Text_19B6BE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -42,58 +42,58 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36
 	msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E5A
-	msgbox Route109_SeashoreHouse_Text_19B773, 4
+	msgbox Route109_SeashoreHouse_Text_19B773, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A
-	checkmoney 0x12c, 0
+	checkmoney 300, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_160E9E
 	checkitemspace ITEM_SODA_POP, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Route109_SeashoreHouse_EventScript_160EAB
-	msgbox Route109_SeashoreHouse_Text_19B74C, 4
-	takemoney 0x12c, 0
+	msgbox Route109_SeashoreHouse_Text_19B74C, MSGBOX_DEFAULT
+	removemoney 300, 0
 	updatemoneybox 0, 0
 	nop
-	giveitem_std ITEM_SODA_POP
+	giveitem ITEM_SODA_POP
 	hidemoneybox 0, 0
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E
-	msgbox Route109_SeashoreHouse_Text_19B759, 4
+	msgbox Route109_SeashoreHouse_Text_19B759, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB
-	msgbox Route109_SeashoreHouse_Text_1A0CC2, 4
+	msgbox Text_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox 0, 0
 	release
 	end
 
 Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8
-	trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09
-	msgbox Route109_SeashoreHouse_Text_19B89F, 6
+	trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09
+	msgbox Route109_SeashoreHouse_Text_19B89F, MSGBOX_AUTOCLOSE
 	end
 
 Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3
-	trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09
-	msgbox Route109_SeashoreHouse_Text_19B955, 6
+	trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09
+	msgbox Route109_SeashoreHouse_Text_19B955, MSGBOX_AUTOCLOSE
 	end
 
 Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE
-	trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09
-	msgbox Route109_SeashoreHouse_Text_19B9E5, 6
+	trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09
+	msgbox Route109_SeashoreHouse_Text_19B9E5, MSGBOX_AUTOCLOSE
 	end
 
 Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09
-	goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29
-	goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29
-	goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29
+	goto_if_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29
 	setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS
 	release
 	end
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index 077770cd2..80605c132 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -1,7 +1,7 @@
 Route110_MapScripts:: @ 814F900
-	map_script 5, Route110_MapScript1_14F910
-	map_script 3, Route110_MapScript1_14F914
-	map_script 2, Route110_MapScript2_14F933
+	map_script MAP_SCRIPT_ON_RESUME, Route110_MapScript1_14F910
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_MapScript1_14F914
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_MapScript2_14F933
 	.byte 0
 
 Route110_MapScript1_14F910:: @ 814F910
@@ -9,9 +9,9 @@ Route110_MapScript1_14F910:: @ 814F910
 	end
 
 Route110_MapScript1_14F914:: @ 814F914
-	call Route110_EventScript_1A0196
-	call Route110_EventScript_1A014E
-	call Route110_EventScript_1A0172
+	call Common_EventScript_SetupEvilTeamGfxIds
+	call Common_EventScript_SetupRivalGfxId
+	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_CYCLING_CHALLENGE_STATE, 1
 	call_if_eq Route110_EventScript_14F92F
 	end
@@ -32,8 +32,8 @@ Route110_EventScript_14F93D:: @ 814F93D
 Route110_EventScript_14F946:: @ 814F946
 	lock
 	faceplayer
-	msgbox Route110_Text_16E6C0, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_1A083D
+	msgbox Route110_Text_16E6C0, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -41,8 +41,8 @@ Route110_EventScript_14F946:: @ 814F946
 Route110_EventScript_14F95C:: @ 814F95C
 	lock
 	faceplayer
-	msgbox Route110_Text_16E6F2, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_1A083D
+	msgbox Route110_Text_16E6F2, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -50,8 +50,8 @@ Route110_EventScript_14F95C:: @ 814F95C
 Route110_EventScript_14F972:: @ 814F972
 	lock
 	faceplayer
-	msgbox Route110_Text_16E729, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_1A083D
+	msgbox Route110_Text_16E729, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -59,74 +59,74 @@ Route110_EventScript_14F972:: @ 814F972
 Route110_EventScript_14F988:: @ 814F988
 	lock
 	faceplayer
-	msgbox Route110_Text_16E76A, 4
-	applymovement VAR_LAST_TALKED, Route110_Movement_1A083D
+	msgbox Route110_Text_16E76A, MSGBOX_DEFAULT
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 Route110_EventScript_14F99E:: @ 814F99E
-	msgbox Route110_Text_16EB22, 2
+	msgbox Route110_Text_16EB22, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9A7:: @ 814F9A7
-	msgbox Route110_Text_16EB65, 2
+	msgbox Route110_Text_16EB65, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9B0:: @ 814F9B0
-	msgbox Route110_Text_16EBC9, 2
+	msgbox Route110_Text_16EBC9, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9B9:: @ 814F9B9
-	msgbox Route110_Text_16EDC5, 2
+	msgbox Route110_Text_16EDC5, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9C2:: @ 814F9C2
-	msgbox Route110_Text_16EE30, 2
+	msgbox Route110_Text_16EE30, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9CB:: @ 814F9CB
-	msgbox Route110_Text_16EE74, 2
+	msgbox Route110_Text_16EE74, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9D4:: @ 814F9D4
-	msgbox Route110_Text_16EEF6, 2
+	msgbox Route110_Text_16EEF6, MSGBOX_NPC
 	end
 
 Route110_EventScript_14F9DD:: @ 814F9DD
-	msgbox Route110_Text_16F381, 3
+	msgbox Route110_Text_16F381, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14F9E6:: @ 814F9E6
-	msgbox Route110_Text_16F39C, 3
+	msgbox Route110_Text_16F39C, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14F9EF:: @ 814F9EF
-	msgbox Route110_Text_16F3B1, 3
+	msgbox Route110_Text_16F3B1, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14F9F8:: @ 814F9F8
-	msgbox Route110_Text_16F3E9, 3
+	msgbox Route110_Text_16F3E9, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA01:: @ 814FA01
-	msgbox Route110_Text_16F3FF, 3
+	msgbox Route110_Text_16F3FF, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA0A:: @ 814FA0A
-	msgbox Route110_Text_16F40F, 3
+	msgbox Route110_Text_16F40F, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA13:: @ 814FA13
-	msgbox Route110_Text_16F429, 3
+	msgbox Route110_Text_16F429, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA1C:: @ 814FA1C
-	msgbox Route110_Text_16F4AE, 3
+	msgbox Route110_Text_16F4AE, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA25:: @ 814FA25
-	msgbox Route110_Text_16F4F7, 3
+	msgbox Route110_Text_16F4F7, MSGBOX_SIGN
 	end
 
 Route110_EventScript_14FA2E:: @ 814FA2E
@@ -134,12 +134,12 @@ Route110_EventScript_14FA2E:: @ 814FA2E
 	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
 	compare VAR_RESULT, 0
 	goto_if_eq Route110_EventScript_14FA49
-	msgbox Route110_Text_16F53A, 4
+	msgbox Route110_Text_16F53A, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_EventScript_14FA49:: @ 814FA49
-	msgbox Route110_Text_16F57C, 4
+	msgbox Route110_Text_16F57C, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -151,110 +151,110 @@ Route110_EventScript_14FA53:: @ 814FA53
 	goto_if_eq Route110_EventScript_14FA84
 	compare VAR_CYCLING_CHALLENGE_STATE, 0
 	goto_if_eq Route110_EventScript_14FA7A
-	msgbox Route110_Text_16F26A, 4
+	msgbox Route110_Text_16F26A, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_14FA7A:: @ 814FA7A
-	msgbox Route110_Text_16F1D0, 4
+	msgbox Route110_Text_16F1D0, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_14FA84:: @ 814FA84
-	msgbox Route110_Text_16F2C4, 4
+	msgbox Route110_Text_16F2C4, MSGBOX_DEFAULT
 	release
 	end
 
 Route110_EventScript_14FA8E:: @ 814FA8E
-	trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2
-	msgbox Route110_Text_1BA6F8, 6
+	trainerbattle_single TRAINER_EDWARD, Route110_Text_1BA699, Route110_Text_1BA6D2
+	msgbox Route110_Text_1BA6F8, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FAA5:: @ 814FAA5
-	trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759
-	msgbox Route110_Text_1BA76C, 6
+	trainerbattle_single TRAINER_JACLYN, Route110_Text_1BA72D, Route110_Text_1BA759
+	msgbox Route110_Text_1BA76C, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FABC:: @ 814FABC
-	trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
+	trainerbattle_single TRAINER_EDWIN_1, Route110_Text_1BA7D2, Route110_Text_1BA803
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_EventScript_14FAE3
-	msgbox Route110_Text_1BA829, 6
+	msgbox Route110_Text_1BA829, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FAE3:: @ 814FAE3
-	trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD
-	msgbox Route110_Text_1BA8E9, 6
+	trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_1BA877, Route110_Text_1BA8CD
+	msgbox Route110_Text_1BA8E9, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FAFA:: @ 814FAFA
-	trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C
-	msgbox Route110_Text_1BA94A, 6
+	trainerbattle_single TRAINER_DALE, Route110_Text_1BA913, Route110_Text_1BA93C
+	msgbox Route110_Text_1BA94A, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB11:: @ 814FB11
-	trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264
-	msgbox Route110_Text_1BA27C, 6
+	trainerbattle_single TRAINER_JACOB, Route110_Text_1BA22C, Route110_Text_1BA264
+	msgbox Route110_Text_1BA27C, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB28:: @ 814FB28
-	trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC
-	msgbox Route110_Text_1BA30C, 6
+	trainerbattle_single TRAINER_ANTHONY, Route110_Text_1BA2D4, Route110_Text_1BA2FC
+	msgbox Route110_Text_1BA30C, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB3F:: @ 814FB3F
-	trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
+	trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_1BA352, Route110_Text_1BA379
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_EventScript_14FB66
-	msgbox Route110_Text_1BA3A5, 6
+	msgbox Route110_Text_1BA3A5, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB66:: @ 814FB66
-	trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432
-	msgbox Route110_Text_1BA456, 6
+	trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_1BA3EF, Route110_Text_1BA432
+	msgbox Route110_Text_1BA456, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB7D:: @ 814FB7D
-	trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C
-	msgbox Route110_Text_1BA65F, 6
+	trainerbattle_single TRAINER_JASMINE, Route110_Text_1BA5FF, Route110_Text_1BA63C
+	msgbox Route110_Text_1BA65F, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FB94:: @ 814FB94
-	trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
+	trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_1BA4A0, Route110_Text_1BA50F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_EventScript_14FBBB
-	msgbox Route110_Text_1BA52E, 6
+	msgbox Route110_Text_1BA52E, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FBBB:: @ 814FBBB
-	trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1
-	msgbox Route110_Text_1BA5C4, 6
+	trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_1BA573, Route110_Text_1BA5A1
+	msgbox Route110_Text_1BA5C4, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FBD2:: @ 814FBD2
-	trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
+	trainerbattle_single TRAINER_ISABEL_1, Route110_Text_1BA990, Route110_Text_1BA9D0
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_EventScript_14FBF9
-	msgbox Route110_Text_1BA9E9, 6
+	msgbox Route110_Text_1BA9E9, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FBF9:: @ 814FBF9
-	trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76
-	msgbox Route110_Text_1BAA8F, 6
+	trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_1BAA2D, Route110_Text_1BAA76
+	msgbox Route110_Text_1BAA8F, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FC10:: @ 814FC10
-	trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7
-	msgbox Route110_Text_1BAB19, 6
+	trainerbattle_single TRAINER_TIMMY, Route110_Text_1BAAC3, Route110_Text_1BAAF7
+	msgbox Route110_Text_1BAB19, MSGBOX_AUTOCLOSE
 	end
 
 Route110_EventScript_14FC27:: @ 814FC27
 	lockall
-	applymovement 21, Route110_Movement_1A0843
+	applymovement 21, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	call Route110_EventScript_14FC39
 	releaseall
@@ -262,7 +262,7 @@ Route110_EventScript_14FC27:: @ 814FC27
 
 Route110_EventScript_14FC39:: @ 814FC39
 	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_16EF65, 4
+	msgbox Route110_Text_16EF65, MSGBOX_DEFAULT
 	switch VAR_RESULT
 	case 10, Route110_EventScript_14FCC3
 	case 9, Route110_EventScript_14FCD1
@@ -278,27 +278,27 @@ Route110_EventScript_14FC39:: @ 814FC39
 	end
 
 Route110_EventScript_14FCC3:: @ 814FCC3
-	msgbox Route110_Text_16EF9F, 4
+	msgbox Route110_Text_16EF9F, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FD09
 	end
 
 Route110_EventScript_14FCD1:: @ 814FCD1
-	msgbox Route110_Text_16F012, 4
+	msgbox Route110_Text_16F012, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FD09
 	end
 
 Route110_EventScript_14FCDF:: @ 814FCDF
-	msgbox Route110_Text_16F069, 4
+	msgbox Route110_Text_16F069, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FD09
 	end
 
 Route110_EventScript_14FCED:: @ 814FCED
-	msgbox Route110_Text_16F0D0, 4
+	msgbox Route110_Text_16F0D0, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FD09
 	end
 
 Route110_EventScript_14FCFB:: @ 814FCFB
-	msgbox Route110_Text_16F139, 4
+	msgbox Route110_Text_16F139, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FD09
 	end
 
@@ -330,11 +330,11 @@ Route110_EventScript_14FD34:: @ 814FD34
 	call_if_eq Route110_EventScript_14FDA7
 	compare VAR_RESULT, 1
 	call_if_eq Route110_EventScript_14FDAC
-	applymovement 28, Route110_Movement_1A0845
+	applymovement 28, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 28, Route110_Movement_1A0833
+	applymovement 28, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 28, Route110_Movement_1A0835
+	applymovement 28, Common_Movement_Delay48
 	waitmovement 0
 	delay 30
 	compare VAR_0x8008, 1
@@ -360,7 +360,7 @@ Route110_EventScript_14FDAC:: @ 814FDAC
 	return
 
 Route110_EventScript_14FDB1:: @ 814FDB1
-	msgbox Route110_Text_16E7A1, 4
+	msgbox Route110_Text_16E7A1, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_14FDE0
 	case 1, Route110_EventScript_14FDF0
@@ -368,29 +368,29 @@ Route110_EventScript_14FDB1:: @ 814FDB1
 	end
 
 Route110_EventScript_14FDE0:: @ 814FDE0
-	trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826
+	trainerbattle_no_intro TRAINER_MAY_5, Route110_Text_16E826
 	goto Route110_EventScript_14FE10
 	end
 
 Route110_EventScript_14FDF0:: @ 814FDF0
-	trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826
+	trainerbattle_no_intro TRAINER_MAY_8, Route110_Text_16E826
 	goto Route110_EventScript_14FE10
 	end
 
 Route110_EventScript_14FE00:: @ 814FE00
-	trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826
+	trainerbattle_no_intro TRAINER_MAY_2, Route110_Text_16E826
 	goto Route110_EventScript_14FE10
 	end
 
 Route110_EventScript_14FE10:: @ 814FE10
-	msgbox Route110_Text_16E84C, 4
+	msgbox Route110_Text_16E84C, MSGBOX_DEFAULT
 	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16E8B3, 4
+	msgbox Route110_Text_16E8B3, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FEB2
 	end
 
 Route110_EventScript_14FE2B:: @ 814FE2B
-	msgbox Route110_Text_16E99A, 4
+	msgbox Route110_Text_16E99A, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_14FE5A
 	case 1, Route110_EventScript_14FE6A
@@ -398,29 +398,29 @@ Route110_EventScript_14FE2B:: @ 814FE2B
 	end
 
 Route110_EventScript_14FE5A:: @ 814FE5A
-	trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F
+	trainerbattle_no_intro TRAINER_BRENDAN_5, Route110_Text_16EA0F
 	goto Route110_EventScript_14FE8A
 	end
 
 Route110_EventScript_14FE6A:: @ 814FE6A
-	trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F
+	trainerbattle_no_intro TRAINER_BRENDAN_8, Route110_Text_16EA0F
 	goto Route110_EventScript_14FE8A
 	end
 
 Route110_EventScript_14FE7A:: @ 814FE7A
-	trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F
+	trainerbattle_no_intro TRAINER_BRENDAN_2, Route110_Text_16EA0F
 	goto Route110_EventScript_14FE8A
 	end
 
 Route110_EventScript_14FE8A:: @ 814FE8A
-	msgbox Route110_Text_16EA2A, 4
+	msgbox Route110_Text_16EA2A, MSGBOX_DEFAULT
 	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16EA7B, 4
+	msgbox Route110_Text_16EA7B, MSGBOX_DEFAULT
 	goto Route110_EventScript_14FEB2
 	end
 
 Route110_EventScript_14FEA5:: @ 814FEA5
-	giveitem_std ITEM_ITEMFINDER
+	giveitem ITEM_ITEMFINDER
 	return
 
 Route110_EventScript_14FEB2:: @ 814FEB2
@@ -495,17 +495,17 @@ Route110_Movement_14FF6E:: @ 814FF6E
 	walk_down
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route110_Movement_14FF72:: @ 814FF72
 	walk_down
-	end_movement
+	step_end
 
 Route110_Movement_14FF74:: @ 814FF74
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route110_Movement_14FF78:: @ 814FF78
 	walk_fast_up
@@ -515,7 +515,7 @@ Route110_Movement_14FF78:: @ 814FF78
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route110_Movement_14FF80:: @ 814FF80
 	walk_fast_up
@@ -526,7 +526,7 @@ Route110_Movement_14FF80:: @ 814FF80
 	walk_fast_up
 	walk_fast_up
 	walk_fast_down
-	end_movement
+	step_end
 
 Route110_Movement_14FF89:: @ 814FF89
 	walk_fast_up
@@ -536,4 +536,4 @@ Route110_Movement_14FF89:: @ 814FF89
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
index 35809885d..31d41362f 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -1,5 +1,5 @@
 Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8
-	map_script 3, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE
 	.byte 0
 
 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE
@@ -16,7 +16,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB
 	lock
 	faceplayer
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E406, 4
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E406, MSGBOX_DEFAULT
 	release
 	end
 
@@ -40,16 +40,16 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D
 
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
 @ You don't have a bike!
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
+	applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
 	waitmovement 0
 	releaseall
 	end
 
 Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538
 	walk_left
-	end_movement
+	step_end
 
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
 @ Coord event directly in front of the gatesman heading right to left
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
index 67ef10af6..23e2c4599 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -4,7 +4,7 @@ Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 816347E
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F
 	lock
 	faceplayer
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E326, 4
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E326, MSGBOX_DEFAULT
 	release
 	end
 
@@ -19,16 +19,16 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
 	end
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB
+	applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB
 	waitmovement 0
 	releaseall
 	end
 
 Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
 	walk_left
-	end_movement
+	step_end
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
 	lockall
diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index be70476e6..fa2fa8f67 100644
--- a/data/maps/Route110_TrickHouseCorridor/scripts.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
@@ -1,5 +1,5 @@
 Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC
-	map_script 3, Route110_TrickHouseCorridor_MapScript1_161CF2
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_MapScript1_161CF2
 	.byte 0
 
 Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index f294ea2b2..683637648 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,8 +1,8 @@
 Route110_TrickHouseEnd_MapScripts:: @ 8161936
-	map_script 5, Route110_TrickHouseEnd_MapScript1_16194B
-	map_script 3, Route110_TrickHouseEnd_MapScript1_161957
-	map_script 2, Route110_TrickHouseEnd_MapScript2_16197C
-	map_script 4, Route110_TrickHouseEnd_MapScript2_161965
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_16194B
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_MapScript1_161957
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_16197C
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_161965
 	.byte 0
 
 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B
@@ -43,7 +43,7 @@ Route110_TrickHouseEnd_EventScript_161994:: @ 8161994
 Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E
 	lock
 	faceplayer
-	msgbox Route110_TrickHouseEnd_Text_19C281, 4
+	msgbox Route110_TrickHouseEnd_Text_19C281, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
 	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
 	case 0, Route110_TrickHouseEnd_EventScript_161A0B
@@ -57,98 +57,98 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E
 	end
 
 Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
-	msgbox Route110_TrickHouseEnd_Text_19C2B2, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C2B2, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_RARE_CANDY
+	giveitem ITEM_RARE_CANDY
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
-	msgbox Route110_TrickHouseEnd_Text_19C333, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C333, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TIMER_BALL
+	giveitem ITEM_TIMER_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
-	msgbox Route110_TrickHouseEnd_Text_19C3A7, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C3A7, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_HARD_STONE
+	giveitem ITEM_HARD_STONE
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
-	msgbox Route110_TrickHouseEnd_Text_19C41F, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C41F, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_SMOKE_BALL
+	giveitem ITEM_SMOKE_BALL
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
-	msgbox Route110_TrickHouseEnd_Text_19C491, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C491, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TM12_TAUNT
+	giveitem ITEM_TM12_TAUNT
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
-	msgbox Route110_TrickHouseEnd_Text_19C515, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C515, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_MAGNET
+	giveitem ITEM_MAGNET
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
-	msgbox Route110_TrickHouseEnd_Text_19C567, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	msgbox Route110_TrickHouseEnd_Text_19C567, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_19C90B, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_PP_MAX
+	giveitem ITEM_PP_MAX
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, MSGBOX_DEFAULT
 	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
-	msgbox Route110_TrickHouseEnd_Text_19C5AF, 4
+	msgbox Route110_TrickHouseEnd_Text_19C5AF, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 1
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C74
@@ -159,21 +159,21 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	compare VAR_FACING, 4
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C95
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_19C602, 4
+	msgbox Route110_TrickHouseEnd_Text_19C602, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_19C691, 4
+	msgbox Route110_TrickHouseEnd_Text_19C691, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	.ifdef SAPPHIRE
-	givedecoration_std DECOR_BLUE_TENT
+	givedecoration DECOR_BLUE_TENT
 	.else
-	givedecoration_std DECOR_RED_TENT
+	givedecoration DECOR_RED_TENT
 	.endc
 	compare VAR_RESULT, 0
 	call_if_eq Route110_TrickHouseEnd_EventScript_161C61
-	msgbox Route110_TrickHouseEnd_Text_19C85C, 4
+	msgbox Route110_TrickHouseEnd_Text_19C85C, MSGBOX_DEFAULT
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	special ResetTrickHouseEndRoomFlag
 	release
@@ -190,34 +190,34 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E
 	return
 
 Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E
-	call Route110_TrickHouseEnd_EventScript_1A02A5
-	msgbox Route110_TrickHouseEnd_Text_19C92E, 4
+	call Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEnd_Text_19C92E, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61
-	call Route110_TrickHouseEnd_EventScript_1A02B8
-	msgbox Route110_TrickHouseEnd_Text_19C7D7, 4
+	call Common_EventScript_NoRoomForDecor
+	msgbox Route110_TrickHouseEnd_Text_19C7D7, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
 Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0845
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0843
+	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -225,17 +225,17 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
 	lockall
 	turnobject 1, 3
 	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 20
 	applymovement 1, Route110_TrickHouseEnd_Movement_161CEA
 	waitmovement 0
 	playse SE_W153
-	applymovement 255, Route110_TrickHouseEnd_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route110_TrickHouseEnd_Text_19CA8B, 4
+	msgbox Route110_TrickHouseEnd_Text_19CA8B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 255, Route110_TrickHouseEnd_Movement_161CE8
+	applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEnd_Movement_161CE8
 	waitmovement 0
 	delay 4
 	turnobject 1, 4
@@ -244,8 +244,8 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
 
 Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8
 	walk_down
-	end_movement
+	step_end
 
 Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA
 	jump_in_place_left
-	end_movement
+	step_end
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index ae36aa84a..794237957 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -1,7 +1,7 @@
 Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
-	map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B
-	map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD
-	map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_MapScript1_160F3B
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_1611CD
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_1610B2
 	.byte 0
 
 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
@@ -134,7 +134,7 @@ Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	turnobject 1, 4
-	turnobject 255, 3
+	turnobject OBJ_EVENT_ID_PLAYER, 3
 	end
 
 Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
@@ -208,7 +208,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
 	delay 20
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
-	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BD82, MSGBOX_DEFAULT
 	closemessage
 	delay 20
 	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
@@ -237,9 +237,9 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
 
 Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
 	playse SE_PIN
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
@@ -265,35 +265,35 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
 	end
 
 Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD
-	msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BA6E, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6
-	msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BAC0, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF
-	msgbox Route110_TrickHouseEntrance_Text_19BB11, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BB11, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8
-	msgbox Route110_TrickHouseEntrance_Text_19BB61, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BB61, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1
-	msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BBB4, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA
-	msgbox Route110_TrickHouseEntrance_Text_19BC04, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BC04, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303
-	msgbox Route110_TrickHouseEntrance_Text_19BC55, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BC55, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
-	msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BCA8, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEnd_Movement_161315:: @ 8161315
@@ -306,7 +306,7 @@ Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
 	delay_4
 	face_right
 	delay_4
-	end_movement
+	step_end
 
 Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
 Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
@@ -318,32 +318,32 @@ Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
 	slide_up
 	slide_up
 	slide_up
-	end_movement
+	step_end
 
 Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
-	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BCFD, MSGBOX_DEFAULT
 	return
 
 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
-	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BF19, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	msgbox Route110_TrickHouseEntrance_Text_19BFAB, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C07E, 4
+	msgbox Route110_TrickHouseEntrance_Text_19C07E, MSGBOX_DEFAULT
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
@@ -361,102 +361,102 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
 	end
 
 Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
-	giveitem_std ITEM_RARE_CANDY
+	giveitem ITEM_RARE_CANDY
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
-	giveitem_std ITEM_TIMER_BALL
+	giveitem ITEM_TIMER_BALL
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
-	giveitem_std ITEM_HARD_STONE
+	giveitem ITEM_HARD_STONE
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
-	giveitem_std ITEM_SMOKE_BALL
+	giveitem ITEM_SMOKE_BALL
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
-	giveitem_std ITEM_TM12_TAUNT
+	giveitem ITEM_TM12_TAUNT
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
-	giveitem_std ITEM_MAGNET
+	giveitem ITEM_MAGNET
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
-	giveitem_std ITEM_PP_MAX
+	giveitem ITEM_PP_MAX
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	call_if_eq Common_EventScript_BagIsFull
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
+	msgbox Route110_TrickHouseEntrance_Text_19C128, MSGBOX_DEFAULT
 	.ifdef SAPPHIRE
-	givedecoration_std DECOR_BLUE_TENT
+	givedecoration DECOR_BLUE_TENT
 	.else
-	givedecoration_std DECOR_RED_TENT
+	givedecoration DECOR_RED_TENT
 	.endif
 	compare VAR_RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
 	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
-	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
+	call_if_eq Common_EventScript_NoRoomForDecor
+	msgbox Route110_TrickHouseEntrance_Text_19C18D, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
-	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
+	msgbox Route110_TrickHouseEntrance_Text_19C17E, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
 	waitmovement 0
@@ -481,7 +481,7 @@ Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A
 	end
 
 Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -497,9 +497,9 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
 	setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
 	special DrawWholeMapView
 	delay 20
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp
 	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_16165E
+	applymovement OBJ_EVENT_ID_PLAYER, Route110_TrickHouseEntrance_Movement_16165E
 	waitmovement 0
 	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
 	case 0, Route110_TrickHouseEntrance_EventScript_161660
@@ -514,7 +514,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
 
 Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
 	set_invisible
-	end_movement
+	step_end
 
 Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
@@ -565,19 +565,19 @@ Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD
 	end
 
 Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -597,7 +597,7 @@ gUnknown_081616E1:: @ 81616E1
 Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CAD1, 4
+	msgbox UnknownString_819CAD1, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -608,7 +608,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
 Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CCCB, 4
+	msgbox UnknownString_819CCCB, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -619,7 +619,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
 Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CEF9, 4
+	msgbox UnknownString_819CEF9, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -630,7 +630,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
 Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D164, 4
+	msgbox UnknownString_819D164, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -641,7 +641,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
 Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D3A5, 4
+	msgbox UnknownString_819D3A5, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -652,7 +652,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
 Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DC0A, 4
+	msgbox UnknownString_819DC0A, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -663,7 +663,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
 Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DE8D, 4
+	msgbox UnknownString_819DE8D, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -674,7 +674,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
 Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819E0FF, 4
+	msgbox UnknownString_819E0FF, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -683,7 +683,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
 	end
 
 Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
-	msgbox UnknownString_819C21F, 4
+	msgbox UnknownString_819C21F, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -695,7 +695,7 @@ Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892
 Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892
 Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892
 Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892
-	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4
+	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -711,13 +711,13 @@ Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
 	message Route110_TrickHousePuzzle1_Text_19C1B8
 	waitfanfare
 	waitmessage
-	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
+	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, MSGBOX_DEFAULT
 	releaseall
 	end
 
 Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
 	lockall
-	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
+	msgbox Route110_TrickHouseEntrance_Text_19BA56, MSGBOX_DEFAULT
 	releaseall
 	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
 	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index dc66b71f4..55b35f0bd 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8
-	map_script 1, Route110_TrickHousePuzzle1_MapScript1_161CFE
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_161CFE
 	.byte 0
 
 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE
@@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26
 	end
 
 Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31
-	trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93
-	msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6
+	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93
+	msgbox Route110_TrickHousePuzzle1_Text_19CBAB, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48
-	trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06
-	msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6
+	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06
+	msgbox Route110_TrickHousePuzzle1_Text_19CC1B, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F
-	trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86
-	msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6
+	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86
+	msgbox Route110_TrickHousePuzzle1_Text_19CCAA, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index f1044e388..f5d694114 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76
-	map_script 5, Route110_TrickHousePuzzle2_MapScript1_161D81
-	map_script 3, Route110_TrickHousePuzzle2_MapScript1_161DAE
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_161D81
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_MapScript1_161DAE
 	.byte 0
 
 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81
@@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65
 	return
 
 Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78
-	trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66
-	msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6
+	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66
+	msgbox Route110_TrickHousePuzzle2_Text_19CD91, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F
-	trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0
-	msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6
+	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0
+	msgbox Route110_TrickHousePuzzle2_Text_19CE0D, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6
-	trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98
-	msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6
+	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98
+	msgbox Route110_TrickHousePuzzle2_Text_19CEB8, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index b8d8383fc..869bb29f4 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD
-	map_script 5, Route110_TrickHousePuzzle3_MapScript1_161EC8
-	map_script 3, Route110_TrickHousePuzzle3_MapScript1_161EE4
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_161EC8
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_MapScript1_161EE4
 	.byte 0
 
 Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8
@@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD
 	end
 
 Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708
-	trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D
-	msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6
+	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D
+	msgbox Route110_TrickHousePuzzle3_Text_19CFE6, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F
-	trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065
-	msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6
+	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065
+	msgbox Route110_TrickHousePuzzle3_Text_19D07A, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736
-	trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0
-	msgbox Route110_TrickHousePuzzle3_Text_19D110, 6
+	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0
+	msgbox Route110_TrickHousePuzzle3_Text_19D110, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 606697070..fdf7d6b1a 100644
--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760
 	end
 
 Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B
-	trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F
-	msgbox Route110_TrickHousePuzzle4_Text_19D253, 6
+	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F
+	msgbox Route110_TrickHousePuzzle4_Text_19D253, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782
-	trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1
-	msgbox Route110_TrickHousePuzzle4_Text_19D306, 6
+	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1
+	msgbox Route110_TrickHousePuzzle4_Text_19D306, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799
-	trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380
-	msgbox Route110_TrickHousePuzzle4_Text_19D386, 6
+	trainerbattle_single TRAINER_JILL, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380
+	msgbox Route110_TrickHousePuzzle4_Text_19D386, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index 51fdc9afb..6836211bd 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -1,5 +1,5 @@
 Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0
-	map_script 3, Route110_TrickHousePuzzle5_MapScript1_1627B6
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_MapScript1_1627B6
 	.byte 0
 
 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6
@@ -25,7 +25,7 @@ Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7
 
 Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2
 	lockall
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_1, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
@@ -35,7 +35,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2
 
 Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813
 	lockall
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_2, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
@@ -45,7 +45,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813
 
 Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834
 	lockall
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839
+	applymovement 3, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_3, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
@@ -55,7 +55,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834
 
 Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855
 	lockall
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839
+	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_4, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
@@ -65,7 +65,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855
 
 Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876
 	lockall
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_5, 1
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
@@ -161,9 +161,9 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_8, 1
 	playse SE_PIN
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
@@ -171,7 +171,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D423, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D423, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162B83
@@ -183,9 +183,9 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_8, 2
 	playse SE_PIN
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
@@ -193,7 +193,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
 	compare VAR_TEMP_9, 3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
-	msgbox Route110_TrickHousePuzzle5_Text_19D636, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D636, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162BEC
@@ -205,9 +205,9 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_8, 3
 	playse SE_PIN
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833
+	applymovement 3, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835
+	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
@@ -215,7 +215,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D7D3, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162C55
@@ -227,9 +227,9 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B
 	setvar VAR_TEMP_4, 1
 	setvar VAR_TEMP_8, 4
 	playse SE_PIN
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833
+	applymovement 4, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835
+	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
@@ -237,7 +237,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
 	compare VAR_TEMP_9, 3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D93D, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162CBE
@@ -249,9 +249,9 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
 	setvar VAR_TEMP_5, 1
 	setvar VAR_TEMP_8, 5
 	playse SE_PIN
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
@@ -259,7 +259,7 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
 	compare VAR_TEMP_9, 3
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
-	msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19DA9A, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162D27
@@ -268,7 +268,7 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83
-	msgbox Route110_TrickHousePuzzle5_Text_19D4AE, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D4AE, MSGBOX_DEFAULT
 	multichoice 0, 0, 25, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -276,7 +276,7 @@ Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6
-	msgbox Route110_TrickHousePuzzle5_Text_19D501, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D501, MSGBOX_DEFAULT
 	multichoice 0, 0, 26, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -284,7 +284,7 @@ Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9
-	msgbox Route110_TrickHousePuzzle5_Text_19D553, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D553, MSGBOX_DEFAULT
 	multichoice 0, 0, 27, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -292,7 +292,7 @@ Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC
-	msgbox Route110_TrickHousePuzzle5_Text_19D68E, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D68E, MSGBOX_DEFAULT
 	multichoice 0, 0, 28, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -300,7 +300,7 @@ Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F
-	msgbox Route110_TrickHousePuzzle5_Text_19D6EC, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D6EC, MSGBOX_DEFAULT
 	multichoice 0, 0, 29, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -308,7 +308,7 @@ Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32
-	msgbox Route110_TrickHousePuzzle5_Text_19D745, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D745, MSGBOX_DEFAULT
 	multichoice 0, 0, 30, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -316,7 +316,7 @@ Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55
-	msgbox Route110_TrickHousePuzzle5_Text_19D81B, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D81B, MSGBOX_DEFAULT
 	multichoice 0, 0, 31, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -324,7 +324,7 @@ Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78
-	msgbox Route110_TrickHousePuzzle5_Text_19D865, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D865, MSGBOX_DEFAULT
 	multichoice 0, 0, 32, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -332,7 +332,7 @@ Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B
-	msgbox Route110_TrickHousePuzzle5_Text_19D8BA, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D8BA, MSGBOX_DEFAULT
 	multichoice 0, 0, 33, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -340,7 +340,7 @@ Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE
-	msgbox Route110_TrickHousePuzzle5_Text_19D987, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D987, MSGBOX_DEFAULT
 	multichoice 0, 0, 34, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -348,7 +348,7 @@ Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1
-	msgbox Route110_TrickHousePuzzle5_Text_19D9DC, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D9DC, MSGBOX_DEFAULT
 	multichoice 0, 0, 35, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -356,7 +356,7 @@ Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04
-	msgbox Route110_TrickHousePuzzle5_Text_19DA1D, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19DA1D, MSGBOX_DEFAULT
 	multichoice 0, 0, 36, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -364,7 +364,7 @@ Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27
-	msgbox Route110_TrickHousePuzzle5_Text_19DAEF, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19DAEF, MSGBOX_DEFAULT
 	multichoice 0, 0, 37, 1
 	switch VAR_RESULT
 	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -372,7 +372,7 @@ Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A
-	msgbox Route110_TrickHousePuzzle5_Text_19DB43, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19DB43, MSGBOX_DEFAULT
 	multichoice 0, 0, 38, 1
 	switch VAR_RESULT
 	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -380,7 +380,7 @@ Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D
-	msgbox Route110_TrickHousePuzzle5_Text_19DB97, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19DB97, MSGBOX_DEFAULT
 	multichoice 0, 0, 39, 1
 	switch VAR_RESULT
 	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
@@ -390,16 +390,16 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D
 Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90
 	waitse
 	playse SE_HAZURE
-	msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D5CF, MSGBOX_DEFAULT
 	applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F
 	applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F
 	applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F
 	applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F
 	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F
-	msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D5ED, MSGBOX_DEFAULT
 	waitmovement 0
 	closemessage
-	msgbox Route110_TrickHousePuzzle5_Text_19D615, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D615, MSGBOX_DEFAULT
 	closemessage
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
@@ -413,7 +413,7 @@ Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF
 	end
 
 Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9
-	msgbox Route110_TrickHousePuzzle5_Text_19D599, 4
+	msgbox Route110_TrickHousePuzzle5_Text_19D599, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -647,33 +647,33 @@ Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082
 
 Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D
 	walk_left
-	end_movement
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096
 	walk_right
-	end_movement
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F
 Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F
@@ -722,4 +722,4 @@ Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F
 	face_right
 	delay_2
 	face_down
-	end_movement
+	step_end
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 3378dc50b..46b2f0f5a 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,6 +1,6 @@
 Route110_TrickHousePuzzle6_MapScripts:: @ 81630CD
-	map_script 3, Route110_TrickHousePuzzle6_MapScript1_1630D8
-	map_script 4, Route110_TrickHousePuzzle6_MapScript2_1630DC
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_MapScript1_1630D8
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_1630DC
 	.byte 0
 
 Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8
@@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC
 	end
 
 Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107
-	trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6
-	msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6
+	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6
+	msgbox Route110_TrickHousePuzzle6_Text_19DCE7, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E
-	trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83
-	msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6
+	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83
+	msgbox Route110_TrickHousePuzzle6_Text_19DD96, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135
-	trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE
-	msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6
+	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE
+	msgbox Route110_TrickHousePuzzle6_Text_19DE44, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index ac113fe81..589e77983 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -1,8 +1,8 @@
 Route110_TrickHousePuzzle7_MapScripts:: @ 816314C
-	map_script 5, Route110_TrickHousePuzzle7_MapScript1_163161
-	map_script 3, Route110_TrickHousePuzzle7_MapScript1_163253
-	map_script 1, Route110_TrickHousePuzzle7_MapScript1_16326F
-	map_script 2, Route110_TrickHousePuzzle7_MapScript2_16327B
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_163161
+	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_MapScript1_163253
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_16326F
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_16327B
 	.byte 0
 
 Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161
@@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6
-	trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B
-	msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6
+	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B
+	msgbox Route110_TrickHousePuzzle7_Text_19DF7E, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED
-	trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2
-	msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6
+	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2
+	msgbox Route110_TrickHousePuzzle7_Text_19E00F, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404
-	trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098
-	msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6
+	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098
+	msgbox Route110_TrickHousePuzzle7_Text_19E0B2, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 182f3d68a..fd8dbfb85 100644
--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E
 	end
 
 Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439
-	trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1
-	msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6
+	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1
+	msgbox Route110_TrickHousePuzzle8_Text_19E1C5, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450
-	trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C
-	msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6
+	trainerbattle_single TRAINER_ELAINE, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C
+	msgbox Route110_TrickHousePuzzle8_Text_19E24C, MSGBOX_AUTOCLOSE
 	end
 
 Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467
-	trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1
-	msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6
+	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1
+	msgbox Route110_TrickHousePuzzle8_Text_19E2EE, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 0092d793d..163fe11da 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -1,6 +1,6 @@
 Route111_MapScripts:: @ 814FF91
-	map_script 1, Route111_MapScript1_14FF9C
-	map_script 3, Route111_MapScript1_14FFB9
+	map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_14FF9C
+	map_script MAP_SCRIPT_ON_TRANSITION, Route111_MapScript1_14FFB9
 	.byte 0
 
 Route111_MapScript1_14FF9C:: @ 814FF9C
@@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6
 Route111_MapScript1_14FFB9:: @ 814FFB9
 	call Route111_EventScript_14FFCD
 	call Route111_EventScript_1AE313
-	goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D
+	goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_15000D
 	end
 
 Route111_EventScript_14FFCD:: @ 814FFCD
@@ -52,7 +52,7 @@ Route111_EventScript_150023:: @ 8150023
 	msgbox Route111_Text_16FA54, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route111_EventScript_15005F
-	giveitem_std ITEM_ROOT_FOSSIL
+	giveitem ITEM_ROOT_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_ROOT_FOSSIL
 	setflag FLAG_HIDE_CLAW_FOSSIL
@@ -65,7 +65,7 @@ Route111_EventScript_150023:: @ 8150023
 	end
 
 Route111_EventScript_15005F:: @ 815005F
-	msgbox Route111_Text_16FACE, 4
+	msgbox Route111_Text_16FACE, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -74,7 +74,7 @@ Route111_EventScript_150069:: @ 8150069
 	msgbox Route111_Text_16FAED, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route111_EventScript_1500A5
-	giveitem_std ITEM_CLAW_FOSSIL
+	giveitem ITEM_CLAW_FOSSIL
 	closemessage
 	setflag FLAG_HIDE_CLAW_FOSSIL
 	setflag FLAG_HIDE_ROOT_FOSSIL
@@ -87,7 +87,7 @@ Route111_EventScript_150069:: @ 8150069
 	end
 
 Route111_EventScript_1500A5:: @ 81500A5
-	msgbox Route111_Text_16FB67, 4
+	msgbox Route111_Text_16FB67, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -113,25 +113,25 @@ Route111_Movement_1500AF:: @ 81500AF
 	set_invisible
 	delay_16
 	set_visible
-	end_movement
+	step_end
 
 Route111_EventScript_1500C5:: @ 81500C5
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
-	msgbox Route111_Text_1C56F0, 4
-	giveitem_std ITEM_RAZZ_BERRY
+	msgbox Route111_Text_1C56F0, MSGBOX_DEFAULT
+	giveitem ITEM_RAZZ_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
 	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_1C5781, 4
+	msgbox Route111_Text_1C5781, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_150100:: @ 8150100
-	msgbox Route111_Text_1C57D2, 4
+	msgbox Route111_Text_1C57D2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -168,7 +168,7 @@ Route111_EventScript_15013A:: @ 815013A
 	end
 
 Route111_EventScript_150151:: @ 8150151
-	msgbox Route111_Text_1A0F93, 4
+	msgbox Route111_Text_1A0F93, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8004, 0
 	call_if_eq Route111_EventScript_150188
@@ -182,40 +182,40 @@ Route111_EventScript_150151:: @ 8150151
 	end
 
 Route111_EventScript_150188:: @ 8150188
-	applymovement 255, Route111_Movement_1501B4
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B4
 	waitmovement 0
 	return
 
 Route111_EventScript_150193:: @ 8150193
-	applymovement 255, Route111_Movement_1501B6
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B6
 	waitmovement 0
 	return
 
 Route111_EventScript_15019E:: @ 815019E
-	applymovement 255, Route111_Movement_1501B8
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501B8
 	waitmovement 0
 	return
 
 Route111_EventScript_1501A9:: @ 81501A9
-	applymovement 255, Route111_Movement_1501BA
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_1501BA
 	waitmovement 0
 	return
 
 Route111_Movement_1501B4:: @ 81501B4
 	walk_up
-	end_movement
+	step_end
 
 Route111_Movement_1501B6:: @ 81501B6
 	walk_down
-	end_movement
+	step_end
 
 Route111_Movement_1501B8:: @ 81501B8
 	walk_left
-	end_movement
+	step_end
 
 Route111_Movement_1501BA:: @ 81501BA
 	walk_right
-	end_movement
+	step_end
 
 Route111_EventScript_1501BC:: @ 81501BC
 	setweather WEATHER_SUNNY
@@ -237,70 +237,70 @@ Route111_EventScript_1501D1:: @ 81501D1
 	msgbox Route111_Text_16F705, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route111_EventScript_1501F3
-	msgbox Route111_Text_16F785, 4
+	msgbox Route111_Text_16F785, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1501F3:: @ 81501F3
-	msgbox Route111_Text_16F7B3, 4
-	trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2
-	applymovement 1, Route111_Movement_1A0841
+	msgbox Route111_Text_16F7B3, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_16F7D2
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	call Route111_EventScript_150348
-	msgbox Route111_Text_16F7FF, 4
+	msgbox Route111_Text_16F7FF, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Route111_Movement_150356
 	waitmovement 0
 	removeobject 1
 	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B
 	waitmovement 0
 	call Route111_EventScript_150348
 	addobject 2
 	applymovement 2, Route111_Movement_150359
 	waitmovement 0
 	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F82D, 4
-	trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6
-	applymovement 2, Route111_Movement_1A0841
+	msgbox Route111_Text_16F82D, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_16F8A6
+	applymovement 2, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	call Route111_EventScript_150348
-	msgbox Route111_Text_16F8D5, 4
+	msgbox Route111_Text_16F8D5, MSGBOX_DEFAULT
 	closemessage
 	applymovement 2, Route111_Movement_150356
 	waitmovement 0
 	removeobject 2
 	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B
 	waitmovement 0
 	call Route111_EventScript_150348
 	addobject 3
 	applymovement 3, Route111_Movement_150359
 	waitmovement 0
 	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F90E, 4
-	trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956
-	applymovement 3, Route111_Movement_1A0841
+	msgbox Route111_Text_16F90E, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_16F956
+	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	call Route111_EventScript_150348
-	msgbox Route111_Text_16F96C, 4
+	msgbox Route111_Text_16F96C, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Route111_Movement_150356
 	waitmovement 0
 	removeobject 3
 	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
+	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_15035B
 	waitmovement 0
 	call Route111_EventScript_150348
 	addobject 4
 	applymovement 4, Route111_Movement_150359
 	waitmovement 0
 	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F991, 4
-	trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC
-	msgbox Route111_Text_16FA22, 4
+	msgbox Route111_Text_16F991, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_16F9EC
+	msgbox Route111_Text_16FA22, MSGBOX_DEFAULT
 	closemessage
-	applymovement 4, Route111_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	call Route111_EventScript_150348
 	applymovement 4, Route111_Movement_150356
@@ -323,120 +323,120 @@ Route111_EventScript_15034F:: @ 815034F
 Route111_Movement_150356:: @ 8150356
 	walk_in_place_fastest_up
 	walk_up
-	end_movement
+	step_end
 
 Route111_Movement_150359:: @ 8150359
 	walk_down
-	end_movement
+	step_end
 
 Route111_Movement_15035B:: @ 815035B
 	delay_16
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 Route111_EventScript_15035F:: @ 815035F
-	msgbox Route111_Text_16FC9C, 3
+	msgbox Route111_Text_16FC9C, MSGBOX_SIGN
 	end
 
 Route111_EventScript_150368:: @ 8150368
-	msgbox Route111_Text_16FCB6, 3
+	msgbox Route111_Text_16FCB6, MSGBOX_SIGN
 	end
 
 Route111_EventScript_150371:: @ 8150371
-	msgbox Route111_Text_16FCEF, 3
+	msgbox Route111_Text_16FCEF, MSGBOX_SIGN
 	end
 
 Route111_EventScript_15037A:: @ 815037A
-	msgbox Route111_Text_16FD05, 3
+	msgbox Route111_Text_16FD05, MSGBOX_SIGN
 	end
 
 Route111_EventScript_150383:: @ 8150383
-	msgbox Route111_Text_16FD1B, 3
+	msgbox Route111_Text_16FD1B, MSGBOX_SIGN
 	end
 
 Route111_EventScript_15038C:: @ 815038C
-	msgbox Route111_Text_16FD55, 3
+	msgbox Route111_Text_16FD55, MSGBOX_SIGN
 	end
 
 Route111_EventScript_150395:: @ 8150395
-	msgbox Route111_Text_16FB86, 2
+	msgbox Route111_Text_16FB86, MSGBOX_NPC
 	end
 
 Route111_EventScript_15039E:: @ 815039E
-	msgbox Route111_Text_16FC3A, 2
+	msgbox Route111_Text_16FC3A, MSGBOX_NPC
 	end
 
 Route111_EventScript_1503A7:: @ 81503A7
-	trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
-	msgbox Route111_Text_1BAC10, 6
+	trainerbattle_single TRAINER_DREW, Route111_Text_1BAB4B, Route111_Text_1BABC7
+	msgbox Route111_Text_1BAC10, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1503BE:: @ 81503BE
-	trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
-	msgbox Route111_Text_1BACD8, 6
+	trainerbattle_single TRAINER_HEIDI, Route111_Text_1BAC60, Route111_Text_1BACC5
+	msgbox Route111_Text_1BACD8, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1503D5:: @ 81503D5
-	trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
-	msgbox Route111_Text_1BADC2, 6
+	trainerbattle_single TRAINER_CLIFF, Route111_Text_1BAD4B, Route111_Text_1BADA3
+	msgbox Route111_Text_1BADC2, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1503EC:: @ 81503EC
-	trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
-	msgbox Route111_Text_1BAE81, 6
+	trainerbattle_single TRAINER_BECKY, Route111_Text_1BAE24, Route111_Text_1BAE6E
+	msgbox Route111_Text_1BAE81, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_150403:: @ 8150403
-	trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
+	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_1BAEC9, Route111_Text_1BAF14
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_15042A
-	msgbox Route111_Text_1BAF5B, 6
+	msgbox Route111_Text_1BAF5B, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_15042A:: @ 815042A
-	trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
-	msgbox Route111_Text_1BB070, 6
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_1BAFC1, Route111_Text_1BB034
+	msgbox Route111_Text_1BB070, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_150441:: @ 8150441
-	trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
-	msgbox Route111_Text_1BB15B, 6
+	trainerbattle_single TRAINER_TRAVIS, Route111_Text_1BB111, Route111_Text_1BB140
+	msgbox Route111_Text_1BB15B, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_150458:: @ 8150458
-	trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
-	msgbox Route111_Text_1BB1F6, 6
+	trainerbattle_single TRAINER_IRENE, Route111_Text_1BB199, Route111_Text_1BB1D8
+	msgbox Route111_Text_1BB1F6, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_15046F:: @ 815046F
-	trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
-	msgbox Route111_Text_1BB290, 6
+	trainerbattle_single TRAINER_DAISUKE, Route111_Text_1BB250, Route111_Text_1BB27E
+	msgbox Route111_Text_1BB290, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_150486:: @ 8150486
-	trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
+	trainerbattle_single TRAINER_WILTON_1, Route111_Text_1BB2E3, Route111_Text_1BB313
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_1504AD
-	msgbox Route111_Text_1BB33E, 6
+	msgbox Route111_Text_1BB33E, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1504AD:: @ 81504AD
-	trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
-	msgbox Route111_Text_1BB40E, 6
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_1BB3A7, Route111_Text_1BB3FA
+	msgbox Route111_Text_1BB40E, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1504C4:: @ 81504C4
-	trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
+	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_1BB44F, Route111_Text_1BB49F
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route111_EventScript_1504EB
-	msgbox Route111_Text_1BB4CE, 6
+	msgbox Route111_Text_1BB4CE, MSGBOX_AUTOCLOSE
 	end
 
 Route111_EventScript_1504EB:: @ 81504EB
-	trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
-	msgbox Route111_Text_1BB5C1, 6
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_1BB529, Route111_Text_1BB5A2
+	msgbox Route111_Text_1BB5C1, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 277b0402c..1c45aad70 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -1,5 +1,5 @@
 Route111_OldLadysRestStop_MapScripts:: @ 815BFD1
-	map_script 3, Route111_OldLadysRestStop_MapScript1_15BFD7
+	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_MapScript1_15BFD7
 	.byte 0
 
 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7
@@ -17,9 +17,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB
 	end
 
 Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC
-	msgbox Route111_OldLadysRestStop_Text_192423, 4
+	msgbox Route111_OldLadysRestStop_Text_192423, MSGBOX_DEFAULT
 	closemessage
-	call Route111_OldLadysRestStop_EventScript_1A02CA
+	call Common_EventScript_OutOfCenterPartyHeal
 	msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC
@@ -28,6 +28,6 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC
 	end
 
 Route111_OldLadysRestStop_EventScript_15C029:: @ 815C029
-	msgbox Route111_OldLadysRestStop_Text_1924C6, 4
+	msgbox Route111_OldLadysRestStop_Text_1924C6, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index e971a8b9f..16d745166 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -5,7 +5,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25
 	lock
 	faceplayer
 	setvar VAR_0x8008, 2
-	msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4
+	msgbox Route111_WinstrateFamilysHouse_Text_191FCE, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
@@ -14,16 +14,16 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A
 	faceplayer
 	setvar VAR_0x8008, 3
 	goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72
-	msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4
-	giveitem_std ITEM_MACHO_BRACE
+	msgbox Route111_WinstrateFamilysHouse_Text_19208A, MSGBOX_DEFAULT
+	giveitem ITEM_MACHO_BRACE
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_MACHO_BRACE
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
 Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72
-	msgbox Route111_WinstrateFamilysHouse_Text_19214D, 4
+	msgbox Route111_WinstrateFamilysHouse_Text_19214D, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
@@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80
 	lock
 	faceplayer
 	setvar VAR_0x8008, 1
-	msgbox Route111_WinstrateFamilysHouse_Text_192190, 4
+	msgbox Route111_WinstrateFamilysHouse_Text_192190, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
@@ -40,19 +40,19 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95
 	faceplayer
 	setvar VAR_0x8008, 4
 	goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6
-	msgbox Route111_WinstrateFamilysHouse_Text_192219, 4
+	msgbox Route111_WinstrateFamilysHouse_Text_192219, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_4
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
 Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6
-	msgbox Route111_WinstrateFamilysHouse_Text_192334, 4
+	msgbox Route111_WinstrateFamilysHouse_Text_192334, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_15BFC4
 	end
 
 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4
 	closemessage
-	applymovement VAR_0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D
+	applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index ae03b2248..9bf458099 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -1,60 +1,60 @@
 Route112_MapScripts:: @ 8150502
-	map_script 3, Route112_MapScript1_150508
+	map_script MAP_SCRIPT_ON_TRANSITION, Route112_MapScript1_150508
 	.byte 0
 
 Route112_MapScript1_150508:: @ 8150508
-	call Route112_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
 Route112_EventScript_150513:: @ 8150513
-	msgbox Route112_Text_16FDF0, 2
+	msgbox Route112_Text_16FDF0, MSGBOX_NPC
 	end
 
 Route112_EventScript_15051C:: @ 815051C
-	msgbox Route112_Text_16FE3E, 2
+	msgbox Route112_Text_16FE3E, MSGBOX_NPC
 	end
 
 Route112_EventScript_150525:: @ 8150525
-	msgbox Route112_Text_16FEED, 3
+	msgbox Route112_Text_16FEED, MSGBOX_SIGN
 	end
 
 Route112_EventScript_15052E:: @ 815052E
-	msgbox Route112_Text_16FF19, 3
+	msgbox Route112_Text_16FF19, MSGBOX_SIGN
 	end
 
 Route112_EventScript_150537:: @ 8150537
-	msgbox Route112_Text_16FF64, 3
+	msgbox Route112_Text_16FF64, MSGBOX_SIGN
 	end
 
 Route112_EventScript_150540:: @ 8150540
-	msgbox Route112_Text_16FE7A, 2
+	msgbox Route112_Text_16FE7A, MSGBOX_NPC
 	end
 
 Route112_EventScript_150549:: @ 8150549
-	trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655
-	msgbox Route112_Text_1BB667, 6
+	trainerbattle_single TRAINER_BRICE, Route112_Text_1BB619, Route112_Text_1BB655
+	msgbox Route112_Text_1BB667, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_150560:: @ 8150560
-	trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707
+	trainerbattle_single TRAINER_TRENT_1, Route112_Text_1BB6A0, Route112_Text_1BB707
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route112_EventScript_150587
-	msgbox Route112_Text_1BB721, 6
+	msgbox Route112_Text_1BB721, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_150587:: @ 8150587
-	trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801
-	msgbox Route112_Text_1BB819, 6
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_1BB7C7, Route112_Text_1BB801
+	msgbox Route112_Text_1BB819, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_15059E:: @ 815059E
-	trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6
-	msgbox Route112_Text_1BB8BE, 6
+	trainerbattle_single TRAINER_LARRY, Route112_Text_1BB893, Route112_Text_1BB8B6
+	msgbox Route112_Text_1BB8BE, MSGBOX_AUTOCLOSE
 	end
 
 Route112_EventScript_1505B5:: @ 81505B5
-	trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942
-	msgbox Route112_Text_1BB958, 6
+	trainerbattle_single TRAINER_CAROL, Route112_Text_1BB8F0, Route112_Text_1BB942
+	msgbox Route112_Text_1BB958, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index 2460aada9..df265e1a2 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -1,6 +1,6 @@
 Route112_CableCarStation_MapScripts:: @ 815C033
-	map_script 3, Route112_CableCarStation_MapScript1_15C03E
-	map_script 2, Route112_CableCarStation_MapScript2_15C05E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_MapScript1_15C03E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_MapScript2_15C05E
 	.byte 0
 
 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E
@@ -20,7 +20,7 @@ Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E
 
 Route112_CableCarStation_EventScript_15C068:: @ 815C068
 	lockall
-	applymovement 255, Route112_CableCarStation_Movement_15C0F5
+	applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_15C0F5
 	applymovement 1, Route112_CableCarStation_Movement_15C0EB
 	waitmovement 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 0
@@ -40,10 +40,10 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C
 	end
 
 Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
-	msgbox Route112_CableCarStation_Text_1925A9, 4
+	msgbox Route112_CableCarStation_Text_1925A9, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Route112_CableCarStation_Movement_15C0E6
-	applymovement 255, Route112_CableCarStation_Movement_15C0F0
+	applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_15C0F0
 	waitmovement 0
 	setvar VAR_0x8004, 0
 	setvar VAR_CABLE_CAR_STATION_STATE, 1
@@ -55,7 +55,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
 	end
 
 Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC
-	msgbox Route112_CableCarStation_Text_192548, 4
+	msgbox Route112_CableCarStation_Text_192548, MSGBOX_DEFAULT
 	release
 	end
 
@@ -64,25 +64,25 @@ Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6
 	walk_up
 	walk_right
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB
 	delay_16
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0
 	walk_up
 	walk_up
 	walk_up
 	delay_16
-	end_movement
+	step_end
 
 Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5
 	walk_down
 	walk_down
 	walk_down
 	delay_16
-	end_movement
+	step_end
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 58c769273..721fab1fb 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -1,6 +1,6 @@
 Route113_MapScripts:: @ 81505CC
-	map_script 5, Route113_MapScript1_1505D7
-	map_script 3, Route113_MapScript1_1505DA
+	map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1505D7
+	map_script MAP_SCRIPT_ON_TRANSITION, Route113_MapScript1_1505DA
 	.byte 0
 
 Route113_MapScript1_1505D7:: @ 81505D7
@@ -9,7 +9,7 @@ Route113_MapScript1_1505D7:: @ 81505D7
 
 Route113_MapScript1_1505DA:: @ 81505DA
 	call Route113_EventScript_1505E5
-	call Route113_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 Route113_EventScript_1505E5:: @ 81505E5
@@ -25,76 +25,76 @@ Route113_EventScript_150604:: @ 8150604
 	return
 
 Route113_EventScript_150605:: @ 8150605
-	msgbox Route113_Text_16FF7F, 2
+	msgbox Route113_Text_16FF7F, MSGBOX_NPC
 	end
 
 Route113_EventScript_15060E:: @ 815060E
-	msgbox Route113_Text_16FFEE, 2
+	msgbox Route113_Text_16FFEE, MSGBOX_NPC
 	end
 
 Route113_EventScript_150617:: @ 8150617
-	msgbox Route113_Text_170065, 3
+	msgbox Route113_Text_170065, MSGBOX_SIGN
 	end
 
 Route113_EventScript_150620:: @ 8150620
-	msgbox Route113_Text_17007B, 3
+	msgbox Route113_Text_17007B, MSGBOX_SIGN
 	end
 
 Route113_EventScript_150629:: @ 8150629
-	msgbox Route113_Text_17011D, 3
+	msgbox Route113_Text_17011D, MSGBOX_SIGN
 	end
 
 Route113_EventScript_150632:: @ 8150632
-	msgbox Route113_Text_170096, 3
+	msgbox Route113_Text_170096, MSGBOX_SIGN
 	end
 
 Route113_EventScript_15063B:: @ 815063B
-	trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6
-	msgbox Route113_Text_1BB9FB, 6
+	trainerbattle_single TRAINER_NEAL, Route113_Text_1BB9BA, Route113_Text_1BB9E6
+	msgbox Route113_Text_1BB9FB, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_150652:: @ 8150652
-	trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B
-	msgbox Route113_Text_1BBAB7, 6
+	trainerbattle_single TRAINER_DILLON, Route113_Text_1BBA62, Route113_Text_1BBA9B
+	msgbox Route113_Text_1BBAB7, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_150669:: @ 8150669
-	trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A
+	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_1BBB27, Route113_Text_1BBB7A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route113_EventScript_150690
-	msgbox Route113_Text_1BBB9A, 6
+	msgbox Route113_Text_1BBB9A, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_150690:: @ 8150690
-	trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D
-	msgbox Route113_Text_1BBC1C, 6
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_1BBBCE, Route113_Text_1BBC0D
+	msgbox Route113_Text_1BBC1C, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1506A7:: @ 81506A7
-	trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90
+	trainerbattle_single TRAINER_LAO_1, Route113_Text_1BBC59, Route113_Text_1BBC90
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route113_EventScript_1506CE
-	msgbox Route113_Text_1BBCAB, 6
+	msgbox Route113_Text_1BBCAB, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1506CE:: @ 81506CE
-	trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D
-	msgbox Route113_Text_1BBD38, 6
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_1BBCE6, Route113_Text_1BBD1D
+	msgbox Route113_Text_1BBD38, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1506E5:: @ 81506E5
-	trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6
-	msgbox Route113_Text_1BBE1D, 6
+	trainerbattle_single TRAINER_LUNG, Route113_Text_1BBD92, Route113_Text_1BBDC6
+	msgbox Route113_Text_1BBE1D, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_1506FC:: @ 81506FC
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25
-	msgbox Route113_Text_1BBEE4, 6
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25
+	msgbox Route113_Text_1BBEE4, MSGBOX_AUTOCLOSE
 	end
 
 Route113_EventScript_150717:: @ 8150717
-	trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021
-	msgbox Route113_Text_1BBFE2, 6
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021
+	msgbox Route113_Text_1BBFE2, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index 7940b9cd7..ec30e004c 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -1,5 +1,5 @@
 Route113_GlassWorkshop_MapScripts:: @ 816354A
-	map_script 3, Route113_GlassWorkshop_MapScript1_163550
+	map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_MapScript1_163550
 	.byte 0
 
 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550
@@ -21,15 +21,15 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635B5
 	compare VAR_GLASS_WORKSHOP_STATE, 1
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635AB
-	msgbox Route113_GlassWorkshop_Text_19E4E6, 4
-	giveitem_std ITEM_SOOT_SACK
+	msgbox Route113_GlassWorkshop_Text_19E4E6, MSGBOX_DEFAULT
+	giveitem ITEM_SOOT_SACK
 	setvar VAR_GLASS_WORKSHOP_STATE, 1
-	msgbox Route113_GlassWorkshop_Text_19E59B, 4
+	msgbox Route113_GlassWorkshop_Text_19E59B, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB
-	msgbox Route113_GlassWorkshop_Text_19E59B, 4
+	msgbox Route113_GlassWorkshop_Text_19E59B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -37,7 +37,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5
 	checkitem ITEM_SOOT_SACK, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1635E4
-	msgbox Route113_GlassWorkshop_Text_19E65B, 4
+	msgbox Route113_GlassWorkshop_Text_19E65B, MSGBOX_DEFAULT
 	compare VAR_ASH_GATHER_COUNT, 250
 	goto_if_lt Route113_GlassWorkshop_EventScript_163818
 	message Route113_GlassWorkshop_Text_19E757
@@ -46,7 +46,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5
 	end
 
 Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4
-	msgbox Route113_GlassWorkshop_Text_19EAC1, 4
+	msgbox Route113_GlassWorkshop_Text_19EAC1, MSGBOX_DEFAULT
 	release
 	end
 
@@ -167,7 +167,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD
 	end
 
 Route113_GlassWorkshop_EventScript_16380E:: @ 816380E
-	msgbox Route113_GlassWorkshop_Text_19E990, 4
+	msgbox Route113_GlassWorkshop_Text_19E990, MSGBOX_DEFAULT
 	release
 	end
 
@@ -175,7 +175,7 @@ Route113_GlassWorkshop_EventScript_163818:: @ 8163818
 	setvar VAR_0x800A, 250
 	subvar VAR_0x800A, 16456
 	buffernumberstring 0, 32778
-	msgbox Route113_GlassWorkshop_Text_19E697, 4
+	msgbox Route113_GlassWorkshop_Text_19E697, MSGBOX_DEFAULT
 	release
 	end
 
@@ -194,13 +194,13 @@ Route113_GlassWorkshop_EventScript_163845:: @ 8163845
 	end
 
 Route113_GlassWorkshop_EventScript_163851:: @ 8163851
-	msgbox Route113_GlassWorkshop_Text_19E827, 4
+	msgbox Route113_GlassWorkshop_Text_19E827, MSGBOX_DEFAULT
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	playse SE_SELECT
 	delay 30
-	fadescreen 0
-	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
+	fadescreen FADE_FROM_BLACK
+	msgbox Route113_GlassWorkshop_Text_19E9D7, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
 	call_if_eq Route113_GlassWorkshop_EventScript_163889
 	compare VAR_0x8009, 1
@@ -210,26 +210,26 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 	end
 
 Route113_GlassWorkshop_EventScript_163889:: @ 8163889
-	giveitem_std VAR_0x8008
+	giveitem VAR_0x8008
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638B4
 	return
 
 Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1
-	givedecoration_std VAR_0x8008
+	givedecoration VAR_0x8008
 	compare VAR_RESULT, 0
 	goto_if_eq Route113_GlassWorkshop_EventScript_1638C3
 	return
 
 Route113_GlassWorkshop_EventScript_1638B4:: @ 81638B4
-	call Route113_GlassWorkshop_EventScript_1A02A5
-	msgbox Route113_GlassWorkshop_Text_19EA06, 4
+	call Common_EventScript_BagIsFull
+	msgbox Route113_GlassWorkshop_Text_19EA06, MSGBOX_DEFAULT
 	release
 	end
 
 Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3
-	call Route113_GlassWorkshop_EventScript_1A02B8
-	msgbox Route113_GlassWorkshop_Text_19EA64, 4
+	call Common_EventScript_NoRoomForDecor
+	msgbox Route113_GlassWorkshop_Text_19EA64, MSGBOX_DEFAULT
 	release
 	end
 
@@ -294,7 +294,7 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D
 	end
 
 Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1
-	msgbox Route113_GlassWorkshop_Text_19E9D7, 4
+	msgbox Route113_GlassWorkshop_Text_19E9D7, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
 	call_if_eq Route113_GlassWorkshop_EventScript_163889
 	compare VAR_0x8009, 1
@@ -304,5 +304,5 @@ Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1
 	end
 
 Route113_GlassWorkshop_EventScript_1639D6:: @ 81639D6
-	msgbox Route113_GlassWorkshop_Text_19EB3B, 2
+	msgbox Route113_GlassWorkshop_Text_19EB3B, MSGBOX_NPC
 	end
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index 7af6aaec0..266693259 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -4,22 +4,22 @@ Route114_MapScripts:: @ 8150732
 Route114_EventScript_150733:: @ 8150733
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778
-	msgbox Route114_Text_1C5803, 4
+	msgbox Route114_Text_1C5803, MSGBOX_DEFAULT
 	random 5
 	addvar VAR_RESULT, 15
 	addvar VAR_RESULT, 133
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114
-	msgbox Route114_Text_1C5861, 4
+	msgbox Route114_Text_1C5861, MSGBOX_DEFAULT
 	release
 	end
 
 Route114_EventScript_150778:: @ 8150778
-	msgbox Route114_Text_1C5878, 4
+	msgbox Route114_Text_1C5878, MSGBOX_DEFAULT
 	release
 	end
 
@@ -27,17 +27,17 @@ Route114_EventScript_150782:: @ 8150782
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9
-	msgbox Route114_Text_170154, 4
-	giveitem_std ITEM_TM05_ROAR
+	msgbox Route114_Text_170154, MSGBOX_DEFAULT
+	giveitem ITEM_TM05_ROAR
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05
-	msgbox Route114_Text_1701C5, 4
+	msgbox Route114_Text_1701C5, MSGBOX_DEFAULT
 	release
 	end
 
 Route114_EventScript_1507B9:: @ 81507B9
-	msgbox Route114_Text_1701C5, 4
+	msgbox Route114_Text_1701C5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -46,85 +46,85 @@ Route114_EventScript_1507C3:: @ 81507C3
 	faceplayer
 	waitse
 	playmoncry SPECIES_POOCHYENA, 2
-	msgbox Route114_Text_1701F9, 4
+	msgbox Route114_Text_1701F9, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
 Route114_EventScript_1507D6:: @ 81507D6
-	msgbox Route114_Text_170206, 3
+	msgbox Route114_Text_170206, MSGBOX_SIGN
 	end
 
 Route114_EventScript_1507DF:: @ 81507DF
-	msgbox Route114_Text_17022E, 3
+	msgbox Route114_Text_17022E, MSGBOX_SIGN
 	end
 
 Route114_EventScript_1507E8:: @ 81507E8
-	msgbox Route114_Text_170263, 3
+	msgbox Route114_Text_170263, MSGBOX_SIGN
 	end
 
 Route114_EventScript_1507F1:: @ 81507F1
-	trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5
-	msgbox Route114_Text_1BC0C3, 6
+	trainerbattle_single TRAINER_LENNY, Route114_Text_1BC05B, Route114_Text_1BC0B5
+	msgbox Route114_Text_1BC0C3, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_150808:: @ 8150808
-	trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163
-	msgbox Route114_Text_1BC184, 6
+	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_1BC125, Route114_Text_1BC163
+	msgbox Route114_Text_1BC184, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_15081F:: @ 815081F
-	trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F
-	msgbox Route114_Text_1BC24F, 6
+	trainerbattle_single TRAINER_SHANE, Route114_Text_1BC1C8, Route114_Text_1BC23F
+	msgbox Route114_Text_1BC24F, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_150836:: @ 8150836
-	trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE
-	msgbox Route114_Text_1BC2C6, 6
+	trainerbattle_single TRAINER_NANCY, Route114_Text_1BC289, Route114_Text_1BC2BE
+	msgbox Route114_Text_1BC2C6, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_15084D:: @ 815084D
-	trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327
+	trainerbattle_single TRAINER_STEVE_1, Route114_Text_1BC2F5, Route114_Text_1BC327
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route114_EventScript_150874
-	msgbox Route114_Text_1BC337, 6
+	msgbox Route114_Text_1BC337, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_150874:: @ 8150874
-	trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0
-	msgbox Route114_Text_1BC40F, 6
+	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_1BC3B3, Route114_Text_1BC3E0
+	msgbox Route114_Text_1BC40F, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_15088B:: @ 815088B
-	trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499
+	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_1BC45A, Route114_Text_1BC499
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route114_EventScript_1508B2
-	msgbox Route114_Text_1BC4B5, 6
+	msgbox Route114_Text_1BC4B5, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_1508B2:: @ 81508B2
-	trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559
-	msgbox Route114_Text_1BC58C, 6
+	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_1BC525, Route114_Text_1BC559
+	msgbox Route114_Text_1BC58C, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_1508C9:: @ 81508C9
-	trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653
-	msgbox Route114_Text_1BC679, 6
+	trainerbattle_single TRAINER_CLAUDE, Route114_Text_1BC5FC, Route114_Text_1BC653
+	msgbox Route114_Text_1BC679, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_1508E0:: @ 81508E0
-	trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750
-	msgbox Route114_Text_1BC78A, 6
+	trainerbattle_single TRAINER_NOLAN, Route114_Text_1BC6EC, Route114_Text_1BC750
+	msgbox Route114_Text_1BC78A, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_1508F7:: @ 81508F7
-	trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A
-	msgbox Route114_Text_1BC858, 6
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A
+	msgbox Route114_Text_1BC858, MSGBOX_AUTOCLOSE
 	end
 
 Route114_EventScript_150912:: @ 8150912
-	trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A
-	msgbox Route114_Text_1BC91E, 6
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A
+	msgbox Route114_Text_1BC91E, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index 8313eacb1..de16363c8 100644
--- a/data/maps/Route114_FossilManiacsHouse/scripts.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9
-	map_script 3, Route114_FossilManiacsHouse_MapScript1_15C1BF
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_MapScript1_15C1BF
 	.byte 0
 
 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF
@@ -10,23 +10,23 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2
-	msgbox Route114_FossilManiacsHouse_Text_1925E1, 4
-	giveitem_std ITEM_TM28_DIG
+	msgbox Route114_FossilManiacsHouse_Text_1925E1, MSGBOX_DEFAULT
+	giveitem ITEM_TM28_DIG
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM28
 	release
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C1F2:: @ 815C1F2
-	msgbox Route114_FossilManiacsHouse_Text_1926AE, 4
+	msgbox Route114_FossilManiacsHouse_Text_1926AE, MSGBOX_DEFAULT
 	release
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C1FC:: @ 815C1FC
-	msgbox Route114_FossilManiacsHouse_Text_1926FA, 3
+	msgbox Route114_FossilManiacsHouse_Text_1926FA, MSGBOX_SIGN
 	end
 
 Route114_FossilManiacsHouse_EventScript_15C205:: @ 815C205
-	msgbox Route114_FossilManiacsHouse_Text_192729, 3
+	msgbox Route114_FossilManiacsHouse_Text_192729, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 23440b191..44b0b9315 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -11,16 +11,16 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F
 	checkitem ITEM_CLAW_FOSSIL, 1
 	compare VAR_RESULT, 1
 	goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244
-	msgbox Route114_FossilManiacsTunnel_Text_192795, 4
+	msgbox Route114_FossilManiacsTunnel_Text_192795, MSGBOX_DEFAULT
 	release
 	end
 
 Route114_FossilManiacsTunnel_EventScript_15C244:: @ 815C244
-	msgbox Route114_FossilManiacsTunnel_Text_1928DE, 4
+	msgbox Route114_FossilManiacsTunnel_Text_1928DE, MSGBOX_DEFAULT
 	release
 	end
 
 Route114_FossilManiacsTunnel_EventScript_15C24E:: @ 815C24E
-	msgbox Route114_FossilManiacsTunnel_Text_1929DC, 4
+	msgbox Route114_FossilManiacsTunnel_Text_1929DC, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 2fe385c18..e2dd975cb 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route114_LanettesHouse_MapScripts:: @ 815C258
-	map_script 3, Route114_LanettesHouse_MapScript1_15C25E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_MapScript1_15C25E
 	.byte 0
 
 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E
@@ -11,20 +11,20 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262
 	faceplayer
 	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F
 	setflag FLAG_SYS_PC_LANETTE
-	msgbox Route114_LanettesHouse_Text_192A0D, 4
+	msgbox Route114_LanettesHouse_Text_192A0D, MSGBOX_DEFAULT
 	.ifdef SAPPHIRE
-	givedecoration_std DECOR_LOTAD_DOLL
+	givedecoration DECOR_LOTAD_DOLL
 	.else
-	givedecoration_std DECOR_SEEDOT_DOLL
+	givedecoration DECOR_SEEDOT_DOLL
 	.endif
 	compare VAR_RESULT, 0
-	goto_if_eq Route114_LanettesHouse_EventScript_1A02AE
+	goto_if_eq Common_EventScript_ShowNoRoomForDecor
 	setflag FLAG_RECEIVED_DOLL_LANETTE
 	release
 	end
 
 Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F
-	msgbox Route114_LanettesHouse_Text_192ACC, 4
+	msgbox Route114_LanettesHouse_Text_192ACC, MSGBOX_DEFAULT
 	release
 	end
 
@@ -33,7 +33,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299
 	msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route114_LanettesHouse_EventScript_15C2B7
-	msgbox Route114_LanettesHouse_Text_192DA9, 4
+	msgbox Route114_LanettesHouse_Text_192DA9, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -45,9 +45,9 @@ Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7
 	end
 
 Route114_LanettesHouse_EventScript_15C2CC:: @ 815C2CC
-	msgbox Route114_LanettesHouse_Text_192CB4, 4
+	msgbox Route114_LanettesHouse_Text_192CB4, MSGBOX_DEFAULT
 	return
 
 Route114_LanettesHouse_EventScript_15C2D5:: @ 815C2D5
-	msgbox Route114_LanettesHouse_Text_192DC1, 3
+	msgbox Route114_LanettesHouse_Text_192DC1, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index 6fd262de4..e24898475 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -2,67 +2,67 @@ Route115_MapScripts:: @ 815092D
 	.byte 0
 
 Route115_EventScript_15092E:: @ 815092E
-	msgbox Route115_Text_170273, 2
+	msgbox Route115_Text_170273, MSGBOX_NPC
 	end
 
 Route115_EventScript_150937:: @ 8150937
-	msgbox Route115_Text_1702E7, 3
+	msgbox Route115_Text_1702E7, MSGBOX_SIGN
 	end
 
 Route115_EventScript_150940:: @ 8150940
-	msgbox Route115_Text_170301, 3
+	msgbox Route115_Text_170301, MSGBOX_SIGN
 	end
 
 Route115_EventScript_150949:: @ 8150949
-	trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6
+	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_1BC9AC, Route115_Text_1BC9E6
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route115_EventScript_150970
-	msgbox Route115_Text_1BCA0E, 6
+	msgbox Route115_Text_1BCA0E, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_150970:: @ 8150970
-	trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3
-	msgbox Route115_Text_1BCAC6, 6
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_1BCA6B, Route115_Text_1BCAB3
+	msgbox Route115_Text_1BCAC6, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_150987:: @ 8150987
-	trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E
-	msgbox Route115_Text_1BCB40, 6
+	trainerbattle_single TRAINER_KOICHI, Route115_Text_1BCB0D, Route115_Text_1BCB2E
+	msgbox Route115_Text_1BCB40, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_15099E:: @ 815099E
-	trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1
+	trainerbattle_single TRAINER_NOB_1, Route115_Text_1BCB8A, Route115_Text_1BCBC1
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route115_EventScript_1509C5
-	msgbox Route115_Text_1BCBDE, 6
+	msgbox Route115_Text_1BCBDE, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1509C5:: @ 81509C5
-	trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2
-	msgbox Route115_Text_1BCCBA, 6
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_1BCC4C, Route115_Text_1BCCA2
+	msgbox Route115_Text_1BCCBA, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_1509DC:: @ 81509DC
-	trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32
+	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_1BCCF4, Route115_Text_1BCD32
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route115_EventScript_150A03
-	msgbox Route115_Text_1BCD4C, 6
+	msgbox Route115_Text_1BCD4C, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_150A03:: @ 8150A03
-	trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0
-	msgbox Route115_Text_1BCDEF, 6
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_1BCDB0, Route115_Text_1BCDD0
+	msgbox Route115_Text_1BCDEF, MSGBOX_AUTOCLOSE
 	end
 
 Route115_EventScript_150A1A:: @ 8150A1A
 .ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D
-	msgbox UnknownString_81BCEA4, 6
+	trainerbattle_single TRAINER_514, UnknownString_81BCE47, UnknownString_81BCE7D
+	msgbox UnknownString_81BCEA4, MSGBOX_AUTOCLOSE
 .else
-	trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16
-	msgbox Route115_Text_1BCF3D, 6
+	trainerbattle_single TRAINER_514, Route115_Text_1BCEE0, Route115_Text_1BCF16
+	msgbox Route115_Text_1BCF3D, MSGBOX_AUTOCLOSE
 .endc
 	end
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index 29ddd8ae2..3bd2091f7 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,5 +1,5 @@
 Route116_MapScripts:: @ 8150A31
-	map_script 3, Route116_MapScript1_150A37
+	map_script MAP_SCRIPT_ON_TRANSITION, Route116_MapScript1_150A37
 	.byte 0
 
 Route116_MapScript1_150A37:: @ 8150A37
@@ -15,17 +15,17 @@ Route116_EventScript_150A49:: @ 8150A49
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71
-	msgbox Route116_Text_1703CF, 4
+	msgbox Route116_Text_1703CF, MSGBOX_DEFAULT
 	release
 	end
 
 Route116_EventScript_150A67:: @ 8150A67
-	msgbox Route116_Text_170556, 4
+	msgbox Route116_Text_170556, MSGBOX_DEFAULT
 	release
 	end
 
 Route116_EventScript_150A71:: @ 8150A71
-	msgbox Route116_Text_1703F7, 4
+	msgbox Route116_Text_1703F7, MSGBOX_DEFAULT
 	release
 	end
 
@@ -33,16 +33,16 @@ Route116_EventScript_150A7B:: @ 8150A7B
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04
-	msgbox Route116_Text_1705AE, 4
+	msgbox Route116_Text_1705AE, MSGBOX_DEFAULT
 	goto Route116_EventScript_150A94
 	end
 
 Route116_EventScript_150A94:: @ 8150A94
 	setflag FLAG_MET_DEVON_EMPLOYEE
-	giveitem_std ITEM_REPEAT_BALL
+	giveitem ITEM_REPEAT_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq Route116_EventScript_150B12
-	msgbox Route116_Text_1707B8, 4
+	msgbox Route116_Text_1707B8, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if_eq Route116_EventScript_150AEE
@@ -69,12 +69,12 @@ Route116_EventScript_150AF9:: @ 8150AF9
 	return
 
 Route116_EventScript_150B04:: @ 8150B04
-	msgbox Route116_Text_170865, 4
+	msgbox Route116_Text_170865, MSGBOX_DEFAULT
 	goto Route116_EventScript_150A94
 	end
 
 Route116_EventScript_150B12:: @ 8150B12
-	msgbox Route116_Text_17082A, 4
+	msgbox Route116_Text_17082A, MSGBOX_DEFAULT
 	release
 	end
 
@@ -87,7 +87,7 @@ Route116_Movement_150B1C:: @ 8150B1C
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route116_Movement_150B25:: @ 8150B25
 	walk_down
@@ -100,42 +100,42 @@ Route116_Movement_150B25:: @ 8150B25
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route116_EventScript_150B30:: @ 8150B30
-	msgbox Route116_Text_170A46, 3
+	msgbox Route116_Text_170A46, MSGBOX_SIGN
 	end
 
 Route116_EventScript_150B39:: @ 8150B39
-	msgbox Route116_Text_170A60, 3
+	msgbox Route116_Text_170A60, MSGBOX_SIGN
 	end
 
 Route116_EventScript_150B42:: @ 8150B42
-	msgbox Route116_Text_170AB8, 3
+	msgbox Route116_Text_170AB8, MSGBOX_SIGN
 	end
 
 Route116_EventScript_150B4B:: @ 8150B4B
-	msgbox Route116_Text_170ACE, 3
+	msgbox Route116_Text_170ACE, MSGBOX_SIGN
 	end
 
 Route116_EventScript_150B54:: @ 8150B54
-	msgbox Route116_Text_170B7D, 3
+	msgbox Route116_Text_170B7D, MSGBOX_SIGN
 	end
 
 Route116_EventScript_150B5D:: @ 8150B5D
 	lock
 	faceplayer
-	msgbox Route116_Text_17032A, 4
+	msgbox Route116_Text_17032A, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
 Route116_EventScript_150B6E:: @ 8150B6E
 	lockall
-	applymovement 11, Route116_Movement_1A0843
-	applymovement 255, Route116_Movement_1A083F
+	applymovement 11, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox Route116_Text_17032A, 4
+	msgbox Route116_Text_17032A, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
@@ -149,28 +149,28 @@ Route116_EventScript_150B8F:: @ 8150B8F
 	specialvar VAR_RESULT, FoundBlackGlasses
 	compare VAR_RESULT, 1
 	goto_if_eq Route116_EventScript_150BBB
-	msgbox Route116_Text_1708EE, 4
+	msgbox Route116_Text_1708EE, MSGBOX_DEFAULT
 	release
 	end
 
 Route116_EventScript_150BBB:: @ 8150BBB
-	msgbox Route116_Text_1709B7, 4
+	msgbox Route116_Text_1709B7, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_150C03
 	end
 
 Route116_EventScript_150BCA:: @ 8150BCA
-	msgbox Route116_Text_1708EE, 4
-	msgbox Route116_Text_170921, 4
+	msgbox Route116_Text_1708EE, MSGBOX_DEFAULT
+	msgbox Route116_Text_170921, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
 	compare VAR_RESULT, 1
 	goto_if_eq Route116_EventScript_150BF4
-	msgbox Route116_Text_170A03, 4
+	msgbox Route116_Text_170A03, MSGBOX_DEFAULT
 	release
 	end
 
 Route116_EventScript_150BF4:: @ 8150BF4
-	msgbox Route116_Text_17094D, 4
+	msgbox Route116_Text_17094D, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_150C03
 	end
@@ -209,7 +209,7 @@ Route116_Movement_150C4D:: @ 8150C4D
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route116_Movement_150C57:: @ 8150C57
 	walk_up
@@ -222,50 +222,50 @@ Route116_Movement_150C57:: @ 8150C57
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route116_EventScript_150C62:: @ 8150C62
-	trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C
-	msgbox Route116_Text_1BD078, 6
+	trainerbattle_single TRAINER_JOEY, Route116_Text_1BD02B, Route116_Text_1BD04C
+	msgbox Route116_Text_1BD078, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150C79:: @ 8150C79
-	trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7
-	msgbox Route116_Text_1BD0F4, 6
+	trainerbattle_single TRAINER_JOSE, Route116_Text_1BD0AF, Route116_Text_1BD0D7
+	msgbox Route116_Text_1BD0F4, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150C90:: @ 8150C90
-	trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A
+	trainerbattle_single TRAINER_JERRY_1, Route116_Text_1BD1C0, Route116_Text_1BD21A
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route116_EventScript_150CB7
-	msgbox Route116_Text_1BD248, 6
+	msgbox Route116_Text_1BD248, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150CB7:: @ 8150CB7
-	trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE
-	msgbox Route116_Text_1BD31A, 6
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_1BD2A5, Route116_Text_1BD2FE
+	msgbox Route116_Text_1BD31A, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150CCE:: @ 8150CCE
-	trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB
-	msgbox Route116_Text_1BCFE3, 6
+	trainerbattle_single TRAINER_CLARK, Route116_Text_1BCF79, Route116_Text_1BCFBB
+	msgbox Route116_Text_1BCFE3, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150CE5:: @ 8150CE5
-	trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165
-	msgbox Route116_Text_1BD180, 6
+	trainerbattle_single TRAINER_JANICE, Route116_Text_1BD131, Route116_Text_1BD165
+	msgbox Route116_Text_1BD180, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150CFC:: @ 8150CFC
-	trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC
+	trainerbattle_single TRAINER_KAREN_1, Route116_Text_1BD377, Route116_Text_1BD3AC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route116_EventScript_150D23
-	msgbox Route116_Text_1BD3C3, 6
+	msgbox Route116_Text_1BD3C3, MSGBOX_AUTOCLOSE
 	end
 
 Route116_EventScript_150D23:: @ 8150D23
-	trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A
-	msgbox Route116_Text_1BD466, 6
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_1BD405, Route116_Text_1BD44A
+	msgbox Route116_Text_1BD466, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index 5ec6ef642..1bbabda4f 100644
--- a/data/maps/Route116_TunnelersRestHouse/scripts.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE
-	map_script 3, Route116_TunnelersRestHouse_MapScript1_15C2E4
+	map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_MapScript1_15C2E4
 	.byte 0
 
 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4
@@ -7,22 +7,22 @@ Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8
-	msgbox Route116_TunnelersRestHouse_Text_192F33, 2
+	msgbox Route116_TunnelersRestHouse_Text_192F33, MSGBOX_NPC
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1
-	msgbox Route116_TunnelersRestHouse_Text_193049, 2
+	msgbox Route116_TunnelersRestHouse_Text_193049, MSGBOX_NPC
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F
-	msgbox Route116_TunnelersRestHouse_Text_193135, 4
+	msgbox Route116_TunnelersRestHouse_Text_193135, MSGBOX_DEFAULT
 	release
 	end
 
 Route116_TunnelersRestHouse_EventScript_15C30F:: @ 815C30F
-	msgbox Route116_TunnelersRestHouse_Text_1931C1, 4
+	msgbox Route116_TunnelersRestHouse_Text_1931C1, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 363b19280..1fb14e10b 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -1,5 +1,5 @@
 Route117_MapScripts:: @ 8150D3A
-	map_script 3, Route117_MapScript1_150D40
+	map_script MAP_SCRIPT_ON_TRANSITION, Route117_MapScript1_150D40
 	.byte 0
 
 Route117_MapScript1_150D40:: @ 8150D40
@@ -14,108 +14,108 @@ Route117_EventScript_150D56:: @ 8150D56
 	return
 
 Route117_EventScript_150D57:: @ 8150D57
-	msgbox Route117_Text_170CA7, 2
+	msgbox Route117_Text_170CA7, MSGBOX_NPC
 	end
 
 Route117_EventScript_150D60:: @ 8150D60
-	msgbox Route117_Text_170CEB, 2
+	msgbox Route117_Text_170CEB, MSGBOX_NPC
 	end
 
 Route117_EventScript_150D69:: @ 8150D69
-	msgbox Route117_Text_170C26, 2
+	msgbox Route117_Text_170C26, MSGBOX_NPC
 	end
 
 Route117_EventScript_150D72:: @ 8150D72
-	msgbox Route117_Text_170D02, 3
+	msgbox Route117_Text_170D02, MSGBOX_SIGN
 	end
 
 Route117_EventScript_150D7B:: @ 8150D7B
-	msgbox Route117_Text_170D1E, 3
+	msgbox Route117_Text_170D1E, MSGBOX_SIGN
 	end
 
 Route117_EventScript_150D84:: @ 8150D84
-	msgbox Route117_Text_170D38, 3
+	msgbox Route117_Text_170D38, MSGBOX_SIGN
 	end
 
 Route117_EventScript_150D8D:: @ 8150D8D
-	trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9
+	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_1BD49E, Route117_Text_1BD4D9
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150DB4
-	msgbox Route117_Text_1BD4F9, 6
+	msgbox Route117_Text_1BD4F9, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150DB4:: @ 8150DB4
-	trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB
-	msgbox Route117_Text_1BD5F2, 6
+	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_1BD569, Route117_Text_1BD5AB
+	msgbox Route117_Text_1BD5F2, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150DCB:: @ 8150DCB
-	trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B
+	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_1BD634, Route117_Text_1BD67B
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150DF2
-	msgbox Route117_Text_1BD69B, 6
+	msgbox Route117_Text_1BD69B, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150DF2:: @ 8150DF2
-	trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733
-	msgbox Route117_Text_1BD74F, 6
+	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_1BD6F2, Route117_Text_1BD733
+	msgbox Route117_Text_1BD74F, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E09:: @ 8150E09
-	trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0
+	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_1BD79A, Route117_Text_1BD7E0
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150E30
-	msgbox Route117_Text_1BD7F5, 6
+	msgbox Route117_Text_1BD7F5, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E30:: @ 8150E30
-	trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2
-	msgbox Route117_Text_1BD8BD, 6
+	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_1BD83F, Route117_Text_1BD8A2
+	msgbox Route117_Text_1BD8BD, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E47:: @ 8150E47
-	trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965
+	trainerbattle_single TRAINER_MARIA_1, Route117_Text_1BD914, Route117_Text_1BD965
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150E6E
-	msgbox Route117_Text_1BD98F, 6
+	msgbox Route117_Text_1BD98F, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E6E:: @ 8150E6E
-	trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41
-	msgbox Route117_Text_1BDA6B, 6
+	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_1BD9F1, Route117_Text_1BDA41
+	msgbox Route117_Text_1BDA6B, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E85:: @ 8150E85
-	trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC
-	msgbox Route117_Text_1BDB24, 6
+	trainerbattle_single TRAINER_DEREK, Route117_Text_1BDAA7, Route117_Text_1BDAFC
+	msgbox Route117_Text_1BDB24, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150E9C:: @ 8150E9C
-	trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150EC7
-	msgbox Route117_Text_1BDC44, 6
+	msgbox Route117_Text_1BDC44, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150EC7:: @ 8150EC7
-	trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7
-	msgbox Route117_Text_1BDE55, 6
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7
+	msgbox Route117_Text_1BDE55, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150EE2:: @ 8150EE2
-	trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_EventScript_150F0D
-	msgbox Route117_Text_1BDD4E, 6
+	msgbox Route117_Text_1BDD4E, MSGBOX_AUTOCLOSE
 	end
 
 Route117_EventScript_150F0D:: @ 8150F0D
-	trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90
-	msgbox Route117_Text_1BDF37, 6
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90
+	msgbox Route117_Text_1BDF37, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index 9ad740b4e..a5523717b 100644
--- a/data/maps/Route117_PokemonDayCare/scripts.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
@@ -1,5 +1,5 @@
 Route117_PokemonDayCare_MapScripts:: @ 815C319
-	map_script 3, Route117_PokemonDayCare_MapScript1_15C31F
+	map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_MapScript1_15C31F
 	.byte 0
 
 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 0bb082903..be767e166 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,5 +1,5 @@
 Route118_MapScripts:: @ 8150F28
-	map_script 3, Route118_MapScript1_150F2E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route118_MapScript1_150F2E
 	.byte 0
 
 Route118_MapScript1_150F2E:: @ 8150F2E
@@ -18,39 +18,39 @@ Route118_EventScript_150F34:: @ 8150F34
 	end
 
 Route118_EventScript_150F5E:: @ 8150F5E
-	msgbox Route118_Text_170F46, 4
-	giveitem_std ITEM_GOOD_ROD
+	msgbox Route118_Text_170F46, MSGBOX_DEFAULT
+	giveitem ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_170F7E, 4
+	msgbox Route118_Text_170F7E, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_150F7F:: @ 8150F7F
-	msgbox Route118_Text_170FB0, 4
+	msgbox Route118_Text_170FB0, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_150F89:: @ 8150F89
-	msgbox Route118_Text_170FC8, 4
+	msgbox Route118_Text_170FC8, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_150F93:: @ 8150F93
-	msgbox Route118_Text_170FFE, 2
+	msgbox Route118_Text_170FFE, MSGBOX_NPC
 	end
 
 Route118_EventScript_150F9C:: @ 8150F9C
-	msgbox Route118_Text_17108B, 3
+	msgbox Route118_Text_17108B, MSGBOX_SIGN
 	end
 
 Route118_EventScript_150FA5:: @ 8150FA5
-	msgbox Route118_Text_1710A5, 3
+	msgbox Route118_Text_1710A5, MSGBOX_SIGN
 	end
 
 Route118_EventScript_150FAE:: @ 8150FAE
 	lockall
 	setvar VAR_0x8008, 0
-	applymovement 255, Route118_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement 19, Route118_Movement_151069
 	waitmovement 0
@@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE
 Route118_EventScript_150FCE:: @ 8150FCE
 	lockall
 	setvar VAR_0x8008, 1
-	applymovement 255, Route118_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	goto Route118_EventScript_151004
 	end
@@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE
 Route118_EventScript_150FE4:: @ 8150FE4
 	lockall
 	setvar VAR_0x8008, 2
-	applymovement 255, Route118_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement 19, Route118_Movement_15106B
 	waitmovement 0
@@ -80,7 +80,7 @@ Route118_EventScript_151004:: @ 8151004
 	applymovement 19, Route118_Movement_15106D
 	waitmovement 0
 	delay 30
-	msgbox Route118_Text_170D66, 4
+	msgbox Route118_Text_170D66, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
 	call_if_eq Route118_EventScript_151048
@@ -110,17 +110,17 @@ Route118_EventScript_15105E:: @ 815105E
 
 Route118_Movement_151069:: @ 8151069
 	walk_left
-	end_movement
+	step_end
 
 Route118_Movement_15106B:: @ 815106B
 	walk_right
-	end_movement
+	step_end
 
 Route118_Movement_15106D:: @ 815106D
 	jump_2_down
 	delay_16
 	walk_down
-	end_movement
+	step_end
 
 Route118_Movement_151071:: @ 8151071
 	walk_right
@@ -133,7 +133,7 @@ Route118_Movement_151071:: @ 8151071
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route118_Movement_15107C:: @ 815107C
 	walk_right
@@ -145,7 +145,7 @@ Route118_Movement_15107C:: @ 815107C
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route118_Movement_151086:: @ 8151086
 	walk_right
@@ -156,50 +156,50 @@ Route118_Movement_151086:: @ 8151086
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route118_EventScript_15108F:: @ 815108F
-	trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
+	trainerbattle_single TRAINER_ROSE_1, Route118_Text_1BDFF4, Route118_Text_1BE03C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route118_EventScript_1510B6
-	msgbox Route118_Text_1BE05E, 6
+	msgbox Route118_Text_1BE05E, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_1510B6:: @ 81510B6
-	trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3
-	msgbox Route118_Text_1BE104, 6
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_1BE0AB, Route118_Text_1BE0D3
+	msgbox Route118_Text_1BE104, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_1510CD:: @ 81510CD
-	trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291
-	msgbox Route118_Text_1BE2BE, 6
+	trainerbattle_single TRAINER_BARNY, Route118_Text_1BE24A, Route118_Text_1BE291
+	msgbox Route118_Text_1BE2BE, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_1510E4:: @ 81510E4
-	trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385
-	msgbox Route118_Text_1BE39C, 6
+	trainerbattle_single TRAINER_WADE, Route118_Text_1BE318, Route118_Text_1BE385
+	msgbox Route118_Text_1BE39C, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_1510FB:: @ 81510FB
-	trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406
+	trainerbattle_single TRAINER_DALTON_1, Route118_Text_1BE3E8, Route118_Text_1BE406
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route118_EventScript_151122
-	msgbox Route118_Text_1BE413, 6
+	msgbox Route118_Text_1BE413, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_151122:: @ 8151122
-	trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC
-	msgbox Route118_Text_1BE4D9, 6
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_1BE489, Route118_Text_1BE4CC
+	msgbox Route118_Text_1BE4D9, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_151139:: @ 8151139
-	trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188
-	msgbox Route118_Text_1BE19D, 6
+	trainerbattle_single TRAINER_PERRY, Route118_Text_1BE148, Route118_Text_1BE188
+	msgbox Route118_Text_1BE19D, MSGBOX_AUTOCLOSE
 	end
 
 Route118_EventScript_151150:: @ 8151150
-	trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5
-	msgbox Route118_Text_1BE20D, 6
+	trainerbattle_single TRAINER_CHESTER, Route118_Text_1BE1D7, Route118_Text_1BE1F5
+	msgbox Route118_Text_1BE20D, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index af2aa1f35..0cdba1552 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -474,7 +474,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1A057A",
+      "script": "Route119_EventScript_Kecleon1",
       "flag": "FLAG_HIDE_KECLEON_ROUTE119_1"
     },
     {
@@ -487,7 +487,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route119_EventScript_1A0587",
+      "script": "Route119_EventScript_Kecleon2",
       "flag": "FLAG_HIDE_KECLEON_ROUTE119_2"
     },
     {
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index c94ce00e2..3b4e9c51f 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -1,6 +1,6 @@
 Route119_MapScripts:: @ 8151167
-	map_script 5, Route119_MapScript1_151172
-	map_script 3, Route119_MapScript1_15119B
+	map_script MAP_SCRIPT_ON_RESUME, Route119_MapScript1_151172
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_MapScript1_15119B
 	.byte 0
 
 Route119_MapScript1_151172:: @ 8151172
@@ -23,9 +23,9 @@ Route119_EventScript_151197:: @ 8151197
 	return
 
 Route119_MapScript1_15119B:: @ 815119B
-	call Route119_EventScript_1A014E
-	call Route119_EventScript_1A0172
-	call Route119_EventScript_1A0196
+	call Common_EventScript_SetupRivalGfxId
+	call Common_EventScript_SetupRivalOnBikeGfxId
+	call Common_EventScript_SetupEvilTeamGfxIds
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
 	call_if_eq Route119_EventScript_1511B9
 	special SetRoute119Weather
@@ -60,7 +60,7 @@ Route119_EventScript_1511DB:: @ 81511DB
 	call_if_eq Route119_EventScript_1513A6
 	compare VAR_TEMP_1, 2
 	call_if_eq Route119_EventScript_1513B1
-	applymovement 255, Route119_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	compare VAR_TEMP_1, 1
@@ -87,7 +87,7 @@ Route119_EventScript_151259:: @ 8151259
 	return
 
 Route119_EventScript_15125E:: @ 815125E
-	msgbox Route119_Text_1710BB, 4
+	msgbox Route119_Text_1710BB, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_15128D
 	case 1, Route119_EventScript_15129D
@@ -95,29 +95,29 @@ Route119_EventScript_15125E:: @ 815125E
 	end
 
 Route119_EventScript_15128D:: @ 815128D
-	trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156
+	trainerbattle_no_intro TRAINER_MAY_6, Route119_Text_171156
 	goto Route119_EventScript_1512BD
 	end
 
 Route119_EventScript_15129D:: @ 815129D
-	trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156
+	trainerbattle_no_intro TRAINER_MAY_9, Route119_Text_171156
 	goto Route119_EventScript_1512BD
 	end
 
 Route119_EventScript_1512AD:: @ 81512AD
-	trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156
+	trainerbattle_no_intro TRAINER_MAY_3, Route119_Text_171156
 	goto Route119_EventScript_1512BD
 	end
 
 Route119_EventScript_1512BD:: @ 81512BD
-	msgbox Route119_Text_1711B1, 4
+	msgbox Route119_Text_1711B1, MSGBOX_DEFAULT
 	call Route119_EventScript_151352
-	msgbox Route119_Text_171214, 4
+	msgbox Route119_Text_171214, MSGBOX_DEFAULT
 	goto Route119_EventScript_151362
 	end
 
 Route119_EventScript_1512D8:: @ 81512D8
-	msgbox Route119_Text_171358, 4
+	msgbox Route119_Text_171358, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_151307
 	case 1, Route119_EventScript_151317
@@ -125,29 +125,29 @@ Route119_EventScript_1512D8:: @ 81512D8
 	end
 
 Route119_EventScript_151307:: @ 8151307
-	trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2
+	trainerbattle_no_intro TRAINER_BRENDAN_6, Route119_Text_1713E2
 	goto Route119_EventScript_151337
 	end
 
 Route119_EventScript_151317:: @ 8151317
-	trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2
+	trainerbattle_no_intro TRAINER_BRENDAN_9, Route119_Text_1713E2
 	goto Route119_EventScript_151337
 	end
 
 Route119_EventScript_151327:: @ 8151327
-	trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2
+	trainerbattle_no_intro TRAINER_BRENDAN_3, Route119_Text_1713E2
 	goto Route119_EventScript_151337
 	end
 
 Route119_EventScript_151337:: @ 8151337
-	msgbox Route119_Text_17140B, 4
+	msgbox Route119_Text_17140B, MSGBOX_DEFAULT
 	call Route119_EventScript_151352
-	msgbox Route119_Text_171475, 4
+	msgbox Route119_Text_171475, MSGBOX_DEFAULT
 	goto Route119_EventScript_151362
 	end
 
 Route119_EventScript_151352:: @ 8151352
-	giveitem_std ITEM_HM02_FLY
+	giveitem ITEM_HM02_FLY
 	setflag FLAG_RECEIVED_HM02
 	return
 
@@ -211,7 +211,7 @@ Route119_Movement_1513F0:: @ 81513F0
 	walk_fast_right
 	walk_fast_right
 	walk_fast_up
-	end_movement
+	step_end
 
 Route119_Movement_1513FA:: @ 81513FA
 	walk_fast_right
@@ -224,7 +224,7 @@ Route119_Movement_1513FA:: @ 81513FA
 	walk_fast_right
 	walk_fast_right
 	walk_fast_up
-	end_movement
+	step_end
 
 Route119_Movement_151405:: @ 8151405
 	walk_fast_right
@@ -236,7 +236,7 @@ Route119_Movement_151405:: @ 8151405
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route119_Movement_15140F:: @ 815140F
 	walk_fast_left
@@ -249,112 +249,112 @@ Route119_Movement_15140F:: @ 815140F
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route119_EventScript_15141A:: @ 815141A
-	msgbox Route119_Text_171698, 2
+	msgbox Route119_Text_171698, MSGBOX_NPC
 	end
 
 Route119_EventScript_151423:: @ 8151423
-	msgbox Route119_Text_171749, 3
+	msgbox Route119_Text_171749, MSGBOX_SIGN
 	end
 
 Route119_EventScript_15142C:: @ 815142C
-	msgbox Route119_Text_171762, 3
+	msgbox Route119_Text_171762, MSGBOX_SIGN
 	end
 
 Route119_EventScript_151435:: @ 8151435
-	trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F
-	msgbox Route119_Text_1BE561, 6
+	trainerbattle_single TRAINER_BRENT, Route119_Text_1BE521, Route119_Text_1BE54F
+	msgbox Route119_Text_1BE561, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_15144C:: @ 815144C
-	trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF
-	msgbox Route119_Text_1BE5F8, 6
+	trainerbattle_single TRAINER_DONALD, Route119_Text_1BE5A4, Route119_Text_1BE5DF
+	msgbox Route119_Text_1BE5F8, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151463:: @ 8151463
-	trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B
-	msgbox Route119_Text_1BE695, 6
+	trainerbattle_single TRAINER_TAYLOR, Route119_Text_1BE632, Route119_Text_1BE67B
+	msgbox Route119_Text_1BE695, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_15147A:: @ 815147A
-	trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729
-	msgbox Route119_Text_1BE748, 6
+	trainerbattle_single TRAINER_DOUG, Route119_Text_1BE6EA, Route119_Text_1BE729
+	msgbox Route119_Text_1BE748, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151491:: @ 8151491
-	trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3
-	msgbox Route119_Text_1BE7E9, 6
+	trainerbattle_single TRAINER_GREG, Route119_Text_1BE784, Route119_Text_1BE7D3
+	msgbox Route119_Text_1BE7E9, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1514A8:: @ 81514A8
-	trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D
-	msgbox Route119_Text_1BE89A, 6
+	trainerbattle_single TRAINER_KENT, Route119_Text_1BE82F, Route119_Text_1BE88D
+	msgbox Route119_Text_1BE89A, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1514BF:: @ 81514BF
-	trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
+	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_1BE8BB, Route119_Text_1BE90E
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route119_EventScript_1514E6
-	msgbox Route119_Text_1BE937, 6
+	msgbox Route119_Text_1BE937, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1514E6:: @ 81514E6
-	trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0
-	msgbox Route119_Text_1BE9E8, 6
+	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_1BE98D, Route119_Text_1BE9D0
+	msgbox Route119_Text_1BE9E8, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1514FD:: @ 81514FD
-	trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
+	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_1BEA3A, Route119_Text_1BEA88
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route119_EventScript_151524
-	msgbox Route119_Text_1BEAB3, 6
+	msgbox Route119_Text_1BEAB3, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151524:: @ 8151524
-	trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49
-	msgbox Route119_Text_1BEB68, 6
+	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_1BEB22, Route119_Text_1BEB49
+	msgbox Route119_Text_1BEB68, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_15153B:: @ 815153B
-	trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C
-	msgbox Route119_Text_1BEC2A, 6
+	trainerbattle_single TRAINER_HUGH, Route119_Text_1BEBC0, Route119_Text_1BEC1C
+	msgbox Route119_Text_1BEC2A, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151552:: @ 8151552
-	trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A
-	msgbox Route119_Text_1BECB1, 6
+	trainerbattle_single TRAINER_PHIL, Route119_Text_1BEC5E, Route119_Text_1BEC9A
+	msgbox Route119_Text_1BECB1, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151569:: @ 8151569
-	trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C
-	msgbox Route119_Text_1BED5C, 6
+	trainerbattle_single TRAINER_YASU, Route119_Text_1BECF1, Route119_Text_1BED4C
+	msgbox Route119_Text_1BED5C, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151580:: @ 8151580
-	trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC
-	msgbox Route119_Text_1BEE06, 6
+	trainerbattle_single TRAINER_TAKASHI, Route119_Text_1BEDB6, Route119_Text_1BEDEC
+	msgbox Route119_Text_1BEE06, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_151597:: @ 8151597
-	trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B
-	msgbox Route119_Text_1BEE66, 6
+	trainerbattle_single TRAINER_HIDEO_2, Route119_Text_1BEE2D, Route119_Text_1BEE4B
+	msgbox Route119_Text_1BEE66, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1515AE:: @ 81515AE
-	trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37
-	msgbox Route119_Text_1BEF67, 6
+	trainerbattle_single TRAINER_EUGENE, Route119_Text_1BEED0, Route119_Text_1BEF37
+	msgbox Route119_Text_1BEF67, MSGBOX_AUTOCLOSE
 	end
 
 Route119_EventScript_1515C5:: @ 81515C5
 	lock
 	faceplayer
-	msgbox Route119_Text_171520, 4
+	msgbox Route119_Text_171520, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -362,21 +362,21 @@ Route119_EventScript_1515C5:: @ 81515C5
 Route119_EventScript_1515DC:: @ 81515DC
 	lock
 	faceplayer
-	msgbox Route119_Text_17157C, 4
+	msgbox Route119_Text_17157C, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, Route119_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 Route119_EventScript_1515F3:: @ 81515F3
-	msgbox Route119_Text_1715D7, 2
+	msgbox Route119_Text_1715D7, MSGBOX_NPC
 	end
 
 Route119_EventScript_1515FC:: @ 81515FC
-	msgbox Route119_Text_1716F4, 2
+	msgbox Route119_Text_1716F4, MSGBOX_NPC
 	end
 
 Route119_EventScript_151605:: @ 8151605
-	msgbox Route119_Text_171774, 3
+	msgbox Route119_Text_171774, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc
index 76763c68e..5de9135c6 100644
--- a/data/maps/Route119_House/scripts.inc
+++ b/data/maps/Route119_House/scripts.inc
@@ -2,7 +2,7 @@ Route119_House_MapScripts:: @ 8163DDD
 	.byte 0
 
 Route119_House_EventScript_163DDE:: @ 8163DDE
-	msgbox Route119_House_Text_19F371, 2
+	msgbox Route119_House_Text_19F371, MSGBOX_NPC
 	end
 
 Route119_House_EventScript_163DE7:: @ 8163DE7
@@ -10,7 +10,7 @@ Route119_House_EventScript_163DE7:: @ 8163DE7
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox Route119_House_Text_19F406, 4
+	msgbox Route119_House_Text_19F406, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index 547241940..c97e25e29 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A
-	map_script 3, Route119_WeatherInstitute_1F_MapScript1_163C30
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_MapScript1_163C30
 	.byte 0
 
 Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30
-	call Route119_WeatherInstitute_1F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41
 	end
@@ -19,37 +19,37 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D
 	special GetPlayerBigGuyGirlString
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67
-	msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4
+	msgbox Route119_WeatherInstitute_1F_Text_19ED22, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C67:: @ 8163C67
-	msgbox Route119_WeatherInstitute_1F_Text_19ECF4, 4
+	msgbox Route119_WeatherInstitute_1F_Text_19ECF4, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C71:: @ 8163C71
-	msgbox Route119_WeatherInstitute_1F_Text_19ED6B, 2
+	msgbox Route119_WeatherInstitute_1F_Text_19ED6B, MSGBOX_NPC
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A
-	msgbox Route119_WeatherInstitute_1F_Text_19EE25, 2
+	msgbox Route119_WeatherInstitute_1F_Text_19EE25, MSGBOX_NPC
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83
 	lockall
-	msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4
+	msgbox Route119_WeatherInstitute_1F_Text_19EE8B, MSGBOX_DEFAULT
 	closemessage
-	call Route119_WeatherInstitute_1F_EventScript_1A02CA
+	call Common_EventScript_OutOfCenterPartyHeal
 	releaseall
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE
-	msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6
+	trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_1, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE
+	msgbox Route119_WeatherInstitute_1F_Text_19EC0E, MSGBOX_AUTOCLOSE
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89
-	msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6
+	trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_2, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89
+	msgbox Route119_WeatherInstitute_1F_Text_19EC97, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index a2317a791..18aba2003 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
-	map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8
+	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_MapScript1_163CC8
 	.byte 0
 
 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
-	call Route119_WeatherInstitute_2F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
@@ -21,32 +21,32 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
 	return
 
 Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
-	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
+	trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_3, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
+	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, MSGBOX_AUTOCLOSE
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
-	trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
-	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
+	trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_4, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
+	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, MSGBOX_AUTOCLOSE
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
-	trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
+	trainerbattle_single TRAINER_WEATHER_INSTITUTE_GRUNT_5, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, MSGBOX_AUTOCLOSE
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_WEATHER_INSTITUTE_STATE, 1
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
 	fadedefaultbgm
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
 	removeobject 1
 	removeobject 2
 	removeobject 3
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
 	waitmovement 0
 	moveobjectoffscreen 5
@@ -54,7 +54,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
-	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
+	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, MSGBOX_DEFAULT
 	getpartysize
 	compare VAR_RESULT, 6
 	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
@@ -62,19 +62,19 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
 	message Route119_WeatherInstitute_2F_Text_19F267
 	waitfanfare
 	waitmessage
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
 	setflag FLAG_RECEIVED_CASTFORM
-	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
+	msgbox Route119_WeatherInstitute_2F_Text_19F27D, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4
-	msgbox Route119_WeatherInstitute_2F_Text_19F231, 4
+	msgbox Route119_WeatherInstitute_2F_Text_19F231, MSGBOX_DEFAULT
 	release
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
-	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4
+	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -82,7 +82,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
 	lock
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index a625d926b..bc3473476 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -500,7 +500,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1A0539",
+      "script": "Route120_EventScript_Kecleon1",
       "flag": "FLAG_HIDE_KECLEON_ROUTE120_3"
     },
     {
@@ -513,7 +513,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1A0546",
+      "script": "Route120_EventScript_Kecleon2",
       "flag": "FLAG_HIDE_KECLEON_ROUTE120_4"
     },
     {
@@ -526,7 +526,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1A0553",
+      "script": "Route120_EventScript_Kecleon3",
       "flag": "FLAG_HIDE_KECLEON_ROUTE120_5"
     },
     {
@@ -539,7 +539,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1A056D",
+      "script": "Route120_EventScript_Kecleon5",
       "flag": "FLAG_HIDE_KECLEON_ROUTE120_7"
     },
     {
@@ -552,7 +552,7 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_1A0560",
+      "script": "Route120_EventScript_Kecleon4",
       "flag": "FLAG_HIDE_KECLEON_ROUTE120_6"
     }
   ],
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 4c7aefdea..47bcc35d6 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -1,7 +1,7 @@
 Route120_MapScripts:: @ 815160E
-	map_script 5, Route120_MapScript1_15161E
-	map_script 3, Route120_MapScript1_1516DF
-	map_script 1, Route120_MapScript1_151686
+	map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_15161E
+	map_script MAP_SCRIPT_ON_TRANSITION, Route120_MapScript1_1516DF
+	map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_151686
 	.byte 0
 
 Route120_MapScript1_15161E:: @ 815161E
@@ -108,7 +108,7 @@ Route120_EventScript_151735:: @ 8151735
 Route120_EventScript_151739:: @ 8151739
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837
 	msgbox Route120_Text_1C58F1, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -155,25 +155,25 @@ Route120_EventScript_151808:: @ 8151808
 	end
 
 Route120_EventScript_151813:: @ 8151813
-	giveitem_std VAR_0x8004
+	giveitem VAR_0x8004
 	compare VAR_RESULT, 0
-	goto_if_eq Route120_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
-	msgbox Route120_Text_1C5A0B, 4
+	msgbox Route120_Text_1C5A0B, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_151837:: @ 8151837
-	msgbox Route120_Text_1C5A4D, 4
+	msgbox Route120_Text_1C5A4D, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_151841:: @ 8151841
-	msgbox Route120_Text_1C5979, 4
+	msgbox Route120_Text_1C5979, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_15184A:: @ 815184A
-	msgbox Route120_Text_1C59B5, 4
+	msgbox Route120_Text_1C59B5, MSGBOX_DEFAULT
 	return
 
 Route120_EventScript_151853:: @ 8151853
@@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853
 	end
 
 Route120_EventScript_151877:: @ 8151877
-	msgbox Route120_Text_17193D, 4
+	msgbox Route120_Text_17193D, MSGBOX_DEFAULT
 	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
 	release
 	end
@@ -200,20 +200,20 @@ Route120_EventScript_151884:: @ 8151884
 	end
 
 Route120_EventScript_15189D:: @ 815189D
-	msgbox Route120_Text_1719A0, 4
+	msgbox Route120_Text_1719A0, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	call_if_eq Route120_EventScript_15197F
 	compare VAR_FACING, 3
 	call_if_eq Route120_EventScript_15198A
-	applymovement 31, Route120_Movement_1A083F
+	applymovement 31, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route120_Text_1719D4, 4
+	msgbox Route120_Text_1719D4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, Route120_Movement_1A0843
+	applymovement 30, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement 30, Route120_Movement_1A0662
+	applymovement 30, Movement_KecleonAppears
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KECLEON, 2
@@ -228,15 +228,15 @@ Route120_EventScript_15189D:: @ 815189D
 	end
 
 Route120_EventScript_151908:: @ 8151908
-	applymovement 31, Route120_Movement_1A0845
-	applymovement 255, Route120_Movement_1A0841
+	applymovement 31, Common_Movement_WalkInPlaceFastestDown
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route120_Text_171A40, 4
-	giveitem_std ITEM_DEVON_SCOPE
+	msgbox Route120_Text_171A40, MSGBOX_DEFAULT
+	giveitem ITEM_DEVON_SCOPE
 	setflag FLAG_RECEIVED_DEVON_SCOPE
-	msgbox Route120_Text_171B0E, 4
+	msgbox Route120_Text_171B0E, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, Route120_Movement_1A0845
+	applymovement 31, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
@@ -253,99 +253,99 @@ Route120_EventScript_151908:: @ 8151908
 	end
 
 Route120_EventScript_15197F:: @ 815197F
-	applymovement 255, Route120_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 Route120_EventScript_15198A:: @ 815198A
-	applymovement 255, Route120_Movement_151995
+	applymovement OBJ_EVENT_ID_PLAYER, Route120_Movement_151995
 	waitmovement 0
 	return
 
 Route120_Movement_151995:: @ 8151995
 	walk_down
 	walk_left
-	end_movement
+	step_end
 
 Route120_EventScript_151998:: @ 8151998
-	msgbox Route120_Text_171B93, 2
+	msgbox Text_SomethingUnseeable, MSGBOX_NPC
 	end
 
 Route120_EventScript_1519A1:: @ 81519A1
-	msgbox Route120_Text_171C5E, 3
+	msgbox Route120_Text_171C5E, MSGBOX_SIGN
 	end
 
 Route120_EventScript_1519AA:: @ 81519AA
-	msgbox Route120_Text_171C77, 3
+	msgbox Route120_Text_171C77, MSGBOX_SIGN
 	end
 
 Route120_EventScript_1519B3:: @ 81519B3
-	trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000
-	msgbox Route120_Text_1BF015, 6
+	trainerbattle_single TRAINER_COLIN, Route120_Text_1BEFC8, Route120_Text_1BF000
+	msgbox Route120_Text_1BF015, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1519CA:: @ 81519CA
-	trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5
+	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_1BF07E, Route120_Text_1BF0A5
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route120_EventScript_1519F1
-	msgbox Route120_Text_1BF0C3, 6
+	msgbox Route120_Text_1BF0C3, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_1519F1:: @ 81519F1
-	trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131
-	msgbox Route120_Text_1BF154, 6
+	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_1BF0FA, Route120_Text_1BF131
+	msgbox Route120_Text_1BF154, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A08:: @ 8151A08
-	trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4
-	msgbox Route120_Text_1BF215, 6
+	trainerbattle_single TRAINER_CARLOS, Route120_Text_1BF193, Route120_Text_1BF1D4
+	msgbox Route120_Text_1BF215, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A1F:: @ 8151A1F
-	trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2
-	msgbox Route120_Text_1BF2EA, 6
+	trainerbattle_single TRAINER_JENNA, Route120_Text_1BF26E, Route120_Text_1BF2D2
+	msgbox Route120_Text_1BF2EA, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A36:: @ 8151A36
-	trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B
+	trainerbattle_single TRAINER_BRANDON_1, Route120_Text_1BF32B, Route120_Text_1BF36B
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route120_EventScript_151A5D
-	msgbox Route120_Text_1BF38D, 6
+	msgbox Route120_Text_1BF38D, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A5D:: @ 8151A5D
-	trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416
-	msgbox Route120_Text_1BF43E, 6
+	trainerbattle_rematch TRAINER_BRANDON_1, Route120_Text_1BF3D0, Route120_Text_1BF416
+	msgbox Route120_Text_1BF43E, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A74:: @ 8151A74
-	trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504
-	msgbox Route120_Text_1BF51F, 6
+	trainerbattle_single TRAINER_JENNIFER, Route120_Text_1BF4A0, Route120_Text_1BF504
+	msgbox Route120_Text_1BF51F, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151A8B:: @ 8151A8B
-	trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6
-	msgbox Route120_Text_1BF5F4, 6
+	trainerbattle_single TRAINER_CHIP, Route120_Text_1BF560, Route120_Text_1BF5D6
+	msgbox Route120_Text_1BF5F4, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151AA2:: @ 8151AA2
-	trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4
-	msgbox Route120_Text_1BF6D0, 6
+	trainerbattle_single TRAINER_CLARISSA, Route120_Text_1BF65B, Route120_Text_1BF6A4
+	msgbox Route120_Text_1BF6D0, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151AB9:: @ 8151AB9
-	trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C
-	msgbox Route120_Text_1BF7B2, 6
+	trainerbattle_single TRAINER_ANGELICA, Route120_Text_1BF728, Route120_Text_1BF78C
+	msgbox Route120_Text_1BF7B2, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151AD0:: @ 8151AD0
-	trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852
-	msgbox Route120_Text_1BF891, 6
+	trainerbattle_single TRAINER_KEIGO, Route120_Text_1BF80B, Route120_Text_1BF852
+	msgbox Route120_Text_1BF891, MSGBOX_AUTOCLOSE
 	end
 
 Route120_EventScript_151AE7:: @ 8151AE7
-	trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920
-	msgbox Route120_Text_1BF946, 6
+	trainerbattle_single TRAINER_TSUNAO, Route120_Text_1BF8C5, Route120_Text_1BF920
+	msgbox Route120_Text_1BF946, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route120/text.inc b/data/maps/Route120/text.inc
index dbe89d8b4..85567cacd 100644
--- a/data/maps/Route120/text.inc
+++ b/data/maps/Route120/text.inc
@@ -46,15 +46,14 @@ Route120_Text_171B0E:: @ 8171B0E
 	.string "I think you're doing great.\p"
 	.string "Well, let's meet again somewhere.$"
 
-Route119_Text_171B93:: @ 8171B93
-Route120_Text_171B93:: @ 8171B93
+Text_SomethingUnseeable:: @ 8171B93
 	.string "Something unseeable is in the way.$"
 
-Route119_Text_171BB6:: @ 8171BB6
+Text_WantToUseDevonScope:: @ 8171BB6
 	.string "Something unseeable is in the way.\p"
 	.string "Want to use the DEVON SCOPE?$"
 
-Route119_Text_171BF6:: @ 8171BF6
+Text_UseDevonScopeMonAttacked:: @ 8171BF6
 	.string "{PLAYER} used the DEVON SCOPE.\p"
 	.string "An invisible POKéMON became completely\n"
 	.string "visible!\p"
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index b6a0abe09..d95581a3d 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -1,26 +1,26 @@
 Route121_MapScripts:: @ 8151AFE
-	map_script 3, Route121_MapScript1_151B04
+	map_script MAP_SCRIPT_ON_TRANSITION, Route121_MapScript1_151B04
 	.byte 0
 
 Route121_MapScript1_151B04:: @ 8151B04
-	call Route121_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 Route121_EventScript_151B0A:: @ 8151B0A
-	msgbox Route121_Text_171CB4, 2
+	msgbox Route121_Text_171CB4, MSGBOX_NPC
 	end
 
 Route121_EventScript_151B13:: @ 8151B13
-	msgbox Route121_Text_171D0C, 3
+	msgbox Route121_Text_171D0C, MSGBOX_SIGN
 	end
 
 Route121_EventScript_151B1C:: @ 8151B1C
-	msgbox Route121_Text_171D5B, 3
+	msgbox Route121_Text_171D5B, MSGBOX_SIGN
 	end
 
 Route121_EventScript_151B25:: @ 8151B25
 	lockall
-	msgbox Route121_Text_171C8F, 4
+	msgbox Route121_Text_171C8F, MSGBOX_DEFAULT
 	closemessage
 	applymovement 12, Route121_Movement_151B57
 	applymovement 13, Route121_Movement_151B60
@@ -42,7 +42,7 @@ Route121_Movement_151B57:: @ 8151B57
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route121_Movement_151B60:: @ 8151B60
 	walk_down
@@ -53,7 +53,7 @@ Route121_Movement_151B60:: @ 8151B60
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route121_Movement_151B69:: @ 8151B69
 	walk_down
@@ -64,50 +64,50 @@ Route121_Movement_151B69:: @ 8151B69
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route121_EventScript_151B72:: @ 8151B72
-	trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1
-	msgbox Route121_Text_1BF9BA, 6
+	trainerbattle_single TRAINER_VANESSA, Route121_Text_1BF96E, Route121_Text_1BF9A1
+	msgbox Route121_Text_1BF9BA, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151B89:: @ 8151B89
-	trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C
+	trainerbattle_single TRAINER_WALTER_1, Route121_Text_1BFA1B, Route121_Text_1BFA8C
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route121_EventScript_151BB0
-	msgbox Route121_Text_1BFA9D, 6
+	msgbox Route121_Text_1BFA9D, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151BB0:: @ 8151BB0
-	trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B
-	msgbox Route121_Text_1BFB5C, 6
+	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_1BFADA, Route121_Text_1BFB4B
+	msgbox Route121_Text_1BFB5C, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151BC7:: @ 8151BC7
-	trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE
-	msgbox Route121_Text_1BFBFD, 6
+	trainerbattle_single TRAINER_TAMMY, Route121_Text_1BFBB4, Route121_Text_1BFBEE
+	msgbox Route121_Text_1BFBFD, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151BDE:: @ 8151BDE
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08
-	msgbox Route121_Text_1BFCB3, 6
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08
+	msgbox Route121_Text_1BFCB3, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151BF9:: @ 8151BF9
-	trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D
-	msgbox Route121_Text_1BFDC1, 6
+	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D
+	msgbox Route121_Text_1BFDC1, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151C14:: @ 8151C14
-	trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80
+	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_1BFE51, Route121_Text_1BFE80
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route121_EventScript_151C3B
-	msgbox Route121_Text_1BFEAE, 6
+	msgbox Route121_Text_1BFEAE, MSGBOX_AUTOCLOSE
 	end
 
 Route121_EventScript_151C3B:: @ 8151C3B
-	trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A
-	msgbox Route121_Text_1BFF3A, 6
+	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_1BFEDE, Route121_Text_1BFF0A
+	msgbox Route121_Text_1BFF3A, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 75f134e7e..6fa9c8d81 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -1,5 +1,5 @@
 Route121_SafariZoneEntrance_MapScripts:: @ 815C323
-	map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_MapScript2_15C329
 	.byte 0
 
 Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
@@ -8,7 +8,7 @@ Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
 
 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
 	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C348
+	applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C348
 	waitmovement 0
 	special ExitSafariMode
 	setvar VAR_SAFARI_ZONE_STATE, 0
@@ -24,10 +24,10 @@ Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
-	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
+	msgbox Route121_SafariZoneEntrance_Text_1C35D0, MSGBOX_NPC
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
@@ -36,25 +36,25 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
 	msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379
-	msgbox Route121_SafariZoneEntrance_Text_1C373C, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C373C, MSGBOX_DEFAULT
 	release
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379
-	msgbox Route121_SafariZoneEntrance_Text_1C375F, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C375F, MSGBOX_DEFAULT
 	release
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
 	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	showmoneybox 0, 0
 	nop
 	msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3
-	msgbox Route121_SafariZoneEntrance_Text_1C3895, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C3895, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_15C46C
 	end
 
@@ -63,22 +63,22 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450
 	call Route121_SafariZoneEntrance_EventScript_15C425
-	checkmoney 0x1f4, 0
+	checkmoney 500, 0
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
-	takemoney 0x1f4, 0
+	msgbox Route121_SafariZoneEntrance_Text_1C38D9, MSGBOX_DEFAULT
+	removemoney 500, 0
 	updatemoneybox 0, 0
 	nop
-	msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C38F4, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
 	message Route121_SafariZoneEntrance_Text_1C3910
 	waitfanfare
 	waitmessage
-	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C392D, MSGBOX_DEFAULT
 	closemessage
 	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
+	applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C47E
 	waitmovement 0
 	special EnterSafariMode
 	setvar VAR_SAFARI_ZONE_STATE, 2
@@ -93,7 +93,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
 	specialvar VAR_RESULT, CheckFreePokemonStorageSpace
 	compare VAR_RESULT, 1
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
-	msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C39A3, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_15C46C
 	end
 
@@ -101,26 +101,26 @@ Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F
 	return
 
 Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450
-	msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C39C3, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_15C46C
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4
+	msgbox Route121_SafariZoneEntrance_Text_1C38B5, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_15C46C
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
 	closemessage
 	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
+	applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_15C47C
 	waitmovement 0
 	releaseall
 	end
 
 Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
 	walk_right
-	end_movement
+	step_end
 
 Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
 	walk_left
@@ -131,8 +131,8 @@ Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
 	walk_left
 	walk_down
 	delay_16
-	end_movement
+	step_end
 
 Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
-	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
+	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index f3ed72b9b..557d7099a 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -1,5 +1,5 @@
 Route123_MapScripts:: @ 8151C53
-	map_script 3, Route123_MapScript1_151C59
+	map_script MAP_SCRIPT_ON_TRANSITION, Route123_MapScript1_151C59
 	.byte 0
 
 Route123_MapScript1_151C59:: @ 8151C59
@@ -10,16 +10,16 @@ Route123_EventScript_151C5D:: @ 8151C5D
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC
-	msgbox Route123_Text_171D83, 4
+	msgbox Route123_Text_171D83, MSGBOX_DEFAULT
 	special IsGrassTypeInParty
 	compare VAR_RESULT, 0
 	goto_if_eq Route123_EventScript_151CAA
-	msgbox Route123_Text_171DC2, 4
-	giveitem_std ITEM_TM19_GIGA_DRAIN
+	msgbox Route123_Text_171DC2, MSGBOX_DEFAULT
+	giveitem ITEM_TM19_GIGA_DRAIN
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM19
-	msgbox Route123_Text_171E34, 4
+	msgbox Route123_Text_171E34, MSGBOX_DEFAULT
 	release
 	end
 
@@ -28,74 +28,74 @@ Route123_EventScript_151CAA:: @ 8151CAA
 	end
 
 Route123_EventScript_151CAC:: @ 8151CAC
-	msgbox Route123_Text_171E34, 4
+	msgbox Route123_Text_171E34, MSGBOX_DEFAULT
 	release
 	end
 
 Route123_EventScript_151CB6:: @ 8151CB6
-	msgbox Route123_Text_171E76, 3
+	msgbox Route123_Text_171E76, MSGBOX_SIGN
 	end
 
 Route123_EventScript_151CBF:: @ 8151CBF
-	msgbox Route123_Text_171E8E, 3
+	msgbox Route123_Text_171E8E, MSGBOX_SIGN
 	end
 
 Route123_EventScript_151CC8:: @ 8151CC8
-	msgbox Route123_Text_171EBC, 3
+	msgbox Route123_Text_171EBC, MSGBOX_SIGN
 	end
 
 Route123_EventScript_151CD1:: @ 8151CD1
-	trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2
-	msgbox Route123_Text_1BFFC1, 6
+	trainerbattle_single TRAINER_WENDY, Route123_Text_1BFF6A, Route123_Text_1BFFA2
+	msgbox Route123_Text_1BFFC1, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151CE8:: @ 8151CE8
-	trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057
-	msgbox Route123_Text_1C0075, 6
+	trainerbattle_single TRAINER_CLYDE, Route123_Text_1BFFF0, Route123_Text_1C0057
+	msgbox Route123_Text_1C0075, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151CFF:: @ 8151CFF
-	trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4
-	msgbox Route123_Text_1C0100, 6
+	trainerbattle_single TRAINER_VIOLET, Route123_Text_1C009E, Route123_Text_1C00D4
+	msgbox Route123_Text_1C0100, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151D16:: @ 8151D16
-	trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3
+	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_1C013F, Route123_Text_1C01A3
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route123_EventScript_151D3D
-	msgbox Route123_Text_1C01B1, 6
+	msgbox Route123_Text_1C01B1, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151D3D:: @ 8151D3D
-	trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240
-	msgbox Route123_Text_1C024E, 6
+	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_1C01F9, Route123_Text_1C0240
+	msgbox Route123_Text_1C024E, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151D54:: @ 8151D54
-	trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303
+	trainerbattle_single TRAINER_JACKI_1, Route123_Text_1C028C, Route123_Text_1C0303
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route123_EventScript_151D7B
-	msgbox Route123_Text_1C030F, 6
+	msgbox Route123_Text_1C030F, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151D7B:: @ 8151D7B
-	trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380
-	msgbox Route123_Text_1C038C, 6
+	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_1C0351, Route123_Text_1C0380
+	msgbox Route123_Text_1C038C, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151D92:: @ 8151D92
-	trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462
-	msgbox Route123_Text_1C0423, 6
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462
+	msgbox Route123_Text_1C0423, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151DAD:: @ 8151DAD
-	trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519
-	msgbox Route123_Text_1C04E3, 6
+	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519
+	msgbox Route123_Text_1C04E3, MSGBOX_AUTOCLOSE
 	end
 
 Route123_EventScript_151DC8:: @ 8151DC8
-	trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F
-	msgbox Route123_Text_1C05BC, 6
+	trainerbattle_single TRAINER_KINDRA, Route123_Text_1C0554, Route123_Text_1C059F
+	msgbox Route123_Text_1C05BC, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index d81cf9aee..fc96eda9e 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route123_BerryMastersHouse_MapScripts:: @ 81639DF
-	map_script 3, Route123_BerryMastersHouse_MapScript1_1639E5
+	map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_MapScript1_1639E5
 	.byte 0
 
 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5
@@ -9,40 +9,40 @@ Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5
 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A
-	msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5BC4, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
 	addvar VAR_RESULT, 133
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER
-	msgbox Route123_BerryMastersHouse_Text_1C5C66, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5C66, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
 	addvar VAR_RESULT, 133
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
-	msgbox Route123_BerryMastersHouse_Text_1C5C83, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox Route123_BerryMastersHouse_Text_1C5C83, MSGBOX_DEFAULT
 	release
 	end
 
 Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A
-	msgbox Route123_BerryMastersHouse_Text_1C5CDC, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5CDC, MSGBOX_DEFAULT
 	release
 	end
 
 Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13
-	msgbox Route123_BerryMastersHouse_Text_1C5D24, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5D24, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 13
-	call Route123_BerryMastersHouse_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 1
@@ -52,8 +52,8 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64
 	end
 
 Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B
-	msgbox Route123_BerryMastersHouse_Text_1C5EC0, 4
-	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5EC0, MSGBOX_DEFAULT
+	msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT
 	release
 	end
 
@@ -73,73 +73,73 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD
 	end
 
 Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5E0E, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, ITEM_CHERI_BERRY
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	release
 	end
 
 Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E
 	goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem_std ITEM_SPELON_BERRY
+	msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT
+	giveitem ITEM_SPELON_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SPELON_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F
 	goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem_std ITEM_PAMTRE_BERRY
+	msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT
+	giveitem ITEM_PAMTRE_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_PAMTRE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80
 	goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem_std ITEM_WATMEL_BERRY
+	msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT
+	giveitem ITEM_WATMEL_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_WATMEL_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1
 	goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem_std ITEM_DURIN_BERRY
+	msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT
+	giveitem ITEM_DURIN_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_DURIN_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2
 	goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0
-	msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4
-	giveitem_std ITEM_BELUE_BERRY
+	msgbox Route123_BerryMastersHouse_Text_1C5DC1, MSGBOX_DEFAULT
+	giveitem ITEM_BELUE_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_BELUE_BERRY
 	goto Route123_BerryMastersHouse_EventScript_163C1D
 	end
 
 Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13
-	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT
 	release
 	end
 
 Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D
 	setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE
-	msgbox Route123_BerryMastersHouse_Text_1C5E59, 4
+	msgbox Route123_BerryMastersHouse_Text_1C5E59, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 8232dee34..cd713ce88 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -1,70 +1,70 @@
 Route124_MapScripts:: @ 8151DDF
-	map_script 3, Route124_MapScript1_151DE5
+	map_script MAP_SCRIPT_ON_TRANSITION, Route124_MapScript1_151DE5
 	.byte 0
 
 Route124_MapScript1_151DE5:: @ 8151DE5
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 Route124_EventScript_151DEF:: @ 8151DEF
-	msgbox Route124_Text_171ED1, 3
+	msgbox Route124_Text_171ED1, MSGBOX_SIGN
 	end
 
 Route124_EventScript_151DF8:: @ 8151DF8
-	trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675
-	msgbox Route124_Text_1C0693, 6
+	trainerbattle_single TRAINER_SPENCER, Route124_Text_1C0624, Route124_Text_1C0675
+	msgbox Route124_Text_1C0693, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E0F:: @ 8151E0F
-	trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741
-	msgbox Route124_Text_1C0750, 6
+	trainerbattle_single TRAINER_ROLAND, Route124_Text_1C06F7, Route124_Text_1C0741
+	msgbox Route124_Text_1C0750, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E26:: @ 8151E26
-	trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9
+	trainerbattle_single TRAINER_JENNY_1, Route124_Text_1C07B4, Route124_Text_1C07F9
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route124_EventScript_151E4D
-	msgbox Route124_Text_1C080E, 6
+	msgbox Route124_Text_1C080E, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E4D:: @ 8151E4D
-	trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8
-	msgbox Route124_Text_1C08EA, 6
+	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_1C0888, Route124_Text_1C08C8
+	msgbox Route124_Text_1C08EA, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E64:: @ 8151E64
-	trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B
-	msgbox Route124_Text_1C0994, 6
+	trainerbattle_single TRAINER_GRACE, Route124_Text_1C0936, Route124_Text_1C096B
+	msgbox Route124_Text_1C0994, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E7B:: @ 8151E7B
-	trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F
-	msgbox Route124_Text_1C0A52, 6
+	trainerbattle_single TRAINER_CHAD, Route124_Text_1C09CE, Route124_Text_1C0A2F
+	msgbox Route124_Text_1C0A52, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151E92:: @ 8151E92
-	trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8
+	trainerbattle_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route124_EventScript_151EBD
-	msgbox Route124_Text_1C0B72, 6
+	msgbox Route124_Text_1C0B72, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151EBD:: @ 8151EBD
-	trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C
-	msgbox Route124_Text_1C0E06, 6
+	trainerbattle_rematch_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C
+	msgbox Route124_Text_1C0E06, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151ED8:: @ 8151ED8
-	trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0
+	trainerbattle_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route124_EventScript_151F03
-	msgbox Route124_Text_1C0C7F, 6
+	msgbox Route124_Text_1C0C7F, MSGBOX_AUTOCLOSE
 	end
 
 Route124_EventScript_151F03:: @ 8151F03
-	trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90
-	msgbox Route124_Text_1C0F19, 6
+	trainerbattle_rematch_double TRAINER_RITA_AND_SAM_1, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90
+	msgbox Route124_Text_1C0F19, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 128b48a25..4ce846b20 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -1,5 +1,5 @@
 Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA
-	map_script 3, Route124_DivingTreasureHuntersHouse_MapScript1_163E00
+	map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_MapScript1_163E00
 	.byte 0
 
 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00
@@ -10,13 +10,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, MSGBOX_DEFAULT
 	setflag FLAG_MET_DIVING_TREASURE_HUNTER
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F48F, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F48F, MSGBOX_DEFAULT
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E
 	end
 
@@ -60,7 +60,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C
 	return
 
 Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F544, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F544, MSGBOX_DEFAULT
 	goto Route124_DivingTreasureHuntersHouse_EventScript_163EB0
 	end
 
@@ -258,9 +258,9 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3
-	takeitem VAR_0x8008, 1
-	giveitem_std VAR_0x8009
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4
+	removeitem VAR_0x8008
+	giveitem VAR_0x8009
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, MSGBOX_DEFAULT
 	call Route124_DivingTreasureHuntersHouse_EventScript_163E44
 	compare VAR_TEMP_1, 0
 	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333
@@ -271,17 +271,17 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_164315:: @ 8164315
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F64E, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F64E, MSGBOX_DEFAULT
 	release
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_16431F:: @ 816431F
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F686, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F686, MSGBOX_DEFAULT
 	release
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_164329:: @ 8164329
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F4D1, 4
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F4D1, MSGBOX_DEFAULT
 	release
 	end
 
@@ -290,5 +290,5 @@ Route124_DivingTreasureHuntersHouse_EventScript_164333:: @ 8164333
 	end
 
 Route124_DivingTreasureHuntersHouse_EventScript_164335:: @ 8164335
-	msgbox Route124_DivingTreasureHuntersHouse_Text_19F6C5, 3
+	msgbox Route124_DivingTreasureHuntersHouse_Text_19F6C5, MSGBOX_SIGN
 	end
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index 3e1febd5d..39bc4527d 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,50 +1,50 @@
 Route125_MapScripts:: @ 8151F1E
-	map_script 3, Route125_MapScript1_151F24
+	map_script MAP_SCRIPT_ON_TRANSITION, Route125_MapScript1_151F24
 	.byte 0
 
 Route125_MapScript1_151F24:: @ 8151F24
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 Route125_EventScript_151F2E:: @ 8151F2E
-	trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002
-	msgbox Route125_Text_1C1013, 6
+	trainerbattle_single TRAINER_CODY, Route125_Text_1C0FCF, Route125_Text_1C1002
+	msgbox Route125_Text_1C1013, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151F45:: @ 8151F45
-	trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073
-	msgbox Route125_Text_1C1083, 6
+	trainerbattle_single TRAINER_STAN, Route125_Text_1C104B, Route125_Text_1C1073
+	msgbox Route125_Text_1C1083, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151F5C:: @ 8151F5C
-	trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB
-	msgbox Route125_Text_1C110C, 6
+	trainerbattle_single TRAINER_TANYA, Route125_Text_1C10C3, Route125_Text_1C10FB
+	msgbox Route125_Text_1C110C, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151F73:: @ 8151F73
-	trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175
-	msgbox Route125_Text_1C117F, 6
+	trainerbattle_single TRAINER_SHARON, Route125_Text_1C1136, Route125_Text_1C1175
+	msgbox Route125_Text_1C117F, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151F8A:: @ 8151F8A
-	trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED
+	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_1C11AF, Route125_Text_1C11ED
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route125_EventScript_151FB1
-	msgbox Route125_Text_1C1208, 6
+	msgbox Route125_Text_1C1208, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151FB1:: @ 8151FB1
-	trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5
-	msgbox Route125_Text_1C12EE, 6
+	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_1C1282, Route125_Text_1C12C5
+	msgbox Route125_Text_1C12EE, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151FC8:: @ 8151FC8
-	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E
-	msgbox Route125_Text_1C141C, 6
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E
+	msgbox Route125_Text_1C141C, MSGBOX_AUTOCLOSE
 	end
 
 Route125_EventScript_151FE3:: @ 8151FE3
-	trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F
-	msgbox Route125_Text_1C1508, 6
+	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F
+	msgbox Route125_Text_1C1508, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 3eb68a1d1..c3c598777 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -1,27 +1,27 @@
 Route126_MapScripts:: @ 8151FFE
-	map_script 3, Route126_MapScript1_152004
+	map_script MAP_SCRIPT_ON_TRANSITION, Route126_MapScript1_152004
 	.byte 0
 
 Route126_MapScript1_152004:: @ 8152004
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 Route126_EventScript_15200E:: @ 815200E
-	trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3
-	msgbox Route126_Text_1C15D8, 6
+	trainerbattle_single TRAINER_BARRY, Route126_Text_1C1590, Route126_Text_1C15C3
+	msgbox Route126_Text_1C15D8, MSGBOX_AUTOCLOSE
 	end
 
 Route126_EventScript_152025:: @ 8152025
-	trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660
-	msgbox Route126_Text_1C166F, 6
+	trainerbattle_single TRAINER_DEAN, Route126_Text_1C1627, Route126_Text_1C1660
+	msgbox Route126_Text_1C166F, MSGBOX_AUTOCLOSE
 	end
 
 Route126_EventScript_15203C:: @ 815203C
-	trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5
-	msgbox Route126_Text_1C1702, 6
+	trainerbattle_single TRAINER_NIKKI, Route126_Text_1C16AB, Route126_Text_1C16C5
+	msgbox Route126_Text_1C1702, MSGBOX_AUTOCLOSE
 	end
 
 Route126_EventScript_152053:: @ 8152053
-	trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766
-	msgbox Route126_Text_1C1773, 6
+	trainerbattle_single TRAINER_BRENDA, Route126_Text_1C1741, Route126_Text_1C1766
+	msgbox Route126_Text_1C1773, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 51ff52501..db0e4cc99 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,42 +1,42 @@
 Route127_MapScripts:: @ 815206A
-	map_script 3, Route127_MapScript1_152070
+	map_script MAP_SCRIPT_ON_TRANSITION, Route127_MapScript1_152070
 	.byte 0
 
 Route127_MapScript1_152070:: @ 8152070
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
 	end
 
 Route127_EventScript_15207A:: @ 815207A
-	trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD
-	msgbox Route127_Text_1C17EC, 6
+	trainerbattle_single TRAINER_CALEB, Route127_Text_1C17A8, Route127_Text_1C17DD
+	msgbox Route127_Text_1C17EC, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_152091:: @ 8152091
-	trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860
-	msgbox Route127_Text_1C1877, 6
+	trainerbattle_single TRAINER_CONNOR, Route127_Text_1C1828, Route127_Text_1C1860
+	msgbox Route127_Text_1C1877, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_1520A8:: @ 81520A8
-	trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930
-	msgbox Route127_Text_1C195D, 6
+	trainerbattle_single TRAINER_JONAH, Route127_Text_1C18CC, Route127_Text_1C1930
+	msgbox Route127_Text_1C195D, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_1520BF:: @ 81520BF
-	trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6
-	msgbox Route127_Text_1C19E7, 6
+	trainerbattle_single TRAINER_HENRY, Route127_Text_1C19A3, Route127_Text_1C19D6
+	msgbox Route127_Text_1C19E7, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_1520D6:: @ 81520D6
-	trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73
-	msgbox Route127_Text_1C1AA0, 6
+	trainerbattle_single TRAINER_ROGER, Route127_Text_1C1A2E, Route127_Text_1C1A73
+	msgbox Route127_Text_1C1AA0, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_1520ED:: @ 81520ED
-	trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A
-	msgbox Route127_Text_1C1B39, 6
+	trainerbattle_single TRAINER_KOJI, Route127_Text_1C1AE2, Route127_Text_1C1B2A
+	msgbox Route127_Text_1C1B39, MSGBOX_AUTOCLOSE
 	end
 
 Route127_EventScript_152104:: @ 8152104
-	trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9
-	msgbox Route127_Text_1C1BEC, 6
+	trainerbattle_single TRAINER_BYRON, Route127_Text_1C1B92, Route127_Text_1C1BD9
+	msgbox Route127_Text_1C1BEC, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 3b3522a6f..add8883cd 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -1,11 +1,11 @@
 Route128_MapScripts:: @ 815211B
-	map_script 3, Route128_MapScript1_152126
-	map_script 2, Route128_MapScript2_152135
+	map_script MAP_SCRIPT_ON_TRANSITION, Route128_MapScript1_152126
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_MapScript2_152135
 	.byte 0
 
 Route128_MapScript1_152126:: @ 8152126
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1
-	call Route128_EventScript_1A0196
+	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetLegendaryWeather
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 Route128_MapScript2_152135:: @ 8152135
@@ -21,28 +21,28 @@ Route128_EventScript_15213F:: @ 815213F
 	.endif
 	applymovement 4, Route128_Movement_152271
 	waitmovement 0
-	msgbox Route128_Text_171EE0, 4
+	msgbox Route128_Text_171EE0, MSGBOX_DEFAULT
 	applymovement 4, Route128_Movement_152279
 	waitmovement 0
-	msgbox Route128_Text_171F35, 4
+	msgbox Route128_Text_171F35, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Route128_Movement_152293
 	waitmovement 0
-	applymovement 4, Route128_Movement_1A0841
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_171F4B, 4
+	msgbox Route128_Text_171F4B, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Route128_Movement_1522A1
 	waitmovement 0
-	applymovement 255, Route128_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox Route128_Text_172008, 4
+	msgbox Route128_Text_172008, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Route128_Movement_15227E
-	applymovement 255, Route128_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 5, Route128_Movement_152290
 	waitmovement 0
-	msgbox Route128_Text_17210B, 4
+	msgbox Route128_Text_17210B, MSGBOX_DEFAULT
 	closemessage
 	delay 40
 	applymovement 5, Route128_Movement_152296
@@ -57,23 +57,23 @@ Route128_EventScript_15213F:: @ 815213F
 	addobject 3
 	applymovement 3, Route128_Movement_15226F
 	waitmovement 0
-	applymovement 255, Route128_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox Route128_Text_172181, 4
+	msgbox Route128_Text_172181, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Route128_Movement_15226D
-	applymovement 255, Route128_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox Route128_Text_1721A2, 4
+	msgbox Route128_Text_1721A2, MSGBOX_DEFAULT
 	.else
-	msgbox Route128_Text_1722A1, 4
+	msgbox Route128_Text_1722A1, MSGBOX_DEFAULT
 	.endif
-	applymovement 3, Route128_Movement_1A0845
+	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route128_Text_1723BE, 4
+	msgbox Route128_Text_1723BE, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route128_Movement_1A0845
+	applymovement 3, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
@@ -87,7 +87,7 @@ Route128_EventScript_15213F:: @ 815213F
 
 @ 815225E
 	walk_fast_left
-	end_movement
+	step_end
 
 @ 8152260
 	walk_left
@@ -102,15 +102,15 @@ Route128_EventScript_15213F:: @ 815213F
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 Route128_Movement_15226D:: @ 815226D
 	walk_up
-	end_movement
+	step_end
 
 Route128_Movement_15226F:: @ 815226F
 	walk_fast_left
-	end_movement
+	step_end
 
 Route128_Movement_152271:: @ 8152271
 	walk_fast_down
@@ -120,21 +120,21 @@ Route128_Movement_152271:: @ 8152271
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route128_Movement_152279:: @ 8152279
 	lock_facing_direction
 	walk_slow_up
 	delay_16
 	unlock_facing_direction
-	end_movement
+	step_end
 
 Route128_Movement_15227E:: @ 815227E
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 Route128_Movement_152283:: @ 8152283
 	delay_16
@@ -149,17 +149,17 @@ Route128_Movement_152283:: @ 8152283
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route128_Movement_152290:: @ 8152290
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 Route128_Movement_152293:: @ 8152293
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route128_Movement_152296:: @ 8152296
 	walk_fast_left
@@ -172,50 +172,50 @@ Route128_Movement_152296:: @ 8152296
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 Route128_Movement_1522A1:: @ 81522A1
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 Route128_EventScript_1522A4:: @ 81522A4
-	trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95
+	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_1C1C67, Route128_Text_1C1C95
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route128_EventScript_1522CB
-	msgbox Route128_Text_1C1CC3, 6
+	msgbox Route128_Text_1C1CC3, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_1522CB:: @ 81522CB
-	trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45
-	msgbox Route128_Text_1C1D6B, 6
+	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_1C1D02, Route128_Text_1C1D45
+	msgbox Route128_Text_1C1D6B, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_1522E2:: @ 81522E2
-	trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25
+	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_1C1DB0, Route128_Text_1C1E25
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq Route128_EventScript_152309
-	msgbox Route128_Text_1C1E4A, 6
+	msgbox Route128_Text_1C1E4A, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_152309:: @ 8152309
-	trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA
-	msgbox Route128_Text_1C1F2E, 6
+	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_1C1E90, Route128_Text_1C1EFA
+	msgbox Route128_Text_1C1F2E, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_152320:: @ 8152320
-	trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC
-	msgbox Route128_Text_1C1FE8, 6
+	trainerbattle_single TRAINER_ALEXA, Route128_Text_1C1F6D, Route128_Text_1C1FCC
+	msgbox Route128_Text_1C1FE8, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_152337:: @ 8152337
-	trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051
-	msgbox Route128_Text_1C2060, 6
+	trainerbattle_single TRAINER_RUBEN, Route128_Text_1C202C, Route128_Text_1C2051
+	msgbox Route128_Text_1C2060, MSGBOX_AUTOCLOSE
 	end
 
 Route128_EventScript_15234E:: @ 815234E
-	trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC
-	msgbox Route128_Text_1C210D, 6
+	trainerbattle_single TRAINER_WAYNE, Route128_Text_1C2090, Route128_Text_1C20FC
+	msgbox Route128_Text_1C210D, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index 360c67e02..8219d01c9 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365
 	.byte 0
 
 Route129_EventScript_152366:: @ 8152366
-	trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198
-	msgbox Route129_Text_1C21B4, 6
+	trainerbattle_single TRAINER_CHASE, Route129_Text_1C2161, Route129_Text_1C2198
+	msgbox Route129_Text_1C21B4, MSGBOX_AUTOCLOSE
 	end
 
 Route129_EventScript_15237D:: @ 815237D
-	trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F
-	msgbox Route129_Text_1C2243, 6
+	trainerbattle_single TRAINER_ALLISON, Route129_Text_1C21ED, Route129_Text_1C222F
+	msgbox Route129_Text_1C2243, MSGBOX_AUTOCLOSE
 	end
 
 Route129_EventScript_152394:: @ 8152394
-	trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC
-	msgbox Route129_Text_1C230F, 6
+	trainerbattle_single TRAINER_REED, Route129_Text_1C22C8, Route129_Text_1C22EC
+	msgbox Route129_Text_1C230F, MSGBOX_AUTOCLOSE
 	end
 
 Route129_EventScript_1523AB:: @ 81523AB
-	trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378
-	msgbox Route129_Text_1C23A3, 6
+	trainerbattle_single TRAINER_TISHA, Route129_Text_1C2349, Route129_Text_1C2378
+	msgbox Route129_Text_1C23A3, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index a1e7b27d4..a1eb2dd53 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -1,5 +1,5 @@
 Route130_MapScripts:: @ 81523C2
-	map_script 3, Route130_MapScript1_1523C8
+	map_script MAP_SCRIPT_ON_TRANSITION, Route130_MapScript1_1523C8
 	.byte 0
 
 Route130_MapScript1_1523C8:: @ 81523C8
@@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C
 	end
 
 Route130_EventScript_152410:: @ 8152410
-	trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D
-	msgbox Route130_Text_1C2479, 6
+	trainerbattle_single TRAINER_RODNEY, Route130_Text_1C2401, Route130_Text_1C245D
+	msgbox Route130_Text_1C2479, MSGBOX_AUTOCLOSE
 	end
 
 Route130_EventScript_152427:: @ 8152427
-	trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525
-	msgbox Route130_Text_1C256E, 6
+	trainerbattle_single TRAINER_KATIE, Route130_Text_1C24DC, Route130_Text_1C2525
+	msgbox Route130_Text_1C256E, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index 6aa6868f3..fb69bece5 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -1,5 +1,5 @@
 Route131_MapScripts:: @ 815243E
-	map_script 3, Route131_MapScript1_152444
+	map_script MAP_SCRIPT_ON_TRANSITION, Route131_MapScript1_152444
 	.byte 0
 
 Route131_MapScript1_152444:: @ 8152444
@@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E
 	return
 
 Route131_EventScript_152452:: @ 8152452
-	trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8
-	msgbox Route131_Text_1C262A, 6
+	trainerbattle_single TRAINER_RICHARD, Route131_Text_1C25B3, Route131_Text_1C25F8
+	msgbox Route131_Text_1C262A, MSGBOX_AUTOCLOSE
 	end
 
 Route131_EventScript_152469:: @ 8152469
-	trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F
-	msgbox Route131_Text_1C2726, 6
+	trainerbattle_single TRAINER_HERMAN, Route131_Text_1C26B9, Route131_Text_1C271F
+	msgbox Route131_Text_1C2726, MSGBOX_AUTOCLOSE
 	end
 
 Route131_EventScript_152480:: @ 8152480
-	trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4
-	msgbox Route131_Text_1C27CF, 6
+	trainerbattle_single TRAINER_SUSIE, Route131_Text_1C2774, Route131_Text_1C27A4
+	msgbox Route131_Text_1C27CF, MSGBOX_AUTOCLOSE
 	end
 
 Route131_EventScript_152497:: @ 8152497
-	trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883
-	msgbox Route131_Text_1C2898, 6
+	trainerbattle_single TRAINER_KARA, Route131_Text_1C284A, Route131_Text_1C2883
+	msgbox Route131_Text_1C2898, MSGBOX_AUTOCLOSE
 	end
 
 Route131_EventScript_1524AE:: @ 81524AE
-	trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2
-	msgbox Route131_Text_1C2950, 6
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2
+	msgbox Route131_Text_1C2950, MSGBOX_AUTOCLOSE
 	end
 
 Route131_EventScript_1524C9:: @ 81524C9
-	trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA
-	msgbox Route131_Text_1C2A5D, 6
+	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA
+	msgbox Route131_Text_1C2A5D, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index 6d964aacf..1db90a49b 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4
 	.byte 0
 
 Route132_EventScript_1524E5:: @ 81524E5
-	trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B
-	msgbox Route132_Text_1C2B71, 6
+	trainerbattle_single TRAINER_GILBERT, Route132_Text_1C2AFB, Route132_Text_1C2B5B
+	msgbox Route132_Text_1C2B71, MSGBOX_AUTOCLOSE
 	end
 
 Route132_EventScript_1524FC:: @ 81524FC
-	trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA
-	msgbox Route132_Text_1C2BFA, 6
+	trainerbattle_single TRAINER_DANA, Route132_Text_1C2BB5, Route132_Text_1C2BEA
+	msgbox Route132_Text_1C2BFA, MSGBOX_AUTOCLOSE
 	end
 
 Route132_EventScript_152513:: @ 8152513
-	trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60
-	msgbox Route132_Text_1C2C78, 6
+	trainerbattle_single TRAINER_RONALD, Route132_Text_1C2C32, Route132_Text_1C2C60
+	msgbox Route132_Text_1C2C78, MSGBOX_AUTOCLOSE
 	end
 
 Route132_EventScript_15252A:: @ 815252A
-	trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F
-	msgbox Route132_Text_1C2D3E, 6
+	trainerbattle_single TRAINER_KIYO, Route132_Text_1C2CD9, Route132_Text_1C2D1F
+	msgbox Route132_Text_1C2D3E, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc
index 213be5562..a8ee44abc 100644
--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541
 	.byte 0
 
 Route133_EventScript_152542:: @ 8152542
-	trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4
-	msgbox Route133_Text_1C2E09, 6
+	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_1C2DA5, Route133_Text_1C2DF4
+	msgbox Route133_Text_1C2E09, MSGBOX_AUTOCLOSE
 	end
 
 Route133_EventScript_152559:: @ 8152559
-	trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD
-	msgbox Route133_Text_1C2ECD, 6
+	trainerbattle_single TRAINER_DEBRA, Route133_Text_1C2E61, Route133_Text_1C2EBD
+	msgbox Route133_Text_1C2ECD, MSGBOX_AUTOCLOSE
 	end
 
 Route133_EventScript_152570:: @ 8152570
-	trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19
-	msgbox Route133_Text_1C2F25, 6
+	trainerbattle_single TRAINER_LINDA, Route133_Text_1C2EF7, Route133_Text_1C2F19
+	msgbox Route133_Text_1C2F25, MSGBOX_AUTOCLOSE
 	end
 
 Route133_EventScript_152587:: @ 8152587
-	trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3
-	msgbox Route133_Text_1C2FC7, 6
+	trainerbattle_single TRAINER_WARREN, Route133_Text_1C2F53, Route133_Text_1C2FA3
+	msgbox Route133_Text_1C2FC7, MSGBOX_AUTOCLOSE
 	end
 
 Route133_EventScript_15259E:: @ 815259E
-	trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F
-	msgbox Route133_Text_1C307E, 6
+	trainerbattle_single TRAINER_BECK, Route133_Text_1C302D, Route133_Text_1C305F
+	msgbox Route133_Text_1C307E, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index e5c106899..5a63401c0 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,5 +1,5 @@
 Route134_MapScripts:: @ 81525B5
-	map_script 5, Route134_MapScript1_1525BB
+	map_script MAP_SCRIPT_ON_RESUME, Route134_MapScript1_1525BB
 	.byte 0
 
 Route134_MapScript1_1525BB:: @ 81525BB
@@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB
 	end
 
 Route134_EventScript_1525C4:: @ 81525C4
-	trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110
-	msgbox Route134_Text_1C311A, 6
+	trainerbattle_single TRAINER_JACK, Route134_Text_1C30C6, Route134_Text_1C3110
+	msgbox Route134_Text_1C311A, MSGBOX_AUTOCLOSE
 	end
 
 Route134_EventScript_1525DB:: @ 81525DB
-	trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198
-	msgbox Route134_Text_1C31A0, 6
+	trainerbattle_single TRAINER_LAUREL, Route134_Text_1C315E, Route134_Text_1C3198
+	msgbox Route134_Text_1C31A0, MSGBOX_AUTOCLOSE
 	end
 
 Route134_EventScript_1525F2:: @ 81525F2
-	trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213
-	msgbox Route134_Text_1C3229, 6
+	trainerbattle_single TRAINER_ALEX, Route134_Text_1C31D7, Route134_Text_1C3213
+	msgbox Route134_Text_1C3229, MSGBOX_AUTOCLOSE
 	end
 
 Route134_EventScript_152609:: @ 8152609
-	trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C
-	msgbox Route134_Text_1C336E, 6
+	trainerbattle_single TRAINER_AARON, Route134_Text_1C3319, Route134_Text_1C335C
+	msgbox Route134_Text_1C336E, MSGBOX_AUTOCLOSE
 	end
 
 Route134_EventScript_152620:: @ 8152620
-	trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E
-	msgbox Route134_Text_1C32D6, 6
+	trainerbattle_single TRAINER_HITOSHI, Route134_Text_1C3262, Route134_Text_1C329E
+	msgbox Route134_Text_1C32D6, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RustboroCity/map.json b/data/maps/RustboroCity/map.json
index b88313e14..c186a4149 100644
--- a/data/maps/RustboroCity/map.json
+++ b/data/maps/RustboroCity/map.json
@@ -438,7 +438,7 @@
       "y": 45,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -446,7 +446,7 @@
       "y": 38,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -462,7 +462,7 @@
       "y": 45,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -470,7 +470,7 @@
       "y": 38,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "RustboroCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 710b8c700..a2c231fde 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -1,47 +1,47 @@
 RustboroCity_MapScripts:: @ 814C372
-	map_script 3, RustboroCity_MapScript1_14C378
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_MapScript1_14C378
 	.byte 0
 
 RustboroCity_MapScript1_14C378:: @ 814C378
 	setflag FLAG_VISITED_RUSTBORO_CITY
-	call RustboroCity_EventScript_1A0196
-	call RustboroCity_EventScript_1A014E
+	call Common_EventScript_SetupEvilTeamGfxIds
+	call Common_EventScript_SetupRivalGfxId
 	end
 
 RustboroCity_EventScript_14C386:: @ 814C386
 	lock
 	faceplayer
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B
-	msgbox RustboroCity_Text_16689D, 4
+	msgbox RustboroCity_Text_16689D, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C39B:: @ 814C39B
-	msgbox RustboroCity_Text_16690C, 4
+	msgbox RustboroCity_Text_16690C, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C3A5:: @ 814C3A5
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_166A67, 4
+	msgbox RustboroCity_Text_166A67, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C3B1:: @ 814C3B1
-	msgbox RustboroCity_Text_166AE0, 2
+	msgbox RustboroCity_Text_166AE0, MSGBOX_NPC
 	end
 
 RustboroCity_EventScript_14C3BA:: @ 814C3BA
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF
-	msgbox RustboroCity_Text_16696D, 4
+	msgbox RustboroCity_Text_16696D, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C3CF:: @ 814C3CF
-	msgbox RustboroCity_Text_1669FE, 4
+	msgbox RustboroCity_Text_1669FE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -49,56 +49,56 @@ RustboroCity_EventScript_14C3D9:: @ 814C3D9
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE
-	msgbox RustboroCity_Text_166B86, 4
+	msgbox RustboroCity_Text_166B86, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C3EE:: @ 814C3EE
-	msgbox RustboroCity_Text_166BEF, 4
+	msgbox RustboroCity_Text_166BEF, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C3F8:: @ 814C3F8
-	msgbox RustboroCity_Text_166C98, 2
+	msgbox RustboroCity_Text_166C98, MSGBOX_NPC
 	end
 
 RustboroCity_EventScript_14C401:: @ 814C401
-	msgbox RustboroCity_Text_166CFA, 3
+	msgbox RustboroCity_Text_166CFA, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C40A:: @ 814C40A
-	msgbox RustboroCity_Text_167374, 3
+	msgbox RustboroCity_Text_167374, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C413:: @ 814C413
-	msgbox RustboroCity_Text_1673FA, 3
+	msgbox RustboroCity_Text_1673FA, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C41C:: @ 814C41C
-	msgbox RustboroCity_Text_167439, 3
+	msgbox RustboroCity_Text_167439, MSGBOX_SIGN
 	end
 
 @ 814C425
-	msgbox RustboroCity_Text_167485, 3
+	msgbox RustboroCity_Text_167485, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C42E:: @ 814C42E
-	msgbox RustboroCity_Text_1674DD, 3
+	msgbox RustboroCity_Text_1674DD, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C437:: @ 814C437
-	msgbox RustboroCity_Text_167525, 3
+	msgbox RustboroCity_Text_167525, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C440:: @ 814C440
-	msgbox RustboroCity_Text_167568, 3
+	msgbox RustboroCity_Text_167568, MSGBOX_SIGN
 	end
 
 RustboroCity_EventScript_14C449:: @ 814C449
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_166D59, 4
-	applymovement 7, RustboroCity_Movement_1A083D
+	msgbox RustboroCity_Text_166D59, MSGBOX_DEFAULT
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -106,8 +106,8 @@ RustboroCity_EventScript_14C449:: @ 814C449
 RustboroCity_EventScript_14C45F:: @ 814C45F
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_166DB0, 4
-	applymovement 8, RustboroCity_Movement_1A083D
+	msgbox RustboroCity_Text_166DB0, MSGBOX_DEFAULT
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -115,7 +115,7 @@ RustboroCity_EventScript_14C45F:: @ 814C45F
 RustboroCity_EventScript_14C475:: @ 814C475
 	lock
 	faceplayer
-	msgbox RustboroCity_Text_166DEE, 4
+	msgbox RustboroCity_Text_166DEE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -160,7 +160,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD
 	end
 
 RustboroCity_EventScript_14C4F4:: @ 814C4F4
-	msgbox RustboroCity_Text_166E65, 4
+	msgbox RustboroCity_Text_166E65, MSGBOX_DEFAULT
 	closemessage
 	addobject 10
 	addobject 9
@@ -169,7 +169,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	removeobject 10
 	applymovement 9, RustboroCity_Movement_14C5D3
 	waitmovement 0
-	msgbox RustboroCity_Text_166E7E, 4
+	msgbox RustboroCity_Text_166E7E, MSGBOX_DEFAULT
 	closemessage
 	applymovement 9, RustboroCity_Movement_14C5DB
 	waitmovement 0
@@ -189,11 +189,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	end
 
 @ 814C55D
-	msgbox RustboroCity_Text_166F6B, 4
+	msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT
 	return
 
 @ 814C566
-	msgbox RustboroCity_Text_166FB4, 4
+	msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT
 	return
 
 @ 814C56F
@@ -219,7 +219,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 @ 814C59B
 	applymovement 9, RustboroCity_Movement_14C5F7
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
@@ -241,7 +241,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5C2:: @ 814C5C2
 	walk_fastest_right
@@ -260,7 +260,7 @@ RustboroCity_Movement_14C5C2:: @ 814C5C2
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5D3:: @ 814C5D3
 	walk_right
@@ -270,7 +270,7 @@ RustboroCity_Movement_14C5D3:: @ 814C5D3
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5DB:: @ 814C5DB
 	walk_up
@@ -280,27 +280,27 @@ RustboroCity_Movement_14C5DB:: @ 814C5DB
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5E3:: @ 814C5E3
 	walk_down
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5E7:: @ 814C5E7
 	walk_down
 	walk_down
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5EC:: @ 814C5EC
 	walk_down
 	walk_down
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5F1:: @ 814C5F1
 	walk_down
@@ -308,7 +308,7 @@ RustboroCity_Movement_14C5F1:: @ 814C5F1
 	walk_down
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_Movement_14C5F7:: @ 814C5F7
 	walk_down
@@ -318,13 +318,13 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 RustboroCity_EventScript_14C5FF:: @ 814C5FF
 	lock
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614
-	msgbox RustboroCity_Text_166F6B, 4
+	msgbox RustboroCity_Text_166F6B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -370,63 +370,63 @@ RustboroCity_EventScript_14C650:: @ 814C650
 	setflag FLAG_UNKNOWN_9F
 	setvar VAR_RUSTBORO_STATE, 3
 	moveobjectoffscreen 9
-	msgbox RustboroCity_Text_166EA5, 4
+	msgbox RustboroCity_Text_166EA5, MSGBOX_DEFAULT
 	releaseall
 	end
 
 RustboroCity_EventScript_14C691:: @ 814C691
-	applymovement 9, RustboroCity_Movement_1A0841
+	applymovement 9, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C6BD:: @ 814C6BD
-	applymovement 9, RustboroCity_Movement_1A083F
+	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C6E9:: @ 814C6E9
-	applymovement 9, RustboroCity_Movement_1A0845
+	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C715:: @ 814C715
-	applymovement 9, RustboroCity_Movement_1A0845
+	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_14C74B
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 RustboroCity_Movement_14C74B:: @ 814C74B
 	walk_down
-	end_movement
+	step_end
 
 RustboroCity_EventScript_14C74D:: @ 814C74D
 	lockall
@@ -463,11 +463,11 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	call_if_eq RustboroCity_EventScript_14C882
 	compare VAR_TEMP_1, 4
 	call_if_eq RustboroCity_EventScript_14C8B8
-	msgbox RustboroCity_Text_166FB4, 4
-	giveitem_std ITEM_GREAT_BALL
+	msgbox RustboroCity_Text_166FB4, MSGBOX_DEFAULT
+	giveitem ITEM_GREAT_BALL
 	compare VAR_RESULT, 0
 	call_if_eq RustboroCity_EventScript_14C7F5
-	msgbox RustboroCity_Text_16707F, 4
+	msgbox RustboroCity_Text_16707F, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_RETURNED_DEVON_GOODS
 	setflag FLAG_HIDE_DEVON_RUSTBORO
@@ -479,66 +479,66 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	end
 
 RustboroCity_EventScript_14C7F5:: @ 814C7F5
-	msgbox RustboroCity_Text_16704C, 4
+	msgbox RustboroCity_Text_16704C, MSGBOX_DEFAULT
 	return
 
 RustboroCity_EventScript_14C7FE:: @ 814C7FE
-	applymovement 9, RustboroCity_Movement_1A0841
+	applymovement 9, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C82A:: @ 814C82A
-	applymovement 9, RustboroCity_Movement_1A0843
+	applymovement 9, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C856:: @ 814C856
-	applymovement 9, RustboroCity_Movement_1A0845
+	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C882:: @ 814C882
-	applymovement 9, RustboroCity_Movement_1A0845
+	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 9, RustboroCity_Movement_14C74B
 	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 RustboroCity_EventScript_14C8B8:: @ 814C8B8
-	applymovement 9, RustboroCity_Movement_1A083F
+	applymovement 9, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
+	applymovement 9, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
+	applymovement 9, Common_Movement_Delay48
 	waitmovement 0
 	return
 
@@ -555,13 +555,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA
 
 RustboroCity_EventScript_14C8FD:: @ 814C8FD
 	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_1670A7, 4
+	msgbox RustboroCity_Text_1670A7, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C90A:: @ 814C90A
 	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_167213, 4
+	msgbox RustboroCity_Text_167213, MSGBOX_DEFAULT
 	release
 	end
 
@@ -574,11 +574,11 @@ RustboroCity_EventScript_14C917:: @ 814C917
 	end
 
 RustboroCity_EventScript_14C92F:: @ 814C92F
-	msgbox RustboroCity_Text_16713C, 4
+	msgbox RustboroCity_Text_16713C, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_EventScript_14C939:: @ 814C939
-	msgbox RustboroCity_Text_1672B8, 4
+	msgbox RustboroCity_Text_1672B8, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index b43e0aafe..21f797dab 100644
--- a/data/maps/RustboroCity_CuttersHouse/scripts.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
@@ -5,18 +5,18 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53
-	msgbox RustboroCity_CuttersHouse_Text_18509C, 4
-	giveitem_std ITEM_HM01_CUT
+	msgbox RustboroCity_CuttersHouse_Text_18509C, MSGBOX_DEFAULT
+	giveitem ITEM_HM01_CUT
 	setflag FLAG_RECEIVED_HM01
-	msgbox RustboroCity_CuttersHouse_Text_1851C9, 4
+	msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_CuttersHouse_EventScript_157D53:: @ 8157D53
-	msgbox RustboroCity_CuttersHouse_Text_1851C9, 4
+	msgbox RustboroCity_CuttersHouse_Text_1851C9, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_CuttersHouse_EventScript_157D5D:: @ 8157D5D
-	msgbox RustboroCity_CuttersHouse_Text_1852B3, 2
+	msgbox RustboroCity_CuttersHouse_Text_1852B3, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 7b56c72a2..36712d5f7 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406
-	map_script 3, RustboroCity_DevonCorp_1F_MapScript1_15740C
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_MapScript1_15740C
 	.byte 0
 
 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C
@@ -16,17 +16,17 @@ RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422
 	faceplayer
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440
-	msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_1829A4, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_157440:: @ 8157440
-	msgbox RustboroCity_DevonCorp_1F_Text_182A19, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_182A19, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A
-	msgbox RustboroCity_DevonCorp_1F_Text_182AB3, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_182AB3, MSGBOX_DEFAULT
 	release
 	end
 
@@ -36,17 +36,17 @@ RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485
-	msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_182AF0, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_15747B:: @ 815747B
-	msgbox RustboroCity_DevonCorp_1F_Text_182B5A, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_182B5A, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485
-	msgbox RustboroCity_DevonCorp_1F_Text_182B2D, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_182B2D, MSGBOX_DEFAULT
 	release
 	end
 
@@ -56,16 +56,16 @@ RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0
-	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_1574B6:: @ 81574B6
-	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_1828EE, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_1574C0:: @ 81574C0
-	msgbox RustboroCity_DevonCorp_1F_Text_18295E, 4
+	msgbox RustboroCity_DevonCorp_1F_Text_18295E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 92c16e002..ae04f9779 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -1,5 +1,5 @@
 RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
-	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_MapScript1_1574D0
 	.byte 0
 
 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
@@ -16,7 +16,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182B81, MSGBOX_DEFAULT
 	release
 	end
 
@@ -26,12 +26,12 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182C25, MSGBOX_DEFAULT
 	release
 	end
 
@@ -41,12 +41,12 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -66,7 +66,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
-	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, MSGBOX_DEFAULT
 	checkitem ITEM_ROOT_FOSSIL, 1
 	compare VAR_RESULT, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
@@ -79,16 +79,16 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
 	closemessage
 	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
 	bufferitemname 0, ITEM_ROOT_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_ROOT_FOSSIL, 1
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT
+	removeitem ITEM_ROOT_FOSSIL
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
 	setvar VAR_WHICH_FOSSIL_REVIVED, 1
 	release
@@ -97,28 +97,28 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
 	closemessage
 	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
 	bufferitemname 0, ITEM_CLAW_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_CLAW_FOSSIL, 1
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, MSGBOX_DEFAULT
+	removeitem ITEM_CLAW_FOSSIL
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
 	setvar VAR_WHICH_FOSSIL_REVIVED, 2
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636
-	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
-	msgbox RustboroCity_DevonCorp_2F_Text_183072, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_183072, MSGBOX_DEFAULT
 	release
 	end
 
@@ -131,7 +131,7 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
 
 RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	bufferspeciesname 1, SPECIES_LILEEP
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT
 	getpartysize
 	compare VAR_RESULT, 6
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
@@ -142,16 +142,16 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
 	waitmessage
-	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	bufferspeciesname 1, SPECIES_ANORITH
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, MSGBOX_DEFAULT
 	getpartysize
 	compare VAR_RESULT, 6
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
@@ -162,14 +162,14 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
 	waitmessage
-	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	call_if_eq Common_EventScript_NameReceivedPartyMon
 	release
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707
-	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4
+	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index e8d2f4d68..0a2cd2117 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -1,7 +1,7 @@
 RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
-	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721
-	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739
-	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_MapScript1_157721
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157739
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_MapScript2_157748
 	.byte 0
 
 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
@@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
 	.2byte 0
 
 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
-	turnobject 255, 4
+	turnobject OBJ_EVENT_ID_PLAYER, 4
 	end
 
 RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
@@ -28,35 +28,35 @@ RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
 
 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	lockall
-	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18374C, MSGBOX_DEFAULT
 	closemessage
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
 	waitmovement 0
 	delay 80
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_183903, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_TSURETEK, FALSE
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
+	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157827
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18394A, MSGBOX_DEFAULT
 	closemessage
 	fadedefaultbgm
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
+	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_DevonCorp_3F_Movement_157835
 	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
-	giveitem_std ITEM_LETTER
-	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18320B, MSGBOX_DEFAULT
+	giveitem ITEM_LETTER
+	msgbox RustboroCity_DevonCorp_3F_Text_18337E, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
 	waitmessage
 	setflag FLAG_SYS_POKENAV_GET
 	setflag FLAG_RECEIVED_POKENAV
-	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_183439, MSGBOX_DEFAULT
 	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
 	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
 	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
@@ -73,7 +73,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	walk_up
 	walk_up
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
 	walk_right
@@ -90,12 +90,12 @@ RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
 	walk_right
 	walk_right
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
 	walk_right
@@ -106,7 +106,7 @@ RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
 	walk_left
@@ -117,7 +117,7 @@ RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
 	walk_right
@@ -133,7 +133,7 @@ RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 	delay_16
@@ -141,37 +141,37 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
 	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18351E, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
-	giveitem_std ITEM_EXP_SHARE
+	msgbox RustboroCity_DevonCorp_3F_Text_18353E, MSGBOX_DEFAULT
+	giveitem ITEM_EXP_SHARE
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_EXP_SHARE
-	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
-	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18368D, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -180,15 +180,15 @@ RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_18395C, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4
+	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF
-	msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3
+	msgbox RustboroCity_DevonCorp_3F_Text_183A04, MSGBOX_SIGN
 	end
diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index dbbdf22b7..b8d4118d4 100644
--- a/data/maps/RustboroCity_Flat1_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
@@ -2,9 +2,9 @@ RustboroCity_Flat1_1F_MapScripts:: @ 8157C5F
 	.byte 0
 
 RustboroCity_Flat1_1F_EventScript_157C60:: @ 8157C60
-	msgbox RustboroCity_Flat1_1F_Text_184DB4, 2
+	msgbox RustboroCity_Flat1_1F_Text_184DB4, MSGBOX_NPC
 	end
 
 RustboroCity_Flat1_1F_EventScript_157C69:: @ 8157C69
-	msgbox RustboroCity_Flat1_1F_Text_184DE9, 2
+	msgbox RustboroCity_Flat1_1F_Text_184DE9, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 53672bb42..ddd48ddf7 100644
--- a/data/maps/RustboroCity_Flat1_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
@@ -2,5 +2,5 @@ RustboroCity_Flat1_2F_MapScripts:: @ 8157C72
 	.byte 0
 
 RustboroCity_Flat1_2F_EventScript_157C73:: @ 8157C73
-	msgbox RustboroCity_Flat1_2F_Text_184E0D, 2
+	msgbox RustboroCity_Flat1_2F_Text_184E0D, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index a6ba54ce7..521d4d803 100644
--- a/data/maps/RustboroCity_Flat2_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
@@ -2,7 +2,7 @@ RustboroCity_Flat2_1F_MapScripts:: @ 8157D79
 	.byte 0
 
 RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A
-	msgbox RustboroCity_Flat2_1F_Text_1853DD, 2
+	msgbox RustboroCity_Flat2_1F_Text_1853DD, MSGBOX_NPC
 	end
 
 RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83
@@ -10,7 +10,7 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox RustboroCity_Flat2_1F_Text_185410, 4
+	msgbox RustboroCity_Flat2_1F_Text_185410, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index c100687a2..223438560 100644
--- a/data/maps/RustboroCity_Flat2_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
@@ -2,22 +2,22 @@ RustboroCity_Flat2_2F_MapScripts:: @ 8157D96
 	.byte 0
 
 RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97
-	msgbox RustboroCity_Flat2_2F_Text_185421, 2
+	msgbox RustboroCity_Flat2_2F_Text_185421, MSGBOX_NPC
 	end
 
 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF
-	msgbox RustboroCity_Flat2_2F_Text_185461, 4
-	giveitem_std ITEM_PREMIER_BALL
+	msgbox RustboroCity_Flat2_2F_Text_185461, MSGBOX_DEFAULT
+	giveitem ITEM_PREMIER_BALL
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO
 	release
 	end
 
 RustboroCity_Flat2_2F_EventScript_157DCF:: @ 8157DCF
-	msgbox RustboroCity_Flat2_2F_Text_1854C4, 4
+	msgbox RustboroCity_Flat2_2F_Text_1854C4, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index d3b05b5bf..fe3949181 100644
--- a/data/maps/RustboroCity_Flat2_3F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
@@ -2,9 +2,9 @@ RustboroCity_Flat2_3F_MapScripts:: @ 8157DD9
 	.byte 0
 
 RustboroCity_Flat2_3F_EventScript_157DDA:: @ 8157DDA
-	msgbox RustboroCity_Flat2_3F_Text_18551D, 2
+	msgbox RustboroCity_Flat2_3F_Text_18551D, MSGBOX_NPC
 	end
 
 RustboroCity_Flat2_3F_EventScript_157DE3:: @ 8157DE3
-	msgbox RustboroCity_Flat2_3F_Text_18554D, 2
+	msgbox RustboroCity_Flat2_3F_Text_18554D, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index f1eb9d171..831613f71 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -2,57 +2,57 @@ RustboroCity_Gym_MapScripts:: @ 81578D8
 	.byte 0
 
 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
-	trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE
+	trainerbattle_single TRAINER_ROXANNE, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C
-	msgbox RustboroCity_Gym_Text_184252, 4
+	msgbox RustboroCity_Gym_Text_184252, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	message RustboroCity_Gym_Text_1840AB
 	waitmessage
-	call RustboroCity_Gym_EventScript_1A02C5
-	msgbox RustboroCity_Gym_Text_1840D5, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox RustboroCity_Gym_Text_1840D5, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_RUSTBORO_GYM
 	setflag FLAG_BADGE01_GET
 	setvar VAR_RUSTBORO_STATE, 1
 	addvar VAR_PETALBURG_GYM_STATE, 1
 	setvar VAR_0x8008, 1
-	call RustboroCity_Gym_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_eq RustboroCity_Gym_EventScript_1A00FB
+	call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
 	goto RustboroCity_Gym_EventScript_15793C
 	end
 
 RustboroCity_Gym_EventScript_15793C:: @ 815793C
-	giveitem_std ITEM_TM39_ROCK_TOMB
+	giveitem ITEM_TM39_ROCK_TOMB
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_Gym_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM39
-	msgbox RustboroCity_Gym_Text_184170, 4
+	msgbox RustboroCity_Gym_Text_184170, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_Gym_EventScript_157960:: @ 8157960
-	trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD
-	msgbox RustboroCity_Gym_Text_183DF9, 6
+	trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD
+	msgbox RustboroCity_Gym_Text_183DF9, MSGBOX_AUTOCLOSE
 	end
 
 RustboroCity_Gym_EventScript_157977:: @ 8157977
-	trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78
-	msgbox RustboroCity_Gym_Text_183E98, 6
+	trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78
+	msgbox RustboroCity_Gym_Text_183E98, MSGBOX_AUTOCLOSE
 	end
 
 RustboroCity_Gym_EventScript_15798E:: @ 815798E
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3
-	msgbox RustboroCity_Gym_Text_183A4B, 4
+	msgbox RustboroCity_Gym_Text_183A4B, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_Gym_EventScript_1579A3:: @ 81579A3
-	msgbox RustboroCity_Gym_Text_183C90, 4
+	msgbox RustboroCity_Gym_Text_183C90, MSGBOX_DEFAULT
 	release
 	end
 
@@ -69,11 +69,11 @@ RustboroCity_Gym_EventScript_1579BD:: @ 81579BD
 	end
 
 RustboroCity_Gym_EventScript_1579CD:: @ 81579CD
-	msgbox RustboroCity_Gym_Text_1842E6, 4
+	msgbox RustboroCity_Gym_Text_1842E6, MSGBOX_DEFAULT
 	releaseall
 	end
 
 RustboroCity_Gym_EventScript_1579D7:: @ 81579D7
-	msgbox RustboroCity_Gym_Text_1842CC, 4
+	msgbox RustboroCity_Gym_Text_1842CC, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc
index f49581ef9..ee7399bcb 100644
--- a/data/maps/RustboroCity_House1/scripts.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
@@ -27,27 +27,27 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
 	special CreateInGameTradePokemon
 	special DoInGameTradeScene
 	waitstate
-	msgbox RustboroCity_House1_Text_184F6B, 4
+	msgbox RustboroCity_House1_Text_184F6B, MSGBOX_DEFAULT
 	setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED
 	release
 	end
 
 RustboroCity_House1_EventScript_157CFB:: @ 8157CFB
-	msgbox RustboroCity_House1_Text_184FC1, 4
+	msgbox RustboroCity_House1_Text_184FC1, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_House1_EventScript_157D05:: @ 8157D05
 	bufferspeciesname 0, VAR_0x8009
-	msgbox RustboroCity_House1_Text_184F8F, 4
+	msgbox RustboroCity_House1_Text_184F8F, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_House1_EventScript_157D13:: @ 8157D13
-	msgbox RustboroCity_House1_Text_184FDD, 4
+	msgbox RustboroCity_House1_Text_184FDD, MSGBOX_DEFAULT
 	release
 	end
 
 RustboroCity_House1_EventScript_157D1D:: @ 8157D1D
-	msgbox RustboroCity_House1_Text_185020, 2
+	msgbox RustboroCity_House1_Text_185020, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc
index b448065f4..08cb32333 100644
--- a/data/maps/RustboroCity_House2/scripts.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
@@ -2,9 +2,9 @@ RustboroCity_House2_MapScripts:: @ 8157D66
 	.byte 0
 
 RustboroCity_House2_EventScript_157D67:: @ 8157D67
-	msgbox RustboroCity_House2_Text_18532D, 2
+	msgbox RustboroCity_House2_Text_18532D, MSGBOX_NPC
 	end
 
 RustboroCity_House2_EventScript_157D70:: @ 8157D70
-	msgbox RustboroCity_House2_Text_185388, 2
+	msgbox RustboroCity_House2_Text_185388, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc
index 86d77c18e..e29414f1d 100644
--- a/data/maps/RustboroCity_House3/scripts.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
@@ -2,11 +2,11 @@ RustboroCity_House3_MapScripts:: @ 8157DEC
 	.byte 0
 
 RustboroCity_House3_EventScript_157DED:: @ 8157DED
-	msgbox RustboroCity_House3_Text_185584, 2
+	msgbox RustboroCity_House3_Text_185584, MSGBOX_NPC
 	end
 
 RustboroCity_House3_EventScript_157DF6:: @ 8157DF6
-	msgbox RustboroCity_House3_Text_1855FA, 2
+	msgbox RustboroCity_House3_Text_1855FA, MSGBOX_NPC
 	end
 
 RustboroCity_House3_EventScript_157DFF:: @ 8157DFF
@@ -14,7 +14,7 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIKACHU, 0
-	msgbox RustboroCity_House3_Text_18567D, 4
+	msgbox RustboroCity_House3_Text_18567D, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc
index c8e3f3a43..c47b1ee3f 100644
--- a/data/maps/RustboroCity_Mart/scripts.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
@@ -4,7 +4,7 @@ RustboroCity_Mart_MapScripts:: @ 8157BD3
 RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	lock
 	faceplayer
-	message RustboroCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18
@@ -12,7 +12,7 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 
 RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF
 	pokemart RustboroCity_Mart_Items1
-	msgbox RustboroCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -34,7 +34,7 @@ RustboroCity_Mart_Items1:: @ 8157C00
 
 RustboroCity_Mart_EventScript_157C18:: @ 8157C18
 	pokemart RustboroCity_Mart_Items2
-	msgbox RustboroCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -57,13 +57,13 @@ RustboroCity_Mart_Items2:: @ 8157C28
 	end
 
 RustboroCity_Mart_EventScript_157C44:: @ 8157C44
-	msgbox RustboroCity_Mart_Text_184C76, 2
+	msgbox RustboroCity_Mart_Text_184C76, MSGBOX_NPC
 	end
 
 RustboroCity_Mart_EventScript_157C4D:: @ 8157C4D
-	msgbox RustboroCity_Mart_Text_184CD8, 2
+	msgbox RustboroCity_Mart_Text_184CD8, MSGBOX_NPC
 	end
 
 RustboroCity_Mart_EventScript_157C56:: @ 8157C56
-	msgbox RustboroCity_Mart_Text_184D43, 2
+	msgbox RustboroCity_Mart_Text_184D43, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 6da36aef8..83766d86e 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -1,28 +1,28 @@
 RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79
-	map_script 3, RustboroCity_PokemonCenter_1F_MapScript1_157B7F
+	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_MapScript1_157B7F
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F
 	setrespawn HEAL_LOCATION_RUSTBORO_CITY
-	call RustboroCity_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88
 	setvar VAR_0x800B, 1
-	call RustboroCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 RustboroCity_PokemonCenter_1F_EventScript_157B96:: @ 8157B96
-	msgbox RustboroCity_PokemonCenter_1F_Text_184B37, 2
+	msgbox RustboroCity_PokemonCenter_1F_Text_184B37, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonCenter_1F_EventScript_157B9F:: @ 8157B9F
-	msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, 2
+	msgbox RustboroCity_PokemonCenter_1F_Text_184BAB, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonCenter_1F_EventScript_157BA8:: @ 8157BA8
-	msgbox RustboroCity_PokemonCenter_1F_Text_184C19, 2
+	msgbox RustboroCity_PokemonCenter_1F_Text_184C19, MSGBOX_NPC
 	end
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index d0ffc5435..baf96a74a 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 RustboroCity_PokemonCenter_2F_MapScripts:: @ 8157BB1
-	map_script 2, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, RustboroCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 RustboroCity_PokemonCenter_2F_EventScript_157BC1:: @ 8157BC1
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index 467a62b04..dd266e21f 100644
--- a/data/maps/RustboroCity_PokemonSchool/scripts.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -3,7 +3,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1
 
 RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2
 	lockall
-	msgbox RustboroCity_PokemonSchool_Text_184321, 4
+	msgbox RustboroCity_PokemonSchool_Text_184321, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
@@ -22,27 +22,27 @@ RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50
-	msgbox RustboroCity_PokemonSchool_Text_184389, 4
+	msgbox RustboroCity_PokemonSchool_Text_184389, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E
-	msgbox RustboroCity_PokemonSchool_Text_184447, 4
+	msgbox RustboroCity_PokemonSchool_Text_184447, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C
-	msgbox RustboroCity_PokemonSchool_Text_1844EC, 4
+	msgbox RustboroCity_PokemonSchool_Text_1844EC, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A
-	msgbox RustboroCity_PokemonSchool_Text_1845A5, 4
+	msgbox RustboroCity_PokemonSchool_Text_1845A5, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88
-	msgbox RustboroCity_PokemonSchool_Text_184627, 4
+	msgbox RustboroCity_PokemonSchool_Text_184627, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_1579F1
 	end
 
@@ -51,27 +51,27 @@ RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96
 	end
 
 RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98
-	msgbox RustboroCity_PokemonSchool_Text_18480E, 2
+	msgbox RustboroCity_PokemonSchool_Text_18480E, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1
-	msgbox RustboroCity_PokemonSchool_Text_18483C, 2
+	msgbox RustboroCity_PokemonSchool_Text_18483C, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA
-	msgbox RustboroCity_PokemonSchool_Text_184873, 2
+	msgbox RustboroCity_PokemonSchool_Text_184873, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3
-	msgbox RustboroCity_PokemonSchool_Text_1848D8, 2
+	msgbox RustboroCity_PokemonSchool_Text_1848D8, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC
-	msgbox RustboroCity_PokemonSchool_Text_184988, 2
+	msgbox RustboroCity_PokemonSchool_Text_184988, MSGBOX_NPC
 	end
 
 RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
-	msgbox RustboroCity_PokemonSchool_Text_184A17, 3
+	msgbox RustboroCity_PokemonSchool_Text_184A17, MSGBOX_SIGN
 	end
 
 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
@@ -82,12 +82,12 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E
 	compare VAR_FACING, 3
 	call_if_eq RustboroCity_PokemonSchool_EventScript_157B29
-	msgbox RustboroCity_PokemonSchool_Text_1846A2, 4
-	giveitem_std ITEM_QUICK_CLAW
+	msgbox RustboroCity_PokemonSchool_Text_1846A2, MSGBOX_DEFAULT
+	giveitem ITEM_QUICK_CLAW
 	compare VAR_RESULT, 0
-	goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	setflag FLAG_RECEIVED_QUICK_CLAW
 	release
@@ -104,9 +104,9 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29
 	return
 
 RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34
-	msgbox RustboroCity_PokemonSchool_Text_184737, 4
+	msgbox RustboroCity_PokemonSchool_Text_184737, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	release
 	end
@@ -134,7 +134,7 @@ RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49
 	walk_up
 	walk_up
 	walk_right
-	end_movement
+	step_end
 
 RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60
 	walk_right
@@ -161,4 +161,4 @@ RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60
 	walk_up
 	walk_left
 	walk_left
-	end_movement
+	step_end
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 0e3c71b22..9cb8bb595 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -1,6 +1,6 @@
 RusturfTunnel_MapScripts:: @ 815C745
-	map_script 3, RusturfTunnel_MapScript1_15C762
-	map_script 2, RusturfTunnel_MapScript2_15C750
+	map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_MapScript1_15C762
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_MapScript2_15C750
 	.byte 0
 
 RusturfTunnel_MapScript2_15C750:: @ 815C750
@@ -9,7 +9,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750
 	.2byte 0
 
 RusturfTunnel_MapScript1_15C762:: @ 815C762
-	call RusturfTunnel_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	compare VAR_RUSTURF_TUNNEL_STATE, 2
 	call_if_eq RusturfTunnel_EventScript_15C773
 	end
@@ -22,9 +22,9 @@ RusturfTunnel_EventScript_15C773:: @ 815C773
 RusturfTunnel_EventScript_15C782:: @ 815C782
 	lock
 	faceplayer
-	msgbox RusturfTunnel_Text_194766, 4
+	msgbox RusturfTunnel_Text_194766, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -34,17 +34,17 @@ RusturfTunnel_EventScript_15C799:: @ 815C799
 	faceplayer
 	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
 	setflag FLAG_TEMP_1
-	msgbox RusturfTunnel_Text_1944C5, 4
+	msgbox RusturfTunnel_Text_1944C5, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
-	msgbox RusturfTunnel_Text_1945B2, 4
+	msgbox RusturfTunnel_Text_1945B2, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -58,14 +58,14 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	compare VAR_TEMP_1, 3
 	call_if_eq RusturfTunnel_EventScript_15C8EA
 	call RusturfTunnel_EventScript_15C92D
-	msgbox RusturfTunnel_Text_19461D, 4
+	msgbox RusturfTunnel_Text_19461D, MSGBOX_DEFAULT
 	compare VAR_TEMP_1, 2
 	call_if_eq RusturfTunnel_EventScript_15C8EB
 	compare VAR_TEMP_1, 3
 	call_if_eq RusturfTunnel_EventScript_15C8EB
-	giveitem_std ITEM_HM04_STRENGTH
+	giveitem ITEM_HM04_STRENGTH
 	setflag FLAG_RECEIVED_HM04
-	msgbox RusturfTunnel_Text_194693, 4
+	msgbox RusturfTunnel_Text_194693, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
 	call_if_eq RusturfTunnel_EventScript_15C880
@@ -73,7 +73,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	call_if_eq RusturfTunnel_EventScript_15C892
 	compare VAR_TEMP_1, 3
 	call_if_eq RusturfTunnel_EventScript_15C8AE
-	msgbox RusturfTunnel_Text_194706, 4
+	msgbox RusturfTunnel_Text_194706, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_TEMP_1, 1
 	call_if_eq RusturfTunnel_EventScript_15C8F7
@@ -81,36 +81,36 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	call_if_eq RusturfTunnel_EventScript_15C909
 	compare VAR_TEMP_1, 3
 	call_if_eq RusturfTunnel_EventScript_15C91B
-	call RusturfTunnel_EventScript_1A0442
+	call RusturfTunnel_EventScript_SetRusturfTunnelOpen
 	releaseall
 	end
 
 RusturfTunnel_EventScript_15C880:: @ 815C880
-	applymovement 255, RusturfTunnel_Movement_15C96A
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96A
 	applymovement 1, RusturfTunnel_Movement_15C98F
 	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C892:: @ 815C892
-	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D
 	applymovement 1, RusturfTunnel_Movement_15C994
 	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
+	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
-	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15C96D
 	applymovement 1, RusturfTunnel_Movement_15C994
 	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
+	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
-	applymovement 1, RusturfTunnel_Movement_1A0841
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
@@ -148,9 +148,9 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B
 
 RusturfTunnel_EventScript_15C92D:: @ 815C92D
 	playse SE_PIN
-	applymovement 1, RusturfTunnel_Movement_1A0833
+	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 1, RusturfTunnel_Movement_1A0835
+	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	return
 
@@ -166,7 +166,7 @@ RusturfTunnel_Movement_15C945:: @ 815C945
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C951:: @ 815C951
 	walk_right
@@ -180,41 +180,41 @@ RusturfTunnel_Movement_15C951:: @ 815C951
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 @ 815C95D
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 @ 815C960
 	walk_down
 	walk_in_place_fastest_up
 	delay_8
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 @ 815C965
 	walk_up
 	walk_in_place_fastest_down
 	delay_8
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C96A:: @ 815C96A
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C96D:: @ 815C96D
 	walk_right
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C970:: @ 815C970
 	walk_up
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C973:: @ 815C973
 	walk_right
@@ -229,7 +229,7 @@ RusturfTunnel_Movement_15C973:: @ 815C973
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C980:: @ 815C980
 	walk_up
@@ -244,25 +244,25 @@ RusturfTunnel_Movement_15C980:: @ 815C980
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C98D:: @ 815C98D
 	walk_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C98F:: @ 815C98F
 	walk_in_place_fast_up
 	walk_in_place_fast_up
 	walk_fast_up
 	walk_fast_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15C994:: @ 815C994
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_fast_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 RusturfTunnel_EventScript_15C999:: @ 815C999
 	setvar VAR_TEMP_1, 1
@@ -278,7 +278,7 @@ RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
 
 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
 	lockall
-	msgbox RusturfTunnel_Text_194159, 4
+	msgbox RusturfTunnel_Text_194159, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, RusturfTunnel_Movement_15C9D3
 	applymovement 7, RusturfTunnel_Movement_15C9D3
@@ -293,14 +293,14 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
-	end_movement
+	step_end
 
 RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_194188, 4
+	msgbox RusturfTunnel_Text_194188, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
@@ -309,12 +309,12 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	lock
 	faceplayer
 	playbgm MUS_EVIL_TEAM, FALSE
-	msgbox RusturfTunnel_Text_19419B, 4
-	trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
-	msgbox RusturfTunnel_Text_194274, 4
-	giveitem_std ITEM_DEVON_GOODS
+	msgbox RusturfTunnel_Text_19419B, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_RUSTURF_TUNNEL_GRUNT, RusturfTunnel_Text_194243
+	msgbox RusturfTunnel_Text_194274, MSGBOX_DEFAULT
+	giveitem ITEM_DEVON_GOODS
 	closemessage
-	applymovement 255, RusturfTunnel_Movement_15CA99
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA99
 	applymovement 6, RusturfTunnel_Movement_15CAA2
 	waitmovement 0
 	removeobject 6
@@ -322,11 +322,11 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	addobject 5
 	applymovement 5, RusturfTunnel_Movement_15CAAC
 	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_15CA9F
+	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_15CA9F
 	applymovement 5, RusturfTunnel_Movement_15CAC0
 	waitmovement 0
-	msgbox RusturfTunnel_Text_19432A, 4
-	applymovement 5, RusturfTunnel_Movement_1A0839
+	msgbox RusturfTunnel_Text_19432A, MSGBOX_DEFAULT
+	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	message RusturfTunnel_Text_19434F
 	waitmessage
@@ -354,12 +354,12 @@ RusturfTunnel_Movement_15CA99:: @ 815CA99
 	walk_up
 	unlock_facing_direction
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CA9F:: @ 815CA9F
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CAA2:: @ 815CAA2
 	walk_fast_left
@@ -371,7 +371,7 @@ RusturfTunnel_Movement_15CAA2:: @ 815CAA2
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CAAC:: @ 815CAAC
 	walk_right
@@ -381,7 +381,7 @@ RusturfTunnel_Movement_15CAAC:: @ 815CAAC
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CAB4:: @ 815CAB4
 	walk_left
@@ -395,12 +395,12 @@ RusturfTunnel_Movement_15CAB4:: @ 815CAB4
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CAC0:: @ 815CAC0
 	delay_16
 	walk_right
-	end_movement
+	step_end
 
 RusturfTunnel_Movement_15CAC3:: @ 815CAC3
 	walk_left
@@ -412,9 +412,9 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 RusturfTunnel_EventScript_15CACD:: @ 815CACD
-	trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
-	msgbox RusturfTunnel_Text_1948C4, 6
+	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
+	msgbox RusturfTunnel_Text_1948C4, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 0f2028476..18d42f009 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,5 +1,5 @@
 SSTidalCorridor_MapScripts:: @ 815FC94
-	map_script 2, SSTidalCorridor_MapScript2_15FC9A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_15FC9A
 	.byte 0
 
 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A
@@ -14,7 +14,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC
 	setvar VAR_PORTHOLE_STATE, 2
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_199007, 4
+	msgbox SSTidalCorridor_Text_199007, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -22,7 +22,7 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2
 	setvar VAR_PORTHOLE_STATE, 6
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_199088, 4
+	msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -30,14 +30,14 @@ SSTidalRooms_EventScript_15FCE5:: @ 815FCE5
 	special SetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 7
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_199007, 4
+	msgbox SSTidalRooms_Text_199007, MSGBOX_DEFAULT
 	return
 
 SSTidalRooms_EventScript_15FCF9:: @ 815FCF9
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 4
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_1990F8, 4
+	msgbox SSTidalRooms_Text_1990F8, MSGBOX_DEFAULT
 	return
 
 gUnknown_0815FD0D:: @ 815FD0D
@@ -52,7 +52,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24
 	setvar VAR_PORTHOLE_STATE, 3
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_199088, 4
+	msgbox SSTidalCorridor_Text_199088, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -61,7 +61,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A
 	setvar VAR_PORTHOLE_STATE, 8
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_1990B4, 4
+	msgbox SSTidalCorridor_Text_1990B4, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -69,7 +69,7 @@ SSTidalRooms_EventScript_15FD50:: @ 815FD50
 	special ResetSSTidalFlag
 	setvar VAR_PORTHOLE_STATE, 8
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_1990B4, 4
+	msgbox SSTidalRooms_Text_1990B4, MSGBOX_DEFAULT
 	return
 
 SSTidalRooms_EventScript_15FD64:: @ 815FD64
@@ -81,7 +81,7 @@ SSTidalRooms_EventScript_15FD64:: @ 815FD64
 	return
 
 SSTidalCorridor_EventScript_15FD96:: @ 815FD96
-	msgbox SSTidalCorridor_Text_199291, 2
+	msgbox SSTidalCorridor_Text_199291, MSGBOX_NPC
 	end
 
 SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F
@@ -89,25 +89,25 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox SSTidalCorridor_Text_199388, 4
+	msgbox SSTidalCorridor_Text_199388, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
 SSTidalCorridor_EventScript_15FDB2:: @ 815FDB2
-	msgbox SSTidalCorridor_Text_1993A1, 3
+	msgbox SSTidalCorridor_Text_1993A1, MSGBOX_SIGN
 	end
 
 SSTidalCorridor_EventScript_15FDBB:: @ 815FDBB
-	msgbox SSTidalCorridor_Text_1993A9, 3
+	msgbox SSTidalCorridor_Text_1993A9, MSGBOX_SIGN
 	end
 
 SSTidalCorridor_EventScript_15FDC4:: @ 815FDC4
-	msgbox SSTidalCorridor_Text_1993B1, 3
+	msgbox SSTidalCorridor_Text_1993B1, MSGBOX_SIGN
 	end
 
 SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD
-	msgbox SSTidalCorridor_Text_1993B9, 3
+	msgbox SSTidalCorridor_Text_1993B9, MSGBOX_SIGN
 	end
 
 SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
@@ -117,13 +117,13 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 	goto_if_eq SSTidalCorridor_EventScript_15FDF8
 	compare VAR_PORTHOLE_STATE, 8
 	goto_if_eq SSTidalCorridor_EventScript_15FE17
-	msgbox SSTidalCorridor_Text_19913B, 4
+	msgbox SSTidalCorridor_Text_19913B, MSGBOX_DEFAULT
 	release
 	end
 
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	msgbox SSTidalCorridor_Text_1991F4, 4
+	msgbox SSTidalCorridor_Text_1991F4, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -132,7 +132,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
-	msgbox SSTidalCorridor_Text_1991F4, 4
+	msgbox SSTidalCorridor_Text_1991F4, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
@@ -149,7 +149,7 @@ SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A
 	goto_if_eq SSTidalCorridor_EventScript_15FE5B
 	compare VAR_PORTHOLE_STATE, 7
 	goto_if_eq SSTidalCorridor_EventScript_15FE5B
-	msgbox SSTidalCorridor_Text_199268, 4
+	msgbox SSTidalCorridor_Text_199268, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -163,24 +163,24 @@ SSTidalCorridor_EventScript_15FE60:: @ 815FE60
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A
 	call SSTidalCorridor_EventScript_15FE84
-	msgbox SSTidalCorridor_Text_199203, 4
+	msgbox SSTidalCorridor_Text_199203, MSGBOX_DEFAULT
 	release
 	end
 
 SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A
-	msgbox SSTidalCorridor_Text_199255, 4
+	msgbox SSTidalCorridor_Text_199255, MSGBOX_DEFAULT
 	release
 	end
 
 SSTidalCorridor_EventScript_15FE84:: @ 815FE84
-	goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5
-	goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5
+	goto_if_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5
 	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
 	goto SSTidalCorridor_EventScript_15FE7A
 	return
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 9b19a2f3a..a023350cf 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6
 	.byte 0
 
 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7
-	trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A
-	msgbox SSTidalLowerDeck_Text_19942E, 6
+	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A
+	msgbox SSTidalLowerDeck_Text_19942E, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE
-	trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7
-	msgbox SSTidalLowerDeck_Text_199508, 6
+	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7
+	msgbox SSTidalLowerDeck_Text_199508, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index fd7854875..99431543b 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -5,60 +5,60 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D
-	msgbox SSTidalRooms_Text_199B65, 4
-	giveitem_std ITEM_TM49_SNATCH
+	msgbox SSTidalRooms_Text_199B65, MSGBOX_DEFAULT
+	giveitem ITEM_TM49_SNATCH
 	compare VAR_RESULT, 0
-	goto_if_eq SSTidalRooms_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM49
-	msgbox SSTidalRooms_Text_199C1A, 4
+	msgbox SSTidalRooms_Text_199C1A, MSGBOX_DEFAULT
 	release
 	end
 
 SSTidalRooms_EventScript_15FF3D:: @ 815FF3D
-	msgbox SSTidalRooms_Text_199C1A, 4
+	msgbox SSTidalRooms_Text_199C1A, MSGBOX_DEFAULT
 	release
 	end
 
 SSTidalRooms_EventScript_15FF47:: @ 815FF47
 	lockall
-	msgbox SSTidalRooms_Text_19956B, 4
+	msgbox SSTidalRooms_Text_19956B, MSGBOX_DEFAULT
 	closemessage
-	call SSTidalRooms_EventScript_1A02CA
+	call Common_EventScript_OutOfCenterPartyHeal
 	call SSTidalRooms_EventScript_15FD64
 	releaseall
 	end
 
 SSTidalRooms_EventScript_15FF5D:: @ 815FF5D
-	trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
-	msgbox SSTidalRooms_Text_199630, 6
+	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613
+	msgbox SSTidalRooms_Text_199630, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FF74:: @ 815FF74
-	trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
-	msgbox SSTidalRooms_Text_1996E1, 6
+	trainerbattle_single TRAINER_TUCKER, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF
+	msgbox SSTidalRooms_Text_1996E1, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FF8B:: @ 815FF8B
-	trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
-	msgbox SSTidalRooms_Text_199778, 6
+	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747
+	msgbox SSTidalRooms_Text_199778, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FFA2:: @ 815FFA2
-	trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
-	msgbox SSTidalRooms_Text_199820, 6
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887
+	msgbox SSTidalRooms_Text_199820, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FFBD:: @ 815FFBD
-	trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
-	msgbox SSTidalRooms_Text_19991C, 6
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975
+	msgbox SSTidalRooms_Text_19991C, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FFD8:: @ 815FFD8
-	trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
-	msgbox SSTidalRooms_Text_199A10, 6
+	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF
+	msgbox SSTidalRooms_Text_199A10, MSGBOX_AUTOCLOSE
 	end
 
 SSTidalRooms_EventScript_15FFEF:: @ 815FFEF
-	trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
-	msgbox SSTidalRooms_Text_199ADE, 6
+	trainerbattle_single TRAINER_ANETTE, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF
+	msgbox SSTidalRooms_Text_199ADE, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 11e14da0f..31c23305d 100644
--- a/data/maps/SafariZone_Northeast/scripts.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
@@ -2,9 +2,9 @@ SafariZone_Northeast_MapScripts:: @ 8160010
 	.byte 0
 
 SafariZone_Northeast_EventScript_160011:: @ 8160011
-	msgbox SafariZone_Northeast_Text_1C3D19, 2
+	msgbox SafariZone_Northeast_Text_1C3D19, MSGBOX_NPC
 	end
 
 SafariZone_Northeast_EventScript_16001A:: @ 816001A
-	msgbox SafariZone_Northeast_Text_1C3D80, 2
+	msgbox SafariZone_Northeast_Text_1C3D80, MSGBOX_NPC
 	end
diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc
index f17b7078d..4d3250226 100644
--- a/data/maps/SafariZone_Northwest/scripts.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
@@ -2,5 +2,5 @@ SafariZone_Northwest_MapScripts:: @ 8160006
 	.byte 0
 
 SafariZone_Northwest_EventScript_160007:: @ 8160007
-	msgbox SafariZone_Northwest_Text_1C3CAE, 2
+	msgbox SafariZone_Northwest_Text_1C3CAE, MSGBOX_NPC
 	end
diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index edaee1580..cdbb2fc7d 100644
--- a/data/maps/SafariZone_RestHouse/scripts.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
@@ -2,13 +2,13 @@ SafariZone_RestHouse_MapScripts:: @ 8160C2E
 	.byte 0
 
 SafariZone_RestHouse_EventScript_160C2F:: @ 8160C2F
-	msgbox SafariZone_RestHouse_Text_1C3EC9, 2
+	msgbox SafariZone_RestHouse_Text_1C3EC9, MSGBOX_NPC
 	end
 
 SafariZone_RestHouse_EventScript_160C38:: @ 8160C38
-	msgbox SafariZone_RestHouse_Text_1C3F71, 2
+	msgbox SafariZone_RestHouse_Text_1C3F71, MSGBOX_NPC
 	end
 
 SafariZone_RestHouse_EventScript_160C41:: @ 8160C41
-	msgbox SafariZone_RestHouse_Text_1C3FF4, 2
+	msgbox SafariZone_RestHouse_Text_1C3FF4, MSGBOX_NPC
 	end
diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc
index e989748b1..bdc8787c6 100644
--- a/data/maps/SafariZone_Southeast/scripts.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
@@ -1,6 +1,6 @@
 SafariZone_Southeast_MapScripts:: @ 8160036
-	map_script 3, SafariZone_Southeast_MapScript1_160073
-	map_script 2, SafariZone_Southeast_MapScript2_160041
+	map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_Southeast_MapScript1_160073
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_Southeast_MapScript2_160041
 	.byte 0
 
 SafariZone_Southeast_MapScript2_160041:: @ 8160041
@@ -10,7 +10,7 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041
 SafariZone_Southeast_EventScript_16004B:: @ 816004B
 	lockall
 	setvar VAR_TEMP_1, 0
-	applymovement 255, SafariZone_Southeast_Movement_160087
+	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_160087
 	waitmovement 0
 	applymovement 1, SafariZone_Southeast_Movement_160089
 	waitmovement 0
@@ -30,23 +30,23 @@ SafariZone_Southeast_EventScript_16007F:: @ 816007F
 
 SafariZone_Southeast_Movement_160087:: @ 8160087
 	walk_down
-	end_movement
+	step_end
 
 SafariZone_Southeast_Movement_160089:: @ 8160089
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SafariZone_Southeast_EventScript_16008C:: @ 816008C
-	msgbox SafariZone_Southeast_Text_1C3B71, 2
+	msgbox SafariZone_Southeast_Text_1C3B71, MSGBOX_NPC
 	end
 
 SafariZone_Southeast_EventScript_160095:: @ 8160095
-	msgbox SafariZone_Southeast_Text_1C3BBD, 2
+	msgbox SafariZone_Southeast_Text_1C3BBD, MSGBOX_NPC
 	end
 
 SafariZone_Southeast_EventScript_16009E:: @ 816009E
-	msgbox SafariZone_Southeast_Text_1C3DCE, 2
+	msgbox SafariZone_Southeast_Text_1C3DCE, MSGBOX_NPC
 	end
 
 SafariZone_Southeast_EventScript_1600A7:: @ 81600A7
@@ -57,18 +57,18 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7
 	msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SafariZone_Southeast_EventScript_1600E0
-	msgbox SafariZone_Southeast_Text_1C3A9C, 4
+	msgbox SafariZone_Southeast_Text_1C3A9C, MSGBOX_DEFAULT
 	release
 	end
 
 SafariZone_Southeast_EventScript_1600D1:: @ 81600D1
 	setvar VAR_TEMP_1, 1
-	msgbox SafariZone_Southeast_Text_1C3B2D, 4
+	msgbox SafariZone_Southeast_Text_1C3B2D, MSGBOX_DEFAULT
 	release
 	end
 
 SafariZone_Southeast_EventScript_1600E0:: @ 81600E0
-	msgbox SafariZone_Southeast_Text_1C3ACA, 4
+	msgbox SafariZone_Southeast_Text_1C3ACA, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
 	case 2, SafariZone_Southeast_EventScript_160105
@@ -78,7 +78,7 @@ SafariZone_Southeast_EventScript_1600E0:: @ 81600E0
 SafariZone_Southeast_EventScript_160105:: @ 8160105
 	applymovement 1, SafariZone_Southeast_Movement_160150
 	waitmovement 0
-	applymovement 255, SafariZone_Southeast_Movement_16014B
+	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_16014B
 	waitmovement 0
 	goto SafariZone_Southeast_EventScript_160139
 	end
@@ -86,7 +86,7 @@ SafariZone_Southeast_EventScript_160105:: @ 8160105
 SafariZone_Southeast_EventScript_16011F:: @ 816011F
 	applymovement 1, SafariZone_Southeast_Movement_160153
 	waitmovement 0
-	applymovement 255, SafariZone_Southeast_Movement_16014D
+	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_Southeast_Movement_16014D
 	waitmovement 0
 	goto SafariZone_Southeast_EventScript_160139
 	end
@@ -100,19 +100,19 @@ SafariZone_Southeast_EventScript_160139:: @ 8160139
 
 SafariZone_Southeast_Movement_16014B:: @ 816014B
 	walk_up
-	end_movement
+	step_end
 
 SafariZone_Southeast_Movement_16014D:: @ 816014D
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SafariZone_Southeast_Movement_160150:: @ 8160150
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 SafariZone_Southeast_Movement_160153:: @ 8160153
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc
index 51bffeeab..70ce99973 100644
--- a/data/maps/SafariZone_Southwest/scripts.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
@@ -2,9 +2,9 @@ SafariZone_Southwest_MapScripts:: @ 8160023
 	.byte 0
 
 SafariZone_Southwest_EventScript_160024:: @ 8160024
-	msgbox SafariZone_Southwest_Text_1C3C39, 2
+	msgbox SafariZone_Southwest_Text_1C3C39, MSGBOX_NPC
 	end
 
 SafariZone_Southwest_EventScript_16002D:: @ 816002D
-	msgbox SafariZone_Southwest_Text_1C3EA3, 3
+	msgbox SafariZone_Southwest_Text_1C3EA3, MSGBOX_SIGN
 	end
diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc
index f0ed9c005..b7aedb056 100644
--- a/data/maps/ScorchedSlab/scripts.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
@@ -1,5 +1,5 @@
 ScorchedSlab_MapScripts:: @ 815F29D
-	map_script 3, ScorchedSlab_MapScript1_15F2A3
+	map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_MapScript1_15F2A3
 	.byte 0
 
 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9d59279ea..cb009ed2d 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 SeafloorCavern_Entrance_MapScripts:: @ 815DA4A
-	map_script 5, SeafloorCavern_Entrance_MapScript1_15DA50
+	map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_MapScript1_15DA50
 	.byte 0
 
 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50
diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index cd1513ec1..b04930ee6 100644
--- a/data/maps/SeafloorCavern_Room1/scripts.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
@@ -1,17 +1,17 @@
 SeafloorCavern_Room1_MapScripts:: @ 815DA61
-	map_script 3, SeafloorCavern_Room1_MapScript1_15DA67
+	map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room1_MapScript1_15DA67
 	.byte 0
 
 SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67
-	call SeafloorCavern_Room1_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA
-	msgbox SeafloorCavern_Room1_Text_1974FF, 6
+	trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_1, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA
+	msgbox SeafloorCavern_Room1_Text_1974FF, MSGBOX_AUTOCLOSE
 	end
 
 SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
-	msgbox SeafloorCavern_Room1_Text_197589, 6
+	trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_2, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573
+	msgbox SeafloorCavern_Room1_Text_197589, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index 57f2bc20a..286487d73 100644
--- a/data/maps/SeafloorCavern_Room3/scripts.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
@@ -1,12 +1,12 @@
 SeafloorCavern_Room3_MapScripts:: @ 815DA9C
-	map_script 3, SeafloorCavern_Room3_MapScript1_15DAA2
+	map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room3_MapScript1_15DAA2
 	.byte 0
 
 SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2
-	call SeafloorCavern_Room3_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
-	msgbox SeafloorCavern_Room3_Text_197704, 6
+	trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_3, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3
+	msgbox SeafloorCavern_Room3_Text_197704, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index 8f53d948c..dd7abf361 100644
--- a/data/maps/SeafloorCavern_Room4/scripts.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
@@ -1,12 +1,12 @@
 SeafloorCavern_Room4_MapScripts:: @ 815DABF
-	map_script 3, SeafloorCavern_Room4_MapScript1_15DAC5
+	map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room4_MapScript1_15DAC5
 	.byte 0
 
 SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5
-	call SeafloorCavern_Room4_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB
-	trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
-	msgbox SeafloorCavern_Room4_Text_1977ED, 6
+	trainerbattle_single TRAINER_SEAFLOOR_CAVERN_GRUNT_4, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2
+	msgbox SeafloorCavern_Room4_Text_1977ED, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 6d6b58be8..82011cbf7 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -1,10 +1,10 @@
 SeafloorCavern_Room9_MapScripts:: @ 815DAE6
-	map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC
+	map_script MAP_SCRIPT_ON_TRANSITION, SeafloorCavern_Room9_MapScript1_15DAEC
 	.byte 0
 
 SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
-	call SeafloorCavern_Room9_EventScript_1A0196
-	call SeafloorCavern_Room9_EventScript_1A01B5
+	call Common_EventScript_SetupEvilTeamGfxIds
+	call Common_EventScript_SetupLegendaryGfxIds
 	.ifdef SAPPHIRE
 	setmaplayoutindex 157
 	.else
@@ -18,58 +18,58 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 5
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	applymovement 255, SeafloorCavern_Room9_Movement_15DD68
+	applymovement OBJ_EVENT_ID_PLAYER, SeafloorCavern_Room9_Movement_15DD68
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41B8, 4
+	msgbox UnknownString_81B41B8, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4850, 4
+	msgbox SeafloorCavern_Room9_Text_1B4850, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	addobject VAR_0x8004
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD36
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41D5, 4
+	msgbox UnknownString_81B41D5, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B486C, 4
+	msgbox SeafloorCavern_Room9_Text_1B486C, MSGBOX_DEFAULT
 	.endif
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4201, 4
+	msgbox UnknownString_81B4201, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4897, 4
+	msgbox SeafloorCavern_Room9_Text_1B4897, MSGBOX_DEFAULT
 	.endif
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0839
+	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4289, 4
+	msgbox UnknownString_81B4289, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B491F, 4
+	msgbox SeafloorCavern_Room9_Text_1B491F, MSGBOX_DEFAULT
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
+	trainerbattle_no_intro TRAINER_SEAFLOOR_CAVERN_GRUNT_5, UnknownString_81B4319
 	.else
-	trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
+	trainerbattle_no_intro TRAINER_SEAFLOOR_CAVERN_GRUNT_5, SeafloorCavern_Room9_Text_1B49AE
 	.endif
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B432C, 4
+	msgbox UnknownString_81B432C, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
+	msgbox SeafloorCavern_Room9_Text_1B49C1, MSGBOX_DEFAULT
 	.endif
 	setweather WEATHER_NONE
 	doweather
 	special sub_8081924
 	waitstate
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43C4, 4
+	msgbox UnknownString_81B43C4, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
+	msgbox SeafloorCavern_Room9_Text_1B4A5A, MSGBOX_DEFAULT
 	.endif
 	special WaitWeather
 	waitstate
@@ -92,8 +92,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	playfanfare MUS_ME_TAMA
 	playse SE_TAMA
 	special sub_80818A4
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0841
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 150
 	removeobject 7
@@ -106,7 +106,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	waitstate
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
-	special sub_810F758
+	special ShakeCamera
 	waitstate
 	applymovement 1, SeafloorCavern_Room9_Movement_15DD57
 	waitmovement 0
@@ -114,7 +114,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	delay 4
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
-	special sub_810F758
+	special ShakeCamera
 	waitstate
 	delay 30
 	setvar VAR_0x8004, 2
@@ -122,35 +122,35 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	setvar VAR_0x8006, 4
 	setvar VAR_0x8007, 5
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43F2, 4
+	msgbox UnknownString_81B43F2, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
+	msgbox SeafloorCavern_Room9_Text_1B4A89, MSGBOX_DEFAULT
 	.endif
 	playse SE_PC_LOGON
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4443, 4
+	msgbox UnknownString_81B4443, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
+	msgbox SeafloorCavern_Room9_Text_1B4ADB, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD41
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B447A, 4
+	msgbox UnknownString_81B447A, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
+	msgbox SeafloorCavern_Room9_Text_1B4B11, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	playse SE_PC_OFF
 	delay 20
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0845
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B45C6, 4
+	msgbox UnknownString_81B45C6, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
+	msgbox SeafloorCavern_Room9_Text_1B4C79, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	addobject VAR_0x8005
@@ -160,36 +160,36 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_15DD63
 	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_15DD5A
 	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A083F
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B464D, 4
+	msgbox UnknownString_81B464D, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
+	msgbox SeafloorCavern_Room9_Text_1B4D02, MSGBOX_DEFAULT
 	.endif
 	playse SE_PIN
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0833
+	applymovement VAR_0x8004, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_1A0835
+	applymovement VAR_0x8004, Common_Movement_Delay48
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4723, 4
+	msgbox UnknownString_81B4723, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
+	msgbox SeafloorCavern_Room9_Text_1B4DD3, MSGBOX_DEFAULT
 	.endif
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4786, 4
+	msgbox UnknownString_81B4786, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
+	msgbox SeafloorCavern_Room9_Text_1B4E37, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_15DD60
 	applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_15DD46
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4818, 4
+	msgbox UnknownString_81B4818, MSGBOX_DEFAULT
 	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
+	msgbox SeafloorCavern_Room9_Text_1B4ECA, MSGBOX_DEFAULT
 	.endif
 	setvar VAR_ROUTE128_STATE, 1
 	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
@@ -223,21 +223,21 @@ SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 @ 815DD3E
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
 	walk_left
 	delay_16
-	end_movement
+	step_end
 
 @ 815DD44
 	walk_right
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
 	face_up
@@ -245,7 +245,7 @@ SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
 	walk_down
 	unlock_facing_direction
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
 	delay_16
@@ -258,12 +258,12 @@ SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
 	delay_16
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
 	slide_up
 	slide_up
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
 	walk_fast_right
@@ -271,21 +271,21 @@ SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
 	delay_16
 	delay_16
-	end_movement
+	step_end
diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index c8d4929b9..d0f098566 100644
--- a/data/maps/SealedChamber_InnerRoom/scripts.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
@@ -27,7 +27,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	waitstate
 	playse SE_DOOR
 	delay 40
-	msgbox SealedChamber_InnerRoom_Text_1A138B, 4
+	msgbox SealedChamber_InnerRoom_Text_1A138B, MSGBOX_DEFAULT
 	closemessage
 	fadeinbgm 0
 	setflag FLAG_REGI_DOORS_OPENED
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index d62a37f6a..fd067cea9 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -1,7 +1,7 @@
 SealedChamber_OuterRoom_MapScripts:: @ 815F0C6
-	map_script 5, SealedChamber_OuterRoom_MapScript1_15F0D6
-	map_script 3, SealedChamber_OuterRoom_MapScript1_15F0E7
-	map_script 1, SealedChamber_OuterRoom_MapScript1_15F0EB
+	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_MapScript1_15F0D6
+	map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_MapScript1_15F0E7
+	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_MapScript1_15F0EB
 	.byte 0
 
 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6
@@ -116,7 +116,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8
 	end
 
 SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF
-	msgbox SealedChamber_OuterRoom_Text_1A13BE, 4
+	msgbox SealedChamber_OuterRoom_Text_1A13BE, MSGBOX_DEFAULT
 	releaseall
 	end
 
diff --git a/data/maps/SecretBase_BlueCave1/map.json b/data/maps/SecretBase_BlueCave1/map.json
index 9d75509db..48c4ec49c 100644
--- a/data/maps/SecretBase_BlueCave1/map.json
+++ b/data/maps/SecretBase_BlueCave1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BLUE_CAVE1",
   "name": "SecretBase_BlueCave1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BlueCave1/scripts.inc b/data/maps/SecretBase_BlueCave1/scripts.inc
deleted file mode 100644
index bca6bee55..000000000
--- a/data/maps/SecretBase_BlueCave1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BlueCave1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BlueCave2/map.json b/data/maps/SecretBase_BlueCave2/map.json
index d02b028c7..075ccbbfa 100644
--- a/data/maps/SecretBase_BlueCave2/map.json
+++ b/data/maps/SecretBase_BlueCave2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BLUE_CAVE2",
   "name": "SecretBase_BlueCave2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BlueCave2/scripts.inc b/data/maps/SecretBase_BlueCave2/scripts.inc
deleted file mode 100644
index 4fc579fb9..000000000
--- a/data/maps/SecretBase_BlueCave2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BlueCave2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BlueCave3/map.json b/data/maps/SecretBase_BlueCave3/map.json
index bf3eeea69..482b3d4a3 100644
--- a/data/maps/SecretBase_BlueCave3/map.json
+++ b/data/maps/SecretBase_BlueCave3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BLUE_CAVE3",
   "name": "SecretBase_BlueCave3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BlueCave3/scripts.inc b/data/maps/SecretBase_BlueCave3/scripts.inc
deleted file mode 100644
index 0a8199f19..000000000
--- a/data/maps/SecretBase_BlueCave3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BlueCave3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BlueCave4/map.json b/data/maps/SecretBase_BlueCave4/map.json
index 63ecfa4f3..b3d6a37d4 100644
--- a/data/maps/SecretBase_BlueCave4/map.json
+++ b/data/maps/SecretBase_BlueCave4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BLUE_CAVE4",
   "name": "SecretBase_BlueCave4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BLUE_CAVE4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BlueCave4/scripts.inc b/data/maps/SecretBase_BlueCave4/scripts.inc
deleted file mode 100644
index 72c1e9612..000000000
--- a/data/maps/SecretBase_BlueCave4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BlueCave4_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BrownCave1/map.json b/data/maps/SecretBase_BrownCave1/map.json
index 8c45cd6ad..1ffa76d99 100644
--- a/data/maps/SecretBase_BrownCave1/map.json
+++ b/data/maps/SecretBase_BrownCave1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BROWN_CAVE1",
   "name": "SecretBase_BrownCave1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BrownCave1/scripts.inc b/data/maps/SecretBase_BrownCave1/scripts.inc
deleted file mode 100644
index ddbf182e4..000000000
--- a/data/maps/SecretBase_BrownCave1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BrownCave1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BrownCave2/map.json b/data/maps/SecretBase_BrownCave2/map.json
index e73b40718..f0c455fc1 100644
--- a/data/maps/SecretBase_BrownCave2/map.json
+++ b/data/maps/SecretBase_BrownCave2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BROWN_CAVE2",
   "name": "SecretBase_BrownCave2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BrownCave2/scripts.inc b/data/maps/SecretBase_BrownCave2/scripts.inc
deleted file mode 100644
index 06dcb6335..000000000
--- a/data/maps/SecretBase_BrownCave2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BrownCave2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BrownCave3/map.json b/data/maps/SecretBase_BrownCave3/map.json
index bfcade602..f7ec74fed 100644
--- a/data/maps/SecretBase_BrownCave3/map.json
+++ b/data/maps/SecretBase_BrownCave3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BROWN_CAVE3",
   "name": "SecretBase_BrownCave3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BrownCave3/scripts.inc b/data/maps/SecretBase_BrownCave3/scripts.inc
deleted file mode 100644
index a0a85dc11..000000000
--- a/data/maps/SecretBase_BrownCave3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BrownCave3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_BrownCave4/map.json b/data/maps/SecretBase_BrownCave4/map.json
index d0612bf36..d1ae09924 100644
--- a/data/maps/SecretBase_BrownCave4/map.json
+++ b/data/maps/SecretBase_BrownCave4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_BROWN_CAVE4",
   "name": "SecretBase_BrownCave4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_BROWN_CAVE4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_BrownCave4/scripts.inc b/data/maps/SecretBase_BrownCave4/scripts.inc
deleted file mode 100644
index 12d931e9e..000000000
--- a/data/maps/SecretBase_BrownCave4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_BrownCave4_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_RedCave1/map.json b/data/maps/SecretBase_RedCave1/map.json
index 008df6c24..c9dd337ae 100644
--- a/data/maps/SecretBase_RedCave1/map.json
+++ b/data/maps/SecretBase_RedCave1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_RED_CAVE1",
   "name": "SecretBase_RedCave1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_RedCave1/scripts.inc b/data/maps/SecretBase_RedCave1/scripts.inc
deleted file mode 100644
index 77b99daec..000000000
--- a/data/maps/SecretBase_RedCave1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_RedCave1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_RedCave2/map.json b/data/maps/SecretBase_RedCave2/map.json
index 9587a49f0..ecc21b523 100644
--- a/data/maps/SecretBase_RedCave2/map.json
+++ b/data/maps/SecretBase_RedCave2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_RED_CAVE2",
   "name": "SecretBase_RedCave2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_RedCave2/scripts.inc b/data/maps/SecretBase_RedCave2/scripts.inc
deleted file mode 100644
index 735d386fc..000000000
--- a/data/maps/SecretBase_RedCave2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_RedCave2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_RedCave3/map.json b/data/maps/SecretBase_RedCave3/map.json
index d90d9ceab..f038f3449 100644
--- a/data/maps/SecretBase_RedCave3/map.json
+++ b/data/maps/SecretBase_RedCave3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_RED_CAVE3",
   "name": "SecretBase_RedCave3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_RedCave3/scripts.inc b/data/maps/SecretBase_RedCave3/scripts.inc
deleted file mode 100644
index c9b72ca30..000000000
--- a/data/maps/SecretBase_RedCave3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_RedCave3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_RedCave4/map.json b/data/maps/SecretBase_RedCave4/map.json
index 91107ac17..537622c45 100644
--- a/data/maps/SecretBase_RedCave4/map.json
+++ b/data/maps/SecretBase_RedCave4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_RED_CAVE4",
   "name": "SecretBase_RedCave4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_RED_CAVE4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_RedCave4/scripts.inc b/data/maps/SecretBase_RedCave4/scripts.inc
deleted file mode 100644
index 6d2402f03..000000000
--- a/data/maps/SecretBase_RedCave4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_RedCave4_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Shrub1/map.json b/data/maps/SecretBase_Shrub1/map.json
index 5217fcdef..f4980476d 100644
--- a/data/maps/SecretBase_Shrub1/map.json
+++ b/data/maps/SecretBase_Shrub1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_SHRUB1",
   "name": "SecretBase_Shrub1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Shrub1/scripts.inc b/data/maps/SecretBase_Shrub1/scripts.inc
deleted file mode 100644
index 79116a0cf..000000000
--- a/data/maps/SecretBase_Shrub1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Shrub1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Shrub2/map.json b/data/maps/SecretBase_Shrub2/map.json
index 9553d14e8..61a53af44 100644
--- a/data/maps/SecretBase_Shrub2/map.json
+++ b/data/maps/SecretBase_Shrub2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_SHRUB2",
   "name": "SecretBase_Shrub2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Shrub2/scripts.inc b/data/maps/SecretBase_Shrub2/scripts.inc
deleted file mode 100644
index 49835f7f3..000000000
--- a/data/maps/SecretBase_Shrub2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Shrub2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Shrub3/map.json b/data/maps/SecretBase_Shrub3/map.json
index fed30339f..5d92fe6ee 100644
--- a/data/maps/SecretBase_Shrub3/map.json
+++ b/data/maps/SecretBase_Shrub3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_SHRUB3",
   "name": "SecretBase_Shrub3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Shrub3/scripts.inc b/data/maps/SecretBase_Shrub3/scripts.inc
deleted file mode 100644
index 0aeb7bdf9..000000000
--- a/data/maps/SecretBase_Shrub3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Shrub3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Shrub4/map.json b/data/maps/SecretBase_Shrub4/map.json
index c91142b94..296e63958 100644
--- a/data/maps/SecretBase_Shrub4/map.json
+++ b/data/maps/SecretBase_Shrub4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_SHRUB4",
   "name": "SecretBase_Shrub4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_SHRUB4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Shrub4/scripts.inc b/data/maps/SecretBase_Shrub4/scripts.inc
deleted file mode 100644
index f131b308d..000000000
--- a/data/maps/SecretBase_Shrub4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Shrub4_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Tree1/map.json b/data/maps/SecretBase_Tree1/map.json
index 2a5372716..0e9366a6a 100644
--- a/data/maps/SecretBase_Tree1/map.json
+++ b/data/maps/SecretBase_Tree1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_TREE1",
   "name": "SecretBase_Tree1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Tree1/scripts.inc b/data/maps/SecretBase_Tree1/scripts.inc
deleted file mode 100644
index 7345c3bbb..000000000
--- a/data/maps/SecretBase_Tree1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Tree1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Tree2/map.json b/data/maps/SecretBase_Tree2/map.json
index c16dbf286..92a4c9240 100644
--- a/data/maps/SecretBase_Tree2/map.json
+++ b/data/maps/SecretBase_Tree2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_TREE2",
   "name": "SecretBase_Tree2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Tree2/scripts.inc b/data/maps/SecretBase_Tree2/scripts.inc
deleted file mode 100644
index 0f2976a8c..000000000
--- a/data/maps/SecretBase_Tree2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Tree2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Tree3/map.json b/data/maps/SecretBase_Tree3/map.json
index 5088b0da0..a27353ec0 100644
--- a/data/maps/SecretBase_Tree3/map.json
+++ b/data/maps/SecretBase_Tree3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_TREE3",
   "name": "SecretBase_Tree3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Tree3/scripts.inc b/data/maps/SecretBase_Tree3/scripts.inc
deleted file mode 100644
index cb80b0d25..000000000
--- a/data/maps/SecretBase_Tree3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Tree3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_Tree4/map.json b/data/maps/SecretBase_Tree4/map.json
index 77b485700..e2de6d6c1 100644
--- a/data/maps/SecretBase_Tree4/map.json
+++ b/data/maps/SecretBase_Tree4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_TREE4",
   "name": "SecretBase_Tree4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_TREE4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_Tree4/scripts.inc b/data/maps/SecretBase_Tree4/scripts.inc
deleted file mode 100644
index 0a6771740..000000000
--- a/data/maps/SecretBase_Tree4/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_Tree4_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_YellowCave1/map.json b/data/maps/SecretBase_YellowCave1/map.json
index 6fe883d39..0dbf8134b 100644
--- a/data/maps/SecretBase_YellowCave1/map.json
+++ b/data/maps/SecretBase_YellowCave1/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_YELLOW_CAVE1",
   "name": "SecretBase_YellowCave1",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE1",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_YellowCave1/scripts.inc b/data/maps/SecretBase_YellowCave1/scripts.inc
deleted file mode 100644
index b76a5f44e..000000000
--- a/data/maps/SecretBase_YellowCave1/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_YellowCave1_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_YellowCave2/map.json b/data/maps/SecretBase_YellowCave2/map.json
index b65bb3733..25bcd3ea4 100644
--- a/data/maps/SecretBase_YellowCave2/map.json
+++ b/data/maps/SecretBase_YellowCave2/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_YELLOW_CAVE2",
   "name": "SecretBase_YellowCave2",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE2",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_YellowCave2/scripts.inc b/data/maps/SecretBase_YellowCave2/scripts.inc
deleted file mode 100644
index 0bc1fc354..000000000
--- a/data/maps/SecretBase_YellowCave2/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_YellowCave2_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_YellowCave3/map.json b/data/maps/SecretBase_YellowCave3/map.json
index b49e200fd..e9a9bb038 100644
--- a/data/maps/SecretBase_YellowCave3/map.json
+++ b/data/maps/SecretBase_YellowCave3/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_YELLOW_CAVE3",
   "name": "SecretBase_YellowCave3",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE3",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_YellowCave3/scripts.inc b/data/maps/SecretBase_YellowCave3/scripts.inc
deleted file mode 100644
index 137f04316..000000000
--- a/data/maps/SecretBase_YellowCave3/scripts.inc
+++ /dev/null
@@ -1 +0,0 @@
-SecretBase_YellowCave3_MapScripts:: @ 815F337
diff --git a/data/maps/SecretBase_YellowCave4/map.json b/data/maps/SecretBase_YellowCave4/map.json
index 6b26daadd..0c7699125 100644
--- a/data/maps/SecretBase_YellowCave4/map.json
+++ b/data/maps/SecretBase_YellowCave4/map.json
@@ -1,6 +1,7 @@
 {
   "id": "MAP_SECRET_BASE_YELLOW_CAVE4",
   "name": "SecretBase_YellowCave4",
+  "shared_scripts_map": "SecretBase",
   "layout": "LAYOUT_SECRET_BASE_YELLOW_CAVE4",
   "music": "MUS_MACHI_S3",
   "region_map_section": "MAPSEC_SECRET_BASE",
diff --git a/data/maps/SecretBase_YellowCave4/scripts.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
deleted file mode 100644
index bb673b7b6..000000000
--- a/data/maps/SecretBase_YellowCave4/scripts.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SecretBase_YellowCave4_MapScripts:: @ 815F337
-	map_script 4, SecretBase_RedCave1_MapScript2_15F358
-	map_script 3, SecretBase_RedCave1_MapScript1_15F34F
-	map_script 2, SecretBase_RedCave1_MapScript2_15F362
-	map_script 5, SecretBase_RedCave1_MapScript1_15F34C
-	.byte 0
-
-SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C
-	setstepcallback 6
-	end
-
-SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F
-	call SecretBase_RedCave1_EventScript_1A2F3D
-	special sub_80BBFA4
-	end
-
-SecretBase_RedCave1_MapScript2_15F358:: @ 815F358
-	map_script_2 0x4089, 0, SecretBase_RedCave1_EventScript_1A2F68
-	.2byte 0
-
-SecretBase_RedCave1_MapScript2_15F362:: @ 815F362
-	map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE
-	.2byte 0
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index 76de79e6f..025c33550 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057
-	map_script 3, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D
+	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_MapScript1_15E05D
 	.byte 0
 
 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D
@@ -18,7 +18,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072
 ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176
 	checkitem ITEM_SHOAL_SALT, 4
 	compare VAR_RESULT, 0
@@ -34,13 +34,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076
 	call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106
 	compare VAR_RESULT, 2
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4
-	takeitem ITEM_SHOAL_SALT, 4
-	takeitem ITEM_SHOAL_SHELL, 4
-	giveitem_std ITEM_SHELL_BELL
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, MSGBOX_DEFAULT
+	removeitem ITEM_SHOAL_SALT, 4
+	removeitem ITEM_SHOAL_SHELL, 4
+	giveitem ITEM_SHELL_BELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_2
 	release
 	end
@@ -62,7 +62,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128
 	return
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C69F5, 4
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C69F5, MSGBOX_DEFAULT
 	release
 	end
 
@@ -73,17 +73,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138
 	checkitem ITEM_SHOAL_SHELL, 1
 	compare VAR_RESULT, 1
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, MSGBOX_DEFAULT
 	release
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E162:: @ 815E162
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C670D, 4
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C670D, MSGBOX_DEFAULT
 	release
 	end
 
 ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C
-	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6944, 4
+	msgbox ShoalCave_LowTideEntranceRoom_Text_1C6944, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 512de471c..e98e8d107 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -1,6 +1,6 @@
 ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192
-	map_script 1, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3
-	map_script 3, ShoalCave_LowTideInnerRoom_MapScript1_15E19D
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_MapScript1_15E1B3
+	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_MapScript1_15E19D
 	.byte 0
 
 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D
@@ -62,9 +62,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256
 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem_std ITEM_SHOAL_SHELL
+	giveitem ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1
@@ -72,16 +72,16 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289
-	msgbox ShoalCave_LowTideInnerRoom_Text_1C69B8, 4
+	msgbox ShoalCave_LowTideInnerRoom_Text_1C69B8, MSGBOX_DEFAULT
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem_std ITEM_SHOAL_SHELL
+	giveitem ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2
@@ -91,9 +91,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293
 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem_std ITEM_SHOAL_SHELL
+	giveitem ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3
@@ -103,9 +103,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5
 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289
-	giveitem_std ITEM_SHOAL_SHELL
+	giveitem ITEM_SHOAL_SHELL
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4
@@ -115,9 +115,9 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7
 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B
-	giveitem_std ITEM_SHOAL_SALT
+	giveitem ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SALT_1
@@ -125,16 +125,16 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B
-	msgbox ShoalCave_LowTideInnerRoom_Text_1C6979, 4
+	msgbox ShoalCave_LowTideInnerRoom_Text_1C6979, MSGBOX_DEFAULT
 	releaseall
 	end
 
 ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B
-	giveitem_std ITEM_SHOAL_SALT
+	giveitem ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SALT_2
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index aa271034d..b6ae3388c 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideLowerRoom_MapScripts:: @ 815E3F3
-	map_script 1, ShoalCave_LowTideLowerRoom_MapScript1_15E3F9
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_MapScript1_15E3F9
 	.byte 0
 
 ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9
@@ -17,9 +17,9 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412
 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445
-	giveitem_std ITEM_SHOAL_SALT
+	giveitem ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 18, 2, 858, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SALT_4
@@ -27,7 +27,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413
 	end
 
 ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445
-	msgbox ShoalCave_LowTideLowerRoom_Text_1C6979, 4
+	msgbox ShoalCave_LowTideLowerRoom_Text_1C6979, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -35,15 +35,15 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E
-	msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4
-	giveitem_std ITEM_FOCUS_BAND
+	msgbox ShoalCave_LowTideLowerRoom_Text_198200, MSGBOX_DEFAULT
+	giveitem ITEM_FOCUS_BAND
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_FOCUS_BAND
 	release
 	end
 
 ShoalCave_LowTideLowerRoom_EventScript_15E47E:: @ 815E47E
-	msgbox ShoalCave_LowTideLowerRoom_Text_1982A2, 4
+	msgbox ShoalCave_LowTideLowerRoom_Text_1982A2, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 3a935af56..1a13594ed 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
@@ -1,5 +1,5 @@
 ShoalCave_LowTideStairsRoom_MapScripts:: @ 815E397
-	map_script 1, ShoalCave_LowTideStairsRoom_MapScript1_15E39D
+	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_MapScript1_15E39D
 	.byte 0
 
 ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D
@@ -17,9 +17,9 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6
 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
 	lockall
 	goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9
-	giveitem_std ITEM_SHOAL_SALT
+	giveitem ITEM_SHOAL_SALT
 	compare VAR_RESULT, 0
-	goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Small, 0
 	special DrawWholeMapView
 	setflag FLAG_HIDE_TOOK_SHOAL_SALT_3
@@ -27,6 +27,6 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7
 	end
 
 ShoalCave_LowTideStairsRoom_EventScript_15E3E9:: @ 815E3E9
-	msgbox ShoalCave_LowTideStairsRoom_Text_1C6979, 4
+	msgbox ShoalCave_LowTideStairsRoom_Text_1C6979, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index bd87e8562..696293619 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -1,7 +1,7 @@
 SkyPillar_2F_MapScripts:: @ 815F2C9
-	map_script 2, SkyPillar_2F_MapScript2_1C6BB5
-	map_script 3, SkyPillar_2F_MapScript1_1C6BBF
-	map_script 5, SkyPillar_2F_MapScript1_15F2D9
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_15F2D9
 	.byte 0
 
 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index 860f35b48..993873cdc 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -1,7 +1,7 @@
 SkyPillar_4F_MapScripts:: @ 815F2E5
-	map_script 2, SkyPillar_4F_MapScript2_1C6BB5
-	map_script 3, SkyPillar_4F_MapScript1_1C6BBF
-	map_script 5, SkyPillar_4F_MapScript1_15F2F5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
+	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_15F2F5
 	.byte 0
 
 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5
diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index ab991d845..84ea651c2 100644
--- a/data/maps/SkyPillar_Entrance/scripts.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
@@ -1,5 +1,5 @@
 SkyPillar_Entrance_MapScripts:: @ 815F2BD
-	map_script 3, SkyPillar_Entrance_MapScript1_15F2C3
+	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_MapScript1_15F2C3
 	.byte 0
 
 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index d7d68c06a..ff6b62dc1 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -1,5 +1,5 @@
 SkyPillar_Top_MapScripts:: @ 815F302
-	map_script 5, SkyPillar_Top_MapScript1_15F308
+	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_MapScript1_15F308
 	.byte 0
 
 SkyPillar_Top_MapScript1_15F308:: @ 815F308
diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json
index 8447158ae..9df1b3229 100644
--- a/data/maps/SlateportCity/map.json
+++ b/data/maps/SlateportCity/map.json
@@ -526,7 +526,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -534,7 +534,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -542,7 +542,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -558,7 +558,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index 1b5592f22..854462533 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -1,5 +1,5 @@
 SlateportCity_MapScripts:: @ 814BA36
-	map_script 3, SlateportCity_MapScript1_14BA3C
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_MapScript1_14BA3C
 	.byte 0
 
 SlateportCity_MapScript1_14BA3C:: @ 814BA3C
@@ -45,7 +45,7 @@ SlateportCity_EventScript_14BAB6:: @ 814BAB6
 	message SlateportCity_Text_164642
 	waitmessage
 	pokemart SlateportCity_Items1
-	msgbox SlateportCity_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -65,30 +65,30 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_164682, 4
+	msgbox SlateportCity_Text_164682, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, LeadMonHasEffortRibbon
 	compare VAR_RESULT, 1
 	call_if_eq SlateportCity_EventScript_14BB35
 	specialvar VAR_RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
 	compare VAR_RESULT, 0
 	call_if_eq SlateportCity_EventScript_14BB2B
-	msgbox SlateportCity_Text_164691, 4
+	msgbox SlateportCity_Text_164691, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
 	message SlateportCity_Text_1646DD
 	waitfanfare
 	waitmessage
-	msgbox SlateportCity_Text_1646FC, 4
+	msgbox SlateportCity_Text_1646FC, MSGBOX_DEFAULT
 	special GivLeadMonEffortRibbon
 	release
 	end
 
 SlateportCity_EventScript_14BB2B:: @ 814BB2B
-	msgbox SlateportCity_Text_16471C, 4
+	msgbox SlateportCity_Text_16471C, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BB35:: @ 814BB35
-	msgbox SlateportCity_Text_164775, 4
+	msgbox SlateportCity_Text_164775, MSGBOX_DEFAULT
 	release
 	end
 
@@ -97,12 +97,12 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BB56
-	msgbox SlateportCity_Text_164814, 4
+	msgbox SlateportCity_Text_164814, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BB56:: @ 814BB56
-	msgbox SlateportCity_Text_165376, 4
+	msgbox SlateportCity_Text_165376, MSGBOX_DEFAULT
 	release
 	end
 
@@ -111,12 +111,12 @@ SlateportCity_EventScript_14BB60:: @ 814BB60
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BB77
-	msgbox SlateportCity_Text_1648A0, 4
+	msgbox SlateportCity_Text_1648A0, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BB77:: @ 814BB77
-	msgbox SlateportCity_Text_165222, 4
+	msgbox SlateportCity_Text_165222, MSGBOX_DEFAULT
 	release
 	end
 
@@ -126,17 +126,17 @@ SlateportCity_EventScript_14BB81:: @ 814BB81
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BBA1
 	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
-	msgbox SlateportCity_Text_164937, 4
+	msgbox SlateportCity_Text_164937, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BBA1:: @ 814BBA1
-	msgbox SlateportCity_Text_1652A0, 4
+	msgbox SlateportCity_Text_1652A0, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BBAB:: @ 814BBAB
-	msgbox SlateportCity_Text_164995, 4
+	msgbox SlateportCity_Text_164995, MSGBOX_DEFAULT
 	release
 	end
 
@@ -145,23 +145,23 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BBCC
-	msgbox SlateportCity_Text_164A30, 4
+	msgbox SlateportCity_Text_164A30, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BBCC:: @ 814BBCC
-	msgbox SlateportCity_Text_16530A, 4
+	msgbox SlateportCity_Text_16530A, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BBD6:: @ 814BBD6
 	compare VAR_SLATEPORT_STATE, 1
 	goto_if_eq SlateportCity_EventScript_14BBEA
-	msgbox SlateportCity_Text_164AA9, 2
+	msgbox SlateportCity_Text_164AA9, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BBEA:: @ 814BBEA
-	msgbox SlateportCity_Text_1653D1, 3
+	msgbox SlateportCity_Text_1653D1, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BBF3:: @ 814BBF3
@@ -169,12 +169,12 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BC0A
-	msgbox SlateportCity_Text_164B34, 4
+	msgbox SlateportCity_Text_164B34, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BC0A:: @ 814BC0A
-	msgbox SlateportCity_Text_1653F4, 4
+	msgbox SlateportCity_Text_1653F4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -182,67 +182,67 @@ SlateportCity_EventScript_14BC14:: @ 814BC14
 	lock
 	faceplayer
 	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
-	msgbox SlateportCity_Text_164BBF, 4
+	msgbox SlateportCity_Text_164BBF, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BC29:: @ 814BC29
-	msgbox SlateportCity_Text_164BEA, 4
+	msgbox SlateportCity_Text_164BEA, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BC33:: @ 814BC33
-	msgbox SlateportCity_Text_165856, 3
+	msgbox SlateportCity_Text_165856, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BC3C:: @ 814BC3C
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
-	msgbox SlateportCity_Text_1658A0, 4
+	msgbox SlateportCity_Text_1658A0, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_EventScript_14BC59:: @ 814BC59
-	msgbox SlateportCity_Text_1658E8, 4
+	msgbox SlateportCity_Text_1658E8, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_EventScript_14BC63:: @ 814BC63
-	msgbox SlateportCity_Text_165952, 4
+	msgbox SlateportCity_Text_165952, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_EventScript_14BC6D:: @ 814BC6D
-	msgbox SlateportCity_Text_1659B3, 3
+	msgbox SlateportCity_Text_1659B3, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BC76:: @ 814BC76
-	msgbox SlateportCity_Text_1659E3, 3
+	msgbox SlateportCity_Text_1659E3, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BC7F:: @ 814BC7F
-	msgbox SlateportCity_Text_165A17, 3
+	msgbox SlateportCity_Text_165A17, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BC88:: @ 814BC88
-	msgbox SlateportCity_Text_165A57, 3
+	msgbox SlateportCity_Text_165A57, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BC91:: @ 814BC91
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
-	msgbox SlateportCity_Text_165A8B, 4
+	msgbox SlateportCity_Text_165A8B, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_EventScript_14BCA5:: @ 814BCA5
-	msgbox SlateportCity_Text_165B02, 4
+	msgbox SlateportCity_Text_165B02, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_EventScript_14BCAF:: @ 814BCAF
-	msgbox SlateportCity_Text_165B48, 3
+	msgbox SlateportCity_Text_165B48, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14BCB8:: @ 814BCB8
@@ -250,33 +250,33 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8
 	faceplayer
 	compare VAR_SLATEPORT_STATE, 1
 	call_if_eq SlateportCity_EventScript_14BCCF
-	msgbox SlateportCity_Text_164F9E, 4
+	msgbox SlateportCity_Text_164F9E, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BCCF:: @ 814BCCF
-	msgbox SlateportCity_Text_164F9E, 4
+	msgbox SlateportCity_Text_164F9E, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_EventScript_14BCD9:: @ 814BCD9
-	msgbox SlateportCity_Text_164FFC, 2
+	msgbox SlateportCity_Text_164FFC, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BCE2:: @ 814BCE2
-	msgbox SlateportCity_Text_164E85, 2
+	msgbox SlateportCity_Text_164E85, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BCEB:: @ 814BCEB
-	msgbox SlateportCity_Text_164EDB, 2
+	msgbox SlateportCity_Text_164EDB, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BCF4:: @ 814BCF4
-	msgbox SlateportCity_Text_164F62, 2
+	msgbox SlateportCity_Text_164F62, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BCFD:: @ 814BCFD
-	msgbox SlateportCity_Text_16507C, 2
+	msgbox SlateportCity_Text_16507C, MSGBOX_NPC
 	end
 
 SlateportCity_EventScript_14BD06:: @ 814BD06
@@ -291,19 +291,19 @@ SlateportCity_EventScript_14BD06:: @ 814BD06
 	end
 
 SlateportCity_EventScript_14BD28:: @ 814BD28
-	msgbox SlateportCity_Text_16511E, 4
+	msgbox SlateportCity_Text_16511E, MSGBOX_DEFAULT
 	return
 
 SlateportCity_EventScript_14BD31:: @ 814BD31
-	msgbox SlateportCity_Text_1651A1, 4
+	msgbox SlateportCity_Text_1651A1, MSGBOX_DEFAULT
 	return
 
 SlateportCity_EventScript_14BD3A:: @ 814BD3A
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164C64, 4
+	msgbox SlateportCity_Text_164C64, MSGBOX_DEFAULT
 	closemessage
-	applymovement 5, SlateportCity_Movement_1A083D
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -311,9 +311,9 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A
 SlateportCity_EventScript_14BD51:: @ 814BD51
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164C9F, 4
+	msgbox SlateportCity_Text_164C9F, MSGBOX_DEFAULT
 	closemessage
-	applymovement 19, SlateportCity_Movement_1A083D
+	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -321,9 +321,9 @@ SlateportCity_EventScript_14BD51:: @ 814BD51
 SlateportCity_EventScript_14BD68:: @ 814BD68
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164CE8, 4
+	msgbox SlateportCity_Text_164CE8, MSGBOX_DEFAULT
 	closemessage
-	applymovement 20, SlateportCity_Movement_1A083D
+	applymovement 20, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -331,9 +331,9 @@ SlateportCity_EventScript_14BD68:: @ 814BD68
 SlateportCity_EventScript_14BD7F:: @ 814BD7F
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164D2B, 4
+	msgbox SlateportCity_Text_164D2B, MSGBOX_DEFAULT
 	closemessage
-	applymovement 27, SlateportCity_Movement_1A083D
+	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -341,9 +341,9 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F
 SlateportCity_EventScript_14BD96:: @ 814BD96
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164D92, 4
+	msgbox SlateportCity_Text_164D92, MSGBOX_DEFAULT
 	closemessage
-	applymovement 28, SlateportCity_Movement_1A083D
+	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -351,9 +351,9 @@ SlateportCity_EventScript_14BD96:: @ 814BD96
 SlateportCity_EventScript_14BDAD:: @ 814BDAD
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164DD5, 4
+	msgbox SlateportCity_Text_164DD5, MSGBOX_DEFAULT
 	closemessage
-	applymovement 29, SlateportCity_Movement_1A083D
+	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -361,9 +361,9 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD
 SlateportCity_EventScript_14BDC4:: @ 814BDC4
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164DF4, 4
+	msgbox SlateportCity_Text_164DF4, MSGBOX_DEFAULT
 	closemessage
-	applymovement 30, SlateportCity_Movement_1A083D
+	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -371,9 +371,9 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4
 SlateportCity_EventScript_14BDDB:: @ 814BDDB
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_164E46, 4
+	msgbox SlateportCity_Text_164E46, MSGBOX_DEFAULT
 	closemessage
-	applymovement 31, SlateportCity_Movement_1A083D
+	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
@@ -381,10 +381,10 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB
 SlateportCity_EventScript_14BDF2:: @ 814BDF2
 	lock
 	faceplayer
-	message SlateportCity_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration SlateportCity_Decorations1
-	msgbox SlateportCity_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -398,7 +398,7 @@ SlateportCity_Decorations1:: @ 814BE0C
 	end
 
 SlateportCity_EventScript_14BE16:: @ 814BE16
-	msgbox SlateportCity_Text_1A116E, 4
+	msgbox SlateportCity_Text_1A116E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -406,10 +406,10 @@ SlateportCity_EventScript_14BE20:: @ 814BE20
 	lock
 	faceplayer
 	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration SlateportCity_Decorations2
-	msgbox SlateportCity_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -437,10 +437,10 @@ SlateportCity_Decorations2:: @ 814BE40
 	lock
 	faceplayer
 	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemartdecoration SlateportCity_Decorations3
-	msgbox SlateportCity_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -464,10 +464,10 @@ SlateportCity_Decorations3:: @ 814BE80
 SlateportCity_EventScript_14BE9A:: @ 814BE9A
 	lock
 	faceplayer
-	message SlateportCity_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart SlateportCity_Items2
-	msgbox SlateportCity_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -481,49 +481,49 @@ SlateportCity_Items2:: @ 814BEB4
 
 SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	lockall
-	msgbox SlateportCity_Text_165498, 4
-	msgbox SlateportCity_Text_1654E0, 4
+	msgbox SlateportCity_Text_165498, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_1654E0, MSGBOX_DEFAULT
 	closemessage
-	applymovement 10, SlateportCity_Movement_1A0843
+	applymovement 10, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 10
-	applymovement 9, SlateportCity_Movement_1A0845
+	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25
 	applymovement 11, SlateportCity_Movement_14C000
-	applymovement 255, SlateportCity_Movement_14C00E
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_14C00E
 	applymovement 10, SlateportCity_Movement_14BFDD
 	applymovement 9, SlateportCity_Movement_14BFEA
 	waitmovement 0
 	removeobject 10
 	removeobject 9
-	msgbox SlateportCity_Text_16558D, 4
-	applymovement 11, SlateportCity_Movement_1A0841
+	msgbox SlateportCity_Text_16558D, MSGBOX_DEFAULT
+	applymovement 11, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Text_1655E7, 4
+	msgbox SlateportCity_Text_1655E7, MSGBOX_DEFAULT
 	playbgm MUS_EVIL_TEAM, FALSE
-	msgbox SlateportCity_Text_1656BC, 4
-	applymovement 6, SlateportCity_Movement_1A083F
-	applymovement 1, SlateportCity_Movement_1A083F
+	msgbox SlateportCity_Text_1656BC, MSGBOX_DEFAULT
+	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 7, SlateportCity_Movement_14BFCD
-	applymovement 3, SlateportCity_Movement_1A0831
+	applymovement 3, Common_Movement_QuestionMark
 	applymovement 2, SlateportCity_Movement_14BFD5
 	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0845
+	applymovement 11, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox SlateportCity_Text_16578F, 4
+	msgbox SlateportCity_Text_16578F, MSGBOX_DEFAULT
 	playse SE_PIN
-	applymovement 11, SlateportCity_Movement_1A0833
+	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0835
+	applymovement 11, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_Text_1657FA, 4
-	applymovement 11, SlateportCity_Movement_1A0839
+	msgbox SlateportCity_Text_1657FA, MSGBOX_DEFAULT
+	applymovement 11, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_Text_16583A, 4
+	msgbox SlateportCity_Text_16583A, MSGBOX_DEFAULT
 	closemessage
 	applymovement 11, SlateportCity_Movement_14BFFB
-	applymovement 255, SlateportCity_Movement_14C008
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_14C008
 	waitmovement 0
 	removeobject 11
 	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
@@ -544,7 +544,7 @@ SlateportCity_Movement_14BFCD:: @ 814BFCD
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 SlateportCity_Movement_14BFD5:: @ 814BFD5
 	emote_question_mark
@@ -554,7 +554,7 @@ SlateportCity_Movement_14BFD5:: @ 814BFD5
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 SlateportCity_Movement_14BFDD:: @ 814BFDD
 	delay_16
@@ -569,7 +569,7 @@ SlateportCity_Movement_14BFDD:: @ 814BFDD
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SlateportCity_Movement_14BFEA:: @ 814BFEA
 	walk_down
@@ -585,19 +585,19 @@ SlateportCity_Movement_14BFEA:: @ 814BFEA
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 @ 814BFF8
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SlateportCity_Movement_14BFFB:: @ 814BFFB
 	walk_right
 	walk_up
 	walk_up
 	set_invisible
-	end_movement
+	step_end
 
 SlateportCity_Movement_14C000:: @ 814C000
 	delay_16
@@ -607,7 +607,7 @@ SlateportCity_Movement_14C000:: @ 814C000
 	delay_16
 	walk_down
 	walk_left
-	end_movement
+	step_end
 
 SlateportCity_Movement_14C008:: @ 814C008
 	walk_in_place_fastest_right
@@ -615,7 +615,7 @@ SlateportCity_Movement_14C008:: @ 814C008
 	delay_16
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 SlateportCity_Movement_14C00E:: @ 814C00E
 	delay_16
@@ -626,16 +626,16 @@ SlateportCity_Movement_14C00E:: @ 814C00E
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SlateportCity_EventScript_14C017:: @ 814C017
-	msgbox SlateportCity_Text_165425, 3
+	msgbox SlateportCity_Text_165425, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14C020:: @ 814C020
-	msgbox SlateportCity_Text_165458, 3
+	msgbox SlateportCity_Text_165458, MSGBOX_SIGN
 	end
 
 SlateportCity_EventScript_14C029:: @ 814C029
-	msgbox SlateportCity_Text_1647A7, 2
+	msgbox SlateportCity_Text_1647A7, MSGBOX_NPC
 	end
diff --git a/data/maps/SlateportCity_ContestHall/scripts.inc b/data/maps/SlateportCity_ContestHall/scripts.inc
index d4b43ee56..851078443 100644
--- a/data/maps/SlateportCity_ContestHall/scripts.inc
+++ b/data/maps/SlateportCity_ContestHall/scripts.inc
@@ -2,111 +2,111 @@ SlateportCity_ContestHall_MapScripts:: @ 815554B
 	.byte 0
 
 SlateportCity_ContestHall_EventScript_15554C:: @ 815554C
-	msgbox SlateportCity_ContestHall_Text_17CB71, 2
+	msgbox SlateportCity_ContestHall_Text_17CB71, MSGBOX_NPC
 	end
 
 SlateportCity_ContestHall_EventScript_155555:: @ 8155555
-	msgbox SlateportCity_ContestHall_Text_17CC80, 2
+	msgbox SlateportCity_ContestHall_Text_17CC80, MSGBOX_NPC
 	end
 
 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595
-	msgbox SlateportCity_ContestHall_Text_17CCE2, 4
-	giveitem_std ITEM_TM41_TORMENT
+	msgbox SlateportCity_ContestHall_Text_17CCE2, MSGBOX_DEFAULT
+	giveitem ITEM_TM41_TORMENT
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_ContestHall_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM41
-	msgbox SlateportCity_ContestHall_Text_17CE28, 4
+	msgbox SlateportCity_ContestHall_Text_17CE28, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_ContestHall_EventScript_155595:: @ 8155595
-	msgbox SlateportCity_ContestHall_Text_17CE28, 4
+	msgbox SlateportCity_ContestHall_Text_17CE28, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_ContestHall_EventScript_15559F:: @ 815559F
-	msgbox SlateportCity_ContestHall_Text_17CEF3, 2
+	msgbox SlateportCity_ContestHall_Text_17CEF3, MSGBOX_NPC
 	lockall
-	applymovement 3, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4
-	msgbox SlateportCity_ContestHall_Text_17CFA7, 2
+	msgbox SlateportCity_ContestHall_Text_17CFA7, MSGBOX_NPC
 	lockall
-	applymovement 4, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9
-	msgbox SlateportCity_ContestHall_Text_17D054, 2
+	msgbox SlateportCity_ContestHall_Text_17D054, MSGBOX_NPC
 	lockall
-	applymovement 5, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE
-	msgbox SlateportCity_ContestHall_Text_17D07F, 2
+	msgbox SlateportCity_ContestHall_Text_17D07F, MSGBOX_NPC
 	lockall
-	applymovement 6, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3
-	msgbox SlateportCity_ContestHall_Text_17D0F9, 2
+	msgbox SlateportCity_ContestHall_Text_17D0F9, MSGBOX_NPC
 	lockall
-	applymovement 7, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 7, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_155608:: @ 8155608
-	msgbox SlateportCity_ContestHall_Text_17D222, 2
+	msgbox SlateportCity_ContestHall_Text_17D222, MSGBOX_NPC
 	lockall
-	applymovement 8, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_15561D:: @ 815561D
-	msgbox SlateportCity_ContestHall_Text_17D39A, 2
+	msgbox SlateportCity_ContestHall_Text_17D39A, MSGBOX_NPC
 	lockall
-	applymovement 9, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 9, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_155632:: @ 8155632
-	msgbox SlateportCity_ContestHall_Text_17D3F0, 2
+	msgbox SlateportCity_ContestHall_Text_17D3F0, MSGBOX_NPC
 	lockall
-	applymovement 10, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 10, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_155647:: @ 8155647
-	msgbox SlateportCity_ContestHall_Text_17D300, 2
+	msgbox SlateportCity_ContestHall_Text_17D300, MSGBOX_NPC
 	lockall
-	applymovement 12, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_15565C:: @ 815565C
-	msgbox SlateportCity_ContestHall_Text_17D27F, 2
+	msgbox SlateportCity_ContestHall_Text_17D27F, MSGBOX_NPC
 	lockall
-	applymovement 11, SlateportCity_ContestHall_Movement_1A083D
+	applymovement 11, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_ContestHall_EventScript_155671:: @ 8155671
-	msgbox SlateportCity_ContestHall_Text_17D447, 3
+	msgbox SlateportCity_ContestHall_Text_17D447, MSGBOX_SIGN
 	end
diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc
index 3bf5a3d06..f484e8a57 100644
--- a/data/maps/SlateportCity_ContestLobby/scripts.inc
+++ b/data/maps/SlateportCity_ContestLobby/scripts.inc
@@ -1,5 +1,5 @@
 SlateportCity_ContestLobby_MapScripts:: @ 8155411
-	map_script 3, SlateportCity_ContestLobby_MapScript1_155417
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_ContestLobby_MapScript1_155417
 	.byte 0
 
 SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417
@@ -35,12 +35,12 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
 	delay 20
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554DC
 	waitmovement 0
-	applymovement 255, SlateportCity_ContestLobby_Movement_1554CA
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_ContestLobby_Movement_1554CA
 	waitmovement 0
-	msgbox SlateportCity_ContestLobby_Text_1A6832, 4
+	msgbox SlateportCity_ContestLobby_Text_1A6832, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554D3
-	applymovement 255, SlateportCity_ContestLobby_Movement_1554C0
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_ContestLobby_Movement_1554C0
 	waitmovement 0
 	releaseall
 	return
@@ -55,22 +55,22 @@ SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3
 	walk_left
@@ -81,48 +81,48 @@ SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE
-	msgbox SlateportCity_ContestLobby_Text_17C937, 2
+	msgbox SlateportCity_ContestLobby_Text_17C937, MSGBOX_NPC
 	end
 
 SlateportCity_ContestLobby_EventScript_1554E7:: @ 81554E7
-	msgbox SlateportCity_ContestLobby_Text_17C9D5, 2
+	msgbox SlateportCity_ContestLobby_Text_17C9D5, MSGBOX_NPC
 	end
 
 SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
-	msgbox SlateportCity_ContestLobby_Text_17CAEC, 2
+	msgbox SlateportCity_ContestLobby_Text_17CAEC, MSGBOX_NPC
 	end
 
 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
 	lockall
 	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526
-	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
+	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
-	giveitem_std ITEM_POKEBLOCK_CASE
+	msgbox SlateportCity_ContestLobby_Text_17CA67, MSGBOX_DEFAULT
+	giveitem ITEM_POKEBLOCK_CASE
 	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	releaseall
 	end
 
 SlateportCity_ContestLobby_EventScript_155526:: @ 8155526
-	msgbox SlateportCity_ContestLobby_Text_17CA88, 2
+	msgbox SlateportCity_ContestLobby_Text_17CA88, MSGBOX_NPC
 	end
 
 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F
 	lockall
-	fadescreen 1
-	drawcontestwinner 3
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 3
 	releaseall
 	end
 
 SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
-	msgbox SlateportCity_ContestLobby_Text_1B7225, 2
+	msgbox SlateportCity_ContestLobby_Text_1B7225, MSGBOX_NPC
 	end
 
 @ 815553F
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 76f9379b1..9c815ffb3 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -1,5 +1,5 @@
 SlateportCity_Harbor_MapScripts:: @ 8155F5D
-	map_script 3, SlateportCity_Harbor_MapScript1_155F63
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_MapScript1_155F63
 	.byte 0
 
 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
@@ -42,17 +42,17 @@ SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3
 SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF
 	lockall
 	setvar VAR_0x8008, 3
-	applymovement 255, SlateportCity_Harbor_Movement_1560C2
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1560C2
 	waitmovement 0
 	goto SlateportCity_Harbor_EventScript_155FD5
 	end
 
 SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
-	applymovement 7, SlateportCity_Harbor_Movement_1A0845
+	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_17FD7D, 4
+	msgbox SlateportCity_Harbor_Text_17FD7D, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, SlateportCity_Harbor_Movement_15609B
 	applymovement 7, SlateportCity_Harbor_Movement_15609B
@@ -70,7 +70,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	call_if_eq SlateportCity_Harbor_EventScript_156086
 	compare VAR_0x8008, 3
 	call_if_eq SlateportCity_Harbor_EventScript_156086
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
 	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
@@ -82,21 +82,21 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 SlateportCity_Harbor_EventScript_15605C:: @ 815605C
 	applymovement 4, SlateportCity_Harbor_Movement_1560B3
 	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0845
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_EventScript_156071:: @ 8156071
 	applymovement 4, SlateportCity_Harbor_Movement_1560B9
 	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_EventScript_156086:: @ 8156086
 	applymovement 4, SlateportCity_Harbor_Movement_1560BE
 	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
@@ -105,14 +105,14 @@ SlateportCity_Harbor_Movement_15609B:: @ 815609B
 	delay_16
 	jump_up
 	set_invisible
-	end_movement
+	step_end
 
 @ 81560A0
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
 	delay_16
@@ -128,7 +128,7 @@ SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
 	walk_left
@@ -136,35 +136,35 @@ SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
 	walk_left
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
 	walk_left
 	walk_left
 	walk_up
 	walk_left
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
 	walk_up
-	end_movement
+	step_end
 
 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
-	msgbox SlateportCity_Harbor_Text_17FA0A, 4
+	msgbox SlateportCity_Harbor_Text_17FA0A, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
-	msgbox SlateportCity_Harbor_Text_17FA73, 4
+	msgbox SlateportCity_Harbor_Text_17FA73, MSGBOX_DEFAULT
 	checkitem ITEM_SS_TICKET, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_156135
@@ -183,7 +183,7 @@ SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
 	end
 
 SlateportCity_Harbor_EventScript_156135:: @ 8156135
-	msgbox SlateportCity_Harbor_Text_17FAAD, 4
+	msgbox SlateportCity_Harbor_Text_17FAAD, MSGBOX_DEFAULT
 	release
 	end
 
@@ -215,9 +215,9 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A
 	end
 
 SlateportCity_Harbor_EventScript_156196:: @ 8156196
-	msgbox SlateportCity_Harbor_Text_17FBB6, 4
+	msgbox SlateportCity_Harbor_Text_17FBB6, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
@@ -226,41 +226,41 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196
 	compare VAR_FACING, 4
 	call_if_eq SlateportCity_Harbor_EventScript_1561E4
 	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 5
-	call SlateportCity_Harbor_EventScript_1A040E
+	call Common_EventScript_FerryDepart
 	return
 
 SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA
-	msgbox SlateportCity_Harbor_Text_17FB5F, 4
+	msgbox SlateportCity_Harbor_Text_17FB5F, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4
-	applymovement 255, SlateportCity_Harbor_Movement_1561FA
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FA
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
-	applymovement 255, SlateportCity_Harbor_Movement_1561FD
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_1561FD
 	waitmovement 0
 	return
 
 SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
 	walk_up
-	end_movement
+	step_end
 
 SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
-	msgbox SlateportCity_Harbor_Text_17FC07, 2
+	msgbox SlateportCity_Harbor_Text_17FC07, MSGBOX_NPC
 	end
 
 SlateportCity_Harbor_EventScript_156208:: @ 8156208
-	msgbox SlateportCity_Harbor_Text_17FC7C, 2
+	msgbox SlateportCity_Harbor_Text_17FC7C, MSGBOX_NPC
 	end
 
 SlateportCity_Harbor_EventScript_156211:: @ 8156211
@@ -271,26 +271,26 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
 	compare VAR_SLATEPORT_HARBOR_STATE, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_15624E
-	msgbox SlateportCity_Harbor_Text_17FD1C, 4
+	msgbox SlateportCity_Harbor_Text_17FD1C, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 SlateportCity_Harbor_EventScript_15624E:: @ 815624E
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	msgbox SlateportCity_Harbor_Text_17FE60, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_Harbor_EventScript_156258:: @ 8156258
 	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	msgbox SlateportCity_Harbor_Text_17FF35, 4
+	msgbox SlateportCity_Harbor_Text_17FF35, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_Harbor_EventScript_156265:: @ 8156265
-	msgbox SlateportCity_Harbor_Text_1800A0, 4
+	msgbox SlateportCity_Harbor_Text_1800A0, MSGBOX_DEFAULT
 	release
 	end
 
@@ -301,12 +301,12 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
-	msgbox SlateportCity_Harbor_Text_18017B, 4
+	msgbox SlateportCity_Harbor_Text_18017B, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_Harbor_EventScript_15629D:: @ 815629D
-	msgbox SlateportCity_Harbor_Text_1801EA, 4
+	msgbox SlateportCity_Harbor_Text_1801EA, MSGBOX_DEFAULT
 	release
 	end
 
@@ -329,11 +329,11 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
 	msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_TOOTH
+	giveitem ITEM_DEEP_SEA_TOOTH
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	removeitem ITEM_SCANNER
+	msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
@@ -342,17 +342,17 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A
 	msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_SCALE
+	giveitem ITEM_DEEP_SEA_SCALE
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	removeitem ITEM_SCANNER
+	msgbox SlateportCity_Harbor_Text_18046B, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
 	goto SlateportCity_Harbor_EventScript_156380
 	end
 
 SlateportCity_Harbor_EventScript_15636A:: @ 815636A
-	msgbox SlateportCity_Harbor_Text_180360, 4
+	msgbox SlateportCity_Harbor_Text_180360, MSGBOX_DEFAULT
 	release
 	end
 
@@ -364,6 +364,6 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374
 
 SlateportCity_Harbor_EventScript_156380:: @ 8156380
 	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_180491, 4
+	msgbox SlateportCity_Harbor_Text_180491, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
index 589800008..b5139c129 100644
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
@@ -12,7 +12,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B
 	end
 
 SlateportCity_House1_EventScript_15569C:: @ 815569C
-	msgbox SlateportCity_House1_Text_17D4DB, 4
+	msgbox SlateportCity_House1_Text_17D4DB, MSGBOX_DEFAULT
 	special SelectMonForNPCTrade
 	waitstate
 	compare VAR_0x8004, 255
@@ -22,7 +22,7 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C
 	end
 
 SlateportCity_House1_EventScript_1556BF:: @ 81556BF
-	msgbox SlateportCity_House1_Text_17D61E, 4
+	msgbox SlateportCity_House1_Text_17D61E, MSGBOX_DEFAULT
 	release
 	end
 
@@ -46,27 +46,27 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9
 	end
 
 SlateportCity_House1_EventScript_15571C:: @ 815571C
-	msgbox SlateportCity_House1_Text_17D752, 4
+	msgbox SlateportCity_House1_Text_17D752, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_House1_EventScript_155726:: @ 8155726
-	msgbox SlateportCity_House1_Text_17D6CC, 4
+	msgbox SlateportCity_House1_Text_17D6CC, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_House1_EventScript_155730:: @ 8155730
-	msgbox SlateportCity_House1_Text_17D580, 4
-	call SlateportCity_House1_EventScript_1A0678
+	msgbox SlateportCity_House1_Text_17D580, MSGBOX_DEFAULT
+	call Common_EventScript_NameReceivedPartyMon
 	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged
 	special TV_CopyNicknameToStringVar1AndEnsureTerminated
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_House1_EventScript_15575A
-	msgbox SlateportCity_House1_Text_17D63A, 4
+	msgbox SlateportCity_House1_Text_17D63A, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_House1_EventScript_15575A:: @ 815575A
-	msgbox SlateportCity_House1_Text_17D5B0, 4
+	msgbox SlateportCity_House1_Text_17D5B0, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc
index 986b27124..7c4324b44 100644
--- a/data/maps/SlateportCity_House2/scripts.inc
+++ b/data/maps/SlateportCity_House2/scripts.inc
@@ -2,7 +2,7 @@ SlateportCity_House2_MapScripts:: @ 815638F
 	.byte 0
 
 SlateportCity_House2_EventScript_156390:: @ 8156390
-	msgbox SlateportCity_House2_Text_1804CF, 2
+	msgbox SlateportCity_House2_Text_1804CF, MSGBOX_NPC
 	end
 
 SlateportCity_House2_EventScript_156399:: @ 8156399
@@ -11,11 +11,11 @@ SlateportCity_House2_EventScript_156399:: @ 8156399
 	checkitem ITEM_CONTEST_PASS, 1
 	compare VAR_RESULT, 1
 	goto_if_eq SlateportCity_House2_EventScript_1563B5
-	msgbox SlateportCity_House2_Text_180567, 4
+	msgbox SlateportCity_House2_Text_180567, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_House2_EventScript_1563B5:: @ 81563B5
-	msgbox SlateportCity_House2_Text_1805CD, 4
+	msgbox SlateportCity_House2_Text_1805CD, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc
index 39a1d5ba2..1cadc675b 100644
--- a/data/maps/SlateportCity_Mart/scripts.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
@@ -4,10 +4,10 @@ SlateportCity_Mart_MapScripts:: @ 8156410
 SlateportCity_Mart_EventScript_156411:: @ 8156411
 	lock
 	faceplayer
-	message SlateportCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart SlateportCity_Mart_Items
-	msgbox SlateportCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -27,9 +27,9 @@ SlateportCity_Mart_Items:: @ 8156428
 	end
 
 SlateportCity_Mart_EventScript_15643E:: @ 815643E
-	msgbox SlateportCity_Mart_Text_180730, 2
+	msgbox SlateportCity_Mart_Text_180730, MSGBOX_NPC
 	end
 
 SlateportCity_Mart_EventScript_156447:: @ 8156447
-	msgbox SlateportCity_Mart_Text_18079D, 2
+	msgbox SlateportCity_Mart_Text_18079D, MSGBOX_NPC
 	end
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 0495e2b3c..575a42e33 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -1,5 +1,5 @@
 SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
-	map_script 3, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0
 	.byte 0
 
 SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
@@ -13,19 +13,19 @@ SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4
 	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5
 	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
 	end
@@ -38,19 +38,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D
 	closemessage
 	hidemoneybox 0, 0
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
-	checkmoney 0x32, 0
+	checkmoney 50, 0
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A
-	takemoney 0x32, 0
+	removemoney 50, 0
 	updatemoneybox 0, 0
 	nop
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox 0, 0
 	releaseall
@@ -58,16 +58,16 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
 	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, MSGBOX_DEFAULT
 	closemessage
 	hidemoneybox 0, 0
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_155B8D
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox 0, 0
 	releaseall
@@ -75,82 +75,82 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
 
 SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D
 	walk_down
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155B98:: @ 8155B98
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BA1:: @ 8155BA1
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BAA:: @ 8155BAA
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BB3:: @ 8155BB3
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BBC:: @ 8155BBC
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BC5:: @ 8155BC5
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BCE:: @ 8155BCE
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BD7:: @ 8155BD7
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BE0:: @ 8155BE0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BE9:: @ 8155BE9
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BF2:: @ 8155BF2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155BFB:: @ 8155BFB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C04:: @ 8155C04
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C0D:: @ 8155C0D
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, 3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C16:: @ 8155C16
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C1F:: @ 8155C1F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C28:: @ 8155C28
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, 2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
@@ -158,16 +158,16 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	faceplayer
 	delay 8
 	playse SE_PIN
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833
+	applymovement 13, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835
+	applymovement 13, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4
-	giveitem_std ITEM_TM46_THIEF
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, MSGBOX_DEFAULT
+	giveitem ITEM_TM46_THIEF
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
 	setflag FLAG_RECEIVED_TM46
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, 2
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98
@@ -194,7 +194,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD
 	end
 
 SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, 4
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, MSGBOX_DEFAULT
 	release
 	end
 
@@ -205,7 +205,7 @@ SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC
 	walk_fast_down
 	walk_fast_down
 	delay_8
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3
 	walk_fast_right
@@ -214,4 +214,4 @@ SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3
 	walk_fast_down
 	walk_fast_down
 	delay_8
-	end_movement
+	step_end
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 569da9944..0450d51f1 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -1,15 +1,15 @@
 SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA
-	map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
 	.byte 0
 
 SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A0196
+	call Common_EventScript_SetupEvilTeamGfxIds
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	lock
 	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_EVIL_TEAM, TRUE
 	addobject 3
@@ -25,11 +25,11 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
 	compare VAR_FACING, 4
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, MSGBOX_DEFAULT
 	compare VAR_FACING, 4
 	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, MSGBOX_DEFAULT
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
 	waitmovement 0
@@ -37,50 +37,50 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
 	compare VAR_FACING, 3
 	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
-	trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
+	trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_1, SlateportCity_OceanicMuseum_2F_Text_17EE4E
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
 	waitmovement 0
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, MSGBOX_DEFAULT
 	savebgm 0
-	trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
+	trainerbattle_no_intro TRAINER_MUSEUM_2F_GRUNT_2, SlateportCity_OceanicMuseum_2F_Text_17EED6
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
 	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	applymovement 3, Common_Movement_WalkInPlaceFastestDown
+	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, MSGBOX_DEFAULT
 	closemessage
 	delay 35
 	addobject 2
 	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, MSGBOX_DEFAULT
 	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, MSGBOX_DEFAULT
 	.else
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, MSGBOX_DEFAULT
 	.endif
 	closemessage
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 3
 	removeobject 4
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	delay 30
 	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
-	setvar VAR_0x8004, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, MSGBOX_DEFAULT
+	setvar VAR_0x8004, ITEM_DEVON_GOODS
+	call Common_EventScript_PlayerHandedOverTheItem
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
 	waitmovement 0
@@ -94,22 +94,22 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E8E
 	waitmovement 0
 	return
 
 SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92
+	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_155E92
 	waitmovement 0
 	return
 
@@ -117,7 +117,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
 	walk_up
@@ -125,7 +125,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
 	walk_up
@@ -141,11 +141,11 @@ SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
 	walk_up
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
 	walk_right
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
 	walk_down
@@ -157,17 +157,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
 	walk_right
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
 	walk_down
@@ -176,17 +176,17 @@ SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
 	walk_down
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
 	walk_down
@@ -197,7 +197,7 @@ SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
 	delay_16
@@ -211,62 +211,62 @@ SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
 	delay_8
 	walk_fast_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, MSGBOX_SIGN
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, MSGBOX_NPC
 	end
 
 SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
 	lock
 	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
+	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index fef6401e7..a0d401b29 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -1,24 +1,24 @@
 SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF
-	map_script 3, SlateportCity_PokemonCenter_1F_MapScript1_1563C5
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_MapScript1_1563C5
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
-	call SlateportCity_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE
 	setvar VAR_0x800B, 1
-	call SlateportCity_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 SlateportCity_PokemonCenter_1F_EventScript_1563DC:: @ 81563DC
-	msgbox SlateportCity_PokemonCenter_1F_Text_180602, 2
+	msgbox SlateportCity_PokemonCenter_1F_Text_180602, MSGBOX_NPC
 	end
 
 SlateportCity_PokemonCenter_1F_EventScript_1563E5:: @ 81563E5
-	msgbox SlateportCity_PokemonCenter_1F_Text_1806CB, 2
+	msgbox SlateportCity_PokemonCenter_1F_Text_1806CB, MSGBOX_NPC
 	end
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 98782b24d..a69826452 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 SlateportCity_PokemonCenter_2F_MapScripts:: @ 81563EE
-	map_script 2, SlateportCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, SlateportCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, SlateportCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, SlateportCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 SlateportCity_PokemonCenter_2F_EventScript_1563FE:: @ 81563FE
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index b47b7b317..04a86af1f 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -1,5 +1,5 @@
 SlateportCity_PokemonFanClub_MapScripts:: @ 8155764
-	map_script 3, SlateportCity_PokemonFanClub_MapScript1_15576A
+	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonFanClub_MapScript1_15576A
 	.byte 0
 
 SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A
@@ -17,7 +17,7 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B
 
 SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
-	msgbox SlateportCity_PokemonFanClub_Text_17D773, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17D773, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_155808
 	end
 
@@ -32,17 +32,17 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D
 	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE
-	msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DA14, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_155808
 	end
 
 SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE
-	msgbox SlateportCity_PokemonFanClub_Text_17DDD5, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DDD5, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808
-	msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DA49, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, 0
 	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE
 	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7
@@ -69,7 +69,7 @@ SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893
 	return
 
 SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899
-	msgbox SlateportCity_PokemonFanClub_Text_17DA5C, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DA5C, MSGBOX_DEFAULT
 	release
 	end
 
@@ -77,10 +77,10 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3
 	checkitemspace ITEM_RED_SCARF, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_RED_SCARF
-	giveitem_std ITEM_RED_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4
+	giveitem ITEM_RED_SCARF
+	msgbox SlateportCity_PokemonFanClub_Text_17DC1B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -88,10 +88,10 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4
 	checkitemspace ITEM_BLUE_SCARF, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_BLUE_SCARF
-	giveitem_std ITEM_BLUE_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4
+	giveitem ITEM_BLUE_SCARF
+	msgbox SlateportCity_PokemonFanClub_Text_17DC74, MSGBOX_DEFAULT
 	release
 	end
 
@@ -99,10 +99,10 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905
 	checkitemspace ITEM_PINK_SCARF, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_PINK_SCARF
-	giveitem_std ITEM_PINK_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4
+	giveitem ITEM_PINK_SCARF
+	msgbox SlateportCity_PokemonFanClub_Text_17DCCB, MSGBOX_DEFAULT
 	release
 	end
 
@@ -110,10 +110,10 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936
 	checkitemspace ITEM_GREEN_SCARF, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_GREEN_SCARF
-	giveitem_std ITEM_GREEN_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4
+	giveitem ITEM_GREEN_SCARF
+	msgbox SlateportCity_PokemonFanClub_Text_17DD27, MSGBOX_DEFAULT
 	release
 	end
 
@@ -121,15 +121,15 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967
 	checkitemspace ITEM_YELLOW_SCARF, 1
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB89, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_YELLOW_SCARF
-	giveitem_std ITEM_YELLOW_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4
+	giveitem ITEM_YELLOW_SCARF
+	msgbox SlateportCity_PokemonFanClub_Text_17DD78, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998
-	msgbox SlateportCity_PokemonFanClub_Text_17DB0B, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DB0B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -187,7 +187,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75
-	msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DE6B, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	compare VAR_RESULT, 4
 	goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A
@@ -196,29 +196,29 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15
 
 SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A
 	playse SE_PIN
-	applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833
+	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835
+	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4
-	giveitem_std ITEM_SOOTHE_BELL
+	msgbox SlateportCity_PokemonFanClub_Text_17DF57, MSGBOX_DEFAULT
+	giveitem ITEM_SOOTHE_BELL
 	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155A75:: @ 8155A75
-	msgbox SlateportCity_PokemonFanClub_Text_17DFB8, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17DFB8, MSGBOX_DEFAULT
 	release
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155A7F:: @ 8155A7F
-	msgbox SlateportCity_PokemonFanClub_Text_17E03B, 2
+	msgbox SlateportCity_PokemonFanClub_Text_17E03B, MSGBOX_NPC
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155A88:: @ 8155A88
-	msgbox SlateportCity_PokemonFanClub_Text_17E0ED, 2
+	msgbox SlateportCity_PokemonFanClub_Text_17E0ED, MSGBOX_NPC
 	end
 
 SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91
@@ -226,7 +226,7 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17E14E, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
@@ -236,7 +236,7 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox SlateportCity_PokemonFanClub_Text_17E164, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17E164, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
@@ -246,7 +246,7 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SlateportCity_PokemonFanClub_Text_17E178, 4
+	msgbox SlateportCity_PokemonFanClub_Text_17E178, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index dd31e8e26..083d8e993 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -7,12 +7,12 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C
 	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF
 	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, MSGBOX_DEFAULT
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_DOCK_REJECTED_DEVON_GOODS
 	setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT
@@ -20,44 +20,44 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C472, 4
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C472, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, 4
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF
-	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
+	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C360, 4
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C360, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_1553E3:: @ 81553E3
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C6BB, 2
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C6BB, MSGBOX_NPC
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_1553EC:: @ 81553EC
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C764, 2
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C764, MSGBOX_NPC
 	end
 
 SlateportCity_SternsShipyard_1F_EventScript_1553F5:: @ 81553F5
-	msgbox SlateportCity_SternsShipyard_1F_Text_17C53D, 2
+	msgbox SlateportCity_SternsShipyard_1F_Text_17C53D, MSGBOX_NPC
 	end
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index df9227dd3..851a6d324 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
@@ -2,9 +2,9 @@ SlateportCity_SternsShipyard_2F_MapScripts:: @ 81553FE
 	.byte 0
 
 SlateportCity_SternsShipyard_2F_EventScript_1553FF:: @ 81553FF
-	msgbox SlateportCity_SternsShipyard_2F_Text_17C7A2, 2
+	msgbox SlateportCity_SternsShipyard_2F_Text_17C7A2, MSGBOX_NPC
 	end
 
 SlateportCity_SternsShipyard_2F_EventScript_155408:: @ 8155408
-	msgbox SlateportCity_SternsShipyard_2F_Text_17C80C, 2
+	msgbox SlateportCity_SternsShipyard_2F_Text_17C80C, MSGBOX_NPC
 	end
diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
index b4e5504eb..e4c2d7710 100644
--- a/data/maps/SootopolisCity/map.json
+++ b/data/maps/SootopolisCity/map.json
@@ -267,7 +267,7 @@
       "y": 29,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SootopolisCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -275,7 +275,7 @@
       "y": 31,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SootopolisCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -283,7 +283,7 @@
       "y": 31,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SootopolisCity_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -291,7 +291,7 @@
       "y": 29,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SootopolisCity_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 8806d6e76..a438e2d22 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -1,7 +1,7 @@
 SootopolisCity_MapScripts:: @ 814D07D
-	map_script 1, SootopolisCity_MapScript1_14D08D
-	map_script 3, SootopolisCity_MapScript1_14D10D
-	map_script 5, SootopolisCity_MapScript1_14D165
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_14D08D
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MapScript1_14D10D
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_14D165
 	.byte 0
 
 SootopolisCity_MapScript1_14D08D:: @ 814D08D
@@ -37,7 +37,7 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D
 	end
 
 SootopolisCity_EventScript_14D123:: @ 814D123
-	call SootopolisCity_EventScript_1A02C1
+	call Common_EventScript_SetLegendaryWeather
 	setobjectxyperm 1, 29, 19
 	setobjectxyperm 2, 33, 19
 	compare VAR_SOOTOPOLIS_STATE, 1
@@ -64,38 +64,38 @@ SootopolisCity_EventScript_14D16E:: @ 814D16E
 	lock
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183
-	msgbox SootopolisCity_Text_1696A4, 4
+	msgbox SootopolisCity_Text_1696A4, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D183:: @ 814D183
-	msgbox SootopolisCity_Text_16A455, 4
+	msgbox SootopolisCity_Text_16A455, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D18D:: @ 814D18D
-	msgbox SootopolisCity_Text_16A2B2, 2
+	msgbox SootopolisCity_Text_16A2B2, MSGBOX_NPC
 	end
 
 SootopolisCity_EventScript_14D196:: @ 814D196
-	msgbox SootopolisCity_Text_16A2FB, 2
+	msgbox SootopolisCity_Text_16A2FB, MSGBOX_NPC
 	end
 
 SootopolisCity_EventScript_14D19F:: @ 814D19F
 	lock
 	faceplayer
-	dodailyevents
+	dotimebasedevents
 	special GetPlayerBigGuyGirlString
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241
-	msgbox SootopolisCity_Text_1C63F2, 4
+	msgbox SootopolisCity_Text_1C63F2, MSGBOX_DEFAULT
 	random 10
 	addvar VAR_RESULT, 20
 	addvar VAR_RESULT, ITEM_CHERI_BERRY
-	giveitem_std VAR_RESULT
+	giveitem VAR_RESULT
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
-	msgbox SootopolisCity_Text_1C64D0, 4
+	msgbox SootopolisCity_Text_1C64D0, MSGBOX_DEFAULT
 	random 2
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_EventScript_14D1FF
@@ -104,18 +104,18 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F
 	end
 
 SootopolisCity_EventScript_14D1FF:: @ 814D1FF
-	giveitem_std ITEM_FIGY_BERRY
+	giveitem ITEM_FIGY_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
-	msgbox SootopolisCity_Text_1C650B, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D220:: @ 814D220
-	giveitem_std ITEM_IAPAPA_BERRY
+	giveitem ITEM_IAPAPA_BERRY
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
-	msgbox SootopolisCity_Text_1C650B, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox SootopolisCity_Text_1C650B, MSGBOX_DEFAULT
 	release
 	end
 
@@ -123,12 +123,12 @@ SootopolisCity_EventScript_14D241:: @ 814D241
 	msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SootopolisCity_EventScript_14D25E
-	msgbox SootopolisCity_Text_1C6626, 4
+	msgbox SootopolisCity_Text_1C6626, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D25E:: @ 814D25E
-	msgbox SootopolisCity_Text_1C65D4, 4
+	msgbox SootopolisCity_Text_1C65D4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -136,12 +136,12 @@ SootopolisCity_EventScript_14D268:: @ 814D268
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D
-	msgbox SootopolisCity_Text_16A4D6, 4
+	msgbox SootopolisCity_Text_16A4D6, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D27D:: @ 814D27D
-	msgbox SootopolisCity_Text_16A531, 4
+	msgbox SootopolisCity_Text_16A531, MSGBOX_DEFAULT
 	release
 	end
 
@@ -149,12 +149,12 @@ SootopolisCity_EventScript_14D287:: @ 814D287
 	lock
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C
-	msgbox SootopolisCity_Text_169813, 4
+	msgbox SootopolisCity_Text_169813, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D29C:: @ 814D29C
-	msgbox SootopolisCity_Text_16A587, 4
+	msgbox SootopolisCity_Text_16A587, MSGBOX_DEFAULT
 	release
 	end
 
@@ -162,12 +162,12 @@ SootopolisCity_EventScript_14D2A6:: @ 814D2A6
 	lock
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB
-	msgbox SootopolisCity_Text_1698A0, 4
+	msgbox SootopolisCity_Text_1698A0, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D2BB:: @ 814D2BB
-	msgbox SootopolisCity_Text_16A614, 4
+	msgbox SootopolisCity_Text_16A614, MSGBOX_DEFAULT
 	release
 	end
 
@@ -175,103 +175,103 @@ SootopolisCity_EventScript_14D2C5:: @ 814D2C5
 	lock
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA
-	msgbox SootopolisCity_Text_1697A7, 4
+	msgbox SootopolisCity_Text_1697A7, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D2DA:: @ 814D2DA
-	msgbox SootopolisCity_Text_16A6AE, 4
+	msgbox SootopolisCity_Text_16A6AE, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_EventScript_14D2E4:: @ 814D2E4
-	msgbox SootopolisCity_Text_16972B, 2
+	msgbox SootopolisCity_Text_16972B, MSGBOX_NPC
 	end
 
 SootopolisCity_EventScript_14D2ED:: @ 814D2ED
-	msgbox SootopolisCity_Text_16A6C7, 3
+	msgbox SootopolisCity_Text_16A6C7, MSGBOX_SIGN
 	end
 
 SootopolisCity_EventScript_14D2F6:: @ 814D2F6
-	msgbox SootopolisCity_Text_16A711, 3
+	msgbox SootopolisCity_Text_16A711, MSGBOX_SIGN
 	end
 
 ClosedSootopolisDoorScript:: @ 814D2FF
-	msgbox ClosedSootopolisDoorText, 3
+	msgbox ClosedSootopolisDoorText, MSGBOX_SIGN
 	end
 
 SootopolisCity_EventScript_14D308:: @ 814D308
 	lockall
-	applymovement 10, SootopolisCity_Movement_1A083F
-	applymovement 255, SootopolisCity_Movement_1A0843
+	applymovement 10, Common_Movement_WalkInPlaceFastestLeft
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
-	applymovement 10, SootopolisCity_Movement_1A0833
+	applymovement 10, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 10, SootopolisCity_Movement_1A0835
+	applymovement 10, Common_Movement_Delay48
 	waitmovement 0
 	applymovement 10, SootopolisCity_Movement_14D413
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169988, 4
+	msgbox SootopolisCity_Text_169988, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_169E0F, 4
+	msgbox SootopolisCity_Text_169E0F, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	applymovement 10, SootopolisCity_Movement_14D417
-	applymovement 255, SootopolisCity_Movement_14D440
+	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D440
 	waitmovement 10
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_1699FD, 4
+	msgbox SootopolisCity_Text_1699FD, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_169E82, 4
+	msgbox SootopolisCity_Text_169E82, MSGBOX_DEFAULT
 	.endif
 	playse SE_PIN
-	applymovement 5, SootopolisCity_Movement_1A0833
+	applymovement 5, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A0835
+	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169AB7, 4
+	msgbox SootopolisCity_Text_169AB7, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_169F3C, 4
+	msgbox SootopolisCity_Text_169F3C, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	delay 30
 	applymovement 5, SootopolisCity_Movement_14D46A
 	applymovement 10, SootopolisCity_Movement_14D41D
-	applymovement 255, SootopolisCity_Movement_14D445
+	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D445
 	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A0843
-	applymovement 255, SootopolisCity_Movement_1A0843
+	applymovement 5, Common_Movement_WalkInPlaceFastestRight
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 30
-	applymovement 10, SootopolisCity_Movement_1A0845
+	applymovement 10, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169AE7, 4
+	msgbox SootopolisCity_Text_169AE7, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_169F6B, 4
+	msgbox SootopolisCity_Text_169F6B, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	delay 30
 	applymovement 5, SootopolisCity_Movement_14D47C
-	applymovement 255, SootopolisCity_Movement_14D457
+	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_14D457
 	applymovement 10, SootopolisCity_Movement_14D42D
 	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A083F
+	applymovement 5, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169BC7, 4
+	msgbox SootopolisCity_Text_169BC7, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_16A06C, 4
+	msgbox SootopolisCity_Text_16A06C, MSGBOX_DEFAULT
 	.endif
-	applymovement 255, SootopolisCity_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169C99, 4
+	msgbox SootopolisCity_Text_169C99, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_16A13E, 4
+	msgbox SootopolisCity_Text_16A13E, MSGBOX_DEFAULT
 	.endif
 	moveobjectoffscreen 5
 	setobjectmovementtype 5, 9
@@ -285,7 +285,7 @@ SootopolisCity_Movement_14D413:: @ 814D413
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D417:: @ 814D417
 	walk_right
@@ -293,7 +293,7 @@ SootopolisCity_Movement_14D417:: @ 814D417
 	walk_right
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D41D:: @ 814D41D
 	walk_down
@@ -311,7 +311,7 @@ SootopolisCity_Movement_14D41D:: @ 814D41D
 	walk_down
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D42D:: @ 814D42D
 	walk_left
@@ -332,14 +332,14 @@ SootopolisCity_Movement_14D42D:: @ 814D42D
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D440:: @ 814D440
 	walk_right
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D445:: @ 814D445
 	walk_right
@@ -359,7 +359,7 @@ SootopolisCity_Movement_14D445:: @ 814D445
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D457:: @ 814D457
 	delay_16
@@ -380,7 +380,7 @@ SootopolisCity_Movement_14D457:: @ 814D457
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D46A:: @ 814D46A
 	walk_down
@@ -400,7 +400,7 @@ SootopolisCity_Movement_14D46A:: @ 814D46A
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 SootopolisCity_Movement_14D47C:: @ 814D47C
 	delay_16
@@ -421,13 +421,13 @@ SootopolisCity_Movement_14D47C:: @ 814D47C
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 SootopolisCity_EventScript_14D48F:: @ 814D48F
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169D37, 2
+	msgbox SootopolisCity_Text_169D37, MSGBOX_NPC
 	.else
-	msgbox SootopolisCity_Text_16A1DB, 2
+	msgbox SootopolisCity_Text_16A1DB, MSGBOX_NPC
 	.endif
 	end
 
@@ -436,17 +436,17 @@ SootopolisCity_EventScript_14D498:: @ 814D498
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD
 	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169DA6, 4
+	msgbox SootopolisCity_Text_169DA6, MSGBOX_DEFAULT
 	.else
-	msgbox SootopolisCity_Text_16A249, 4
+	msgbox SootopolisCity_Text_16A249, MSGBOX_DEFAULT
 	.endif
 	release
 	end
 
 SootopolisCity_EventScript_14D4AD:: @ 814D4AD
-	msgbox SootopolisCity_Text_16A33E, 4
+	msgbox SootopolisCity_Text_16A33E, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SootopolisCity_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 50
 	setfieldeffectargument 0, 1
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index 211620b00..7013df88d 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -1,8 +1,8 @@
 SootopolisCity_Gym_1F_MapScripts:: @ 815AF07
-	map_script 2, SootopolisCity_Gym_1F_MapScript2_15AF86
-	map_script 5, SootopolisCity_Gym_1F_MapScript1_15AF22
-	map_script 1, SootopolisCity_Gym_1F_MapScript1_15AF25
-	map_script 3, SootopolisCity_Gym_1F_MapScript1_15AF1C
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_MapScript2_15AF86
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_MapScript1_15AF22
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_MapScript1_15AF25
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_MapScript1_15AF1C
 	.byte 0
 
 SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C
@@ -73,7 +73,7 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0
 SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
 	lockall
 	delay 20
-	applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD
+	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_15AFFD
 	waitmovement 0
 	playse SE_RU_HYUU
 	delay 60
@@ -83,39 +83,39 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
 
 SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
 	set_invisible
-	end_movement
+	step_end
 
 SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
-	trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
+	trainerbattle_single TRAINER_WALLACE, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D, NO_MUSIC
 	goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056
 	goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A
-	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
+	msgbox SootopolisCity_Gym_1F_Text_18F4D7, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	message SootopolisCity_Gym_1F_Text_18F342
 	waitmessage
-	call SootopolisCity_Gym_1F_EventScript_1A02C5
-	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
+	call Common_EventScript_PlayGymBadgeFanfare
+	msgbox SootopolisCity_Gym_1F_Text_18F36B, MSGBOX_DEFAULT
 	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
 	setflag FLAG_BADGE08_GET
 	setvar VAR_0x8008, 8
-	call SootopolisCity_Gym_1F_EventScript_1A01C0
+	call Common_EventScript_SetGymTrainers
 	goto SootopolisCity_Gym_1F_EventScript_15B056
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
-	giveitem_std ITEM_TM03_WATER_PULSE
+	giveitem ITEM_TM03_WATER_PULSE
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
-	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox SootopolisCity_Gym_1F_Text_18F466, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_TM03
 	release
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
-	msgbox SootopolisCity_Gym_1F_Text_18F5B4, 4
+	msgbox SootopolisCity_Gym_1F_Text_18F5B4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -123,12 +123,12 @@ SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099
-	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
+	msgbox SootopolisCity_Gym_1F_Text_18E8A5, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
-	msgbox SootopolisCity_Gym_1F_Text_18E9C9, 4
+	msgbox SootopolisCity_Gym_1F_Text_18E9C9, MSGBOX_DEFAULT
 	release
 	end
 
@@ -145,11 +145,11 @@ SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3
-	msgbox SootopolisCity_Gym_1F_Text_18F665, 4
+	msgbox SootopolisCity_Gym_1F_Text_18F665, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD
-	msgbox SootopolisCity_Gym_1F_Text_18F649, 4
+	msgbox SootopolisCity_Gym_1F_Text_18F649, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index 06c7d33a3..de082cbae 100644
--- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
@@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7
 	.byte 0
 
 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8
-	trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF
-	msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6
+	trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF
+	msgbox SootopolisCity_Gym_B1F_Text_18EAED, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF
-	trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81
-	msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6
+	trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81
+	msgbox SootopolisCity_Gym_B1F_Text_18EBB1, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106
-	trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E
-	msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6
+	trainerbattle_single TRAINER_BRIANNA_2, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E
+	msgbox SootopolisCity_Gym_B1F_Text_18EC92, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D
-	trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18
-	msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6
+	trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18
+	msgbox SootopolisCity_Gym_B1F_Text_18ED2B, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134
-	trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8
-	msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6
+	trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8
+	msgbox SootopolisCity_Gym_B1F_Text_18EE03, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B
-	trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC
-	msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6
+	trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC
+	msgbox SootopolisCity_Gym_B1F_Text_18EEF7, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162
-	trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8
-	msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6
+	trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8
+	msgbox SootopolisCity_Gym_B1F_Text_18EFCA, MSGBOX_AUTOCLOSE
 	end
 
 SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179
-	trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F
-	msgbox SootopolisCity_Gym_B1F_Text_18F085, 6
+	trainerbattle_single TRAINER_MARISSA, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F
+	msgbox SootopolisCity_Gym_B1F_Text_18F085, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index d1b842f7b..f49381a28 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -5,15 +5,15 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7
-	msgbox SootopolisCity_House1_Text_18F991, 4
-	giveitem_std ITEM_TM31_BRICK_BREAK
+	msgbox SootopolisCity_House1_Text_18F991, MSGBOX_DEFAULT
+	giveitem ITEM_TM31_BRICK_BREAK
 	setflag FLAG_RECEIVED_TM31
-	msgbox SootopolisCity_House1_Text_18FA03, 4
+	msgbox SootopolisCity_House1_Text_18FA03, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House1_EventScript_15B2C7:: @ 815B2C7
-	msgbox SootopolisCity_House1_Text_18FA03, 4
+	msgbox SootopolisCity_House1_Text_18FA03, MSGBOX_DEFAULT
 	release
 	end
 
@@ -22,7 +22,7 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox SootopolisCity_House1_Text_18FA50, 4
+	msgbox SootopolisCity_House1_Text_18FA50, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 4fe8050a5..b3d7eb609 100644
--- a/data/maps/SootopolisCity_House2/scripts.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
@@ -13,9 +13,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5
 	end
 
 SootopolisCity_House2_EventScript_15B307:: @ 815B307
-	msgbox SootopolisCity_House2_Text_18FAAE, 4
+	msgbox SootopolisCity_House2_Text_18FAAE, MSGBOX_DEFAULT
 	return
 
 SootopolisCity_House2_EventScript_15B310:: @ 815B310
-	msgbox SootopolisCity_House2_Text_18FB04, 4
+	msgbox SootopolisCity_House2_Text_18FB04, MSGBOX_DEFAULT
 	return
diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc
index 20eeeb933..b466ecc1f 100644
--- a/data/maps/SootopolisCity_House3/scripts.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
@@ -7,15 +7,15 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A
 	msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SootopolisCity_House3_EventScript_15B339
-	msgbox SootopolisCity_House3_Text_18FBC0, 4
+	msgbox SootopolisCity_House3_Text_18FBC0, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House3_EventScript_15B339:: @ 815B339
-	msgbox SootopolisCity_House3_Text_18FB9C, 4
+	msgbox SootopolisCity_House3_Text_18FB9C, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House3_EventScript_15B343:: @ 815B343
-	msgbox SootopolisCity_House3_Text_18FC1A, 2
+	msgbox SootopolisCity_House3_Text_18FC1A, MSGBOX_NPC
 	end
diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc
index b552cc6d6..8ef51d2a5 100644
--- a/data/maps/SootopolisCity_House4/scripts.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
@@ -2,11 +2,11 @@ SootopolisCity_House4_MapScripts:: @ 815B34C
 	.byte 0
 
 SootopolisCity_House4_EventScript_15B34D:: @ 815B34D
-	msgbox SootopolisCity_House4_Text_18FC92, 2
+	msgbox SootopolisCity_House4_Text_18FC92, MSGBOX_NPC
 	end
 
 SootopolisCity_House4_EventScript_15B356:: @ 815B356
-	msgbox SootopolisCity_House4_Text_18FD41, 2
+	msgbox SootopolisCity_House4_Text_18FD41, MSGBOX_NPC
 	end
 
 SootopolisCity_House4_EventScript_15B35F:: @ 815B35F
@@ -14,7 +14,7 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SootopolisCity_House4_Text_18FDD8, 4
+	msgbox SootopolisCity_House4_Text_18FDD8, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 26e5c7d5c..0d47e0ceb 100644
--- a/data/maps/SootopolisCity_House5/scripts.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
@@ -2,9 +2,9 @@ SootopolisCity_House5_MapScripts:: @ 815B372
 	.byte 0
 
 SootopolisCity_House5_EventScript_15B373:: @ 815B373
-	msgbox SootopolisCity_House5_Text_18FDEC, 2
+	msgbox SootopolisCity_House5_Text_18FDEC, MSGBOX_NPC
 	end
 
 SootopolisCity_House5_EventScript_15B37C:: @ 815B37C
-	msgbox SootopolisCity_House5_Text_18FE7B, 2
+	msgbox SootopolisCity_House5_Text_18FE7B, MSGBOX_NPC
 	end
diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 897531b5b..6d3173638 100644
--- a/data/maps/SootopolisCity_House6/scripts.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
@@ -8,8 +8,8 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386
 	msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	call_if_eq SootopolisCity_House6_EventScript_15B3C3
-	msgbox SootopolisCity_House6_Text_18FF12, 4
-	givedecoration_std DECOR_WAILMER_DOLL
+	msgbox SootopolisCity_House6_Text_18FF12, MSGBOX_DEFAULT
+	givedecoration DECOR_WAILMER_DOLL
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_House6_EventScript_15B3D7
 	setflag FLAG_RECEIVED_WAILMER_DOLL
@@ -17,18 +17,18 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386
 	end
 
 SootopolisCity_House6_EventScript_15B3C3:: @ 815B3C3
-	msgbox SootopolisCity_House6_Text_18FF6D, 4
+	msgbox SootopolisCity_House6_Text_18FF6D, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD
-	msgbox SootopolisCity_House6_Text_18FF95, 4
+	msgbox SootopolisCity_House6_Text_18FF95, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7
 	bufferdecorationname 1, DECOR_WAILMER_DOLL
-	msgbox SootopolisCity_House6_Text_1A0CEF, 4
-	msgbox SootopolisCity_House6_Text_18FF28, 4
+	msgbox Text_NoRoomLeftForAnother, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House6_Text_18FF28, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc
index a9b06b176..6d55926dd 100644
--- a/data/maps/SootopolisCity_House7/scripts.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
@@ -2,9 +2,9 @@ SootopolisCity_House7_MapScripts:: @ 815B3ED
 	.byte 0
 
 SootopolisCity_House7_EventScript_15B3EE:: @ 815B3EE
-	msgbox SootopolisCity_House7_Text_18FFA9, 2
+	msgbox SootopolisCity_House7_Text_18FFA9, MSGBOX_NPC
 	end
 
 SootopolisCity_House7_EventScript_15B3F7:: @ 815B3F7
-	msgbox SootopolisCity_House7_Text_19005B, 2
+	msgbox SootopolisCity_House7_Text_19005B, MSGBOX_NPC
 	end
diff --git a/data/maps/SootopolisCity_House8/scripts.inc b/data/maps/SootopolisCity_House8/scripts.inc
index f7971a225..0e00ae7d6 100644
--- a/data/maps/SootopolisCity_House8/scripts.inc
+++ b/data/maps/SootopolisCity_House8/scripts.inc
@@ -5,7 +5,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401
 	special GetShroomishSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_House8_Text_1900F7, 4
+	msgbox SootopolisCity_House8_Text_1900F7, MSGBOX_DEFAULT
 	special SelectMonForNPCTrade
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
@@ -22,23 +22,23 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401
 	end
 
 SootopolisCity_House8_EventScript_15B448:: @ 815B448
-	msgbox SootopolisCity_House8_Text_190366, 4
+	msgbox SootopolisCity_House8_Text_190366, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B452:: @ 815B452
-	msgbox SootopolisCity_House8_Text_190329, 4
+	msgbox SootopolisCity_House8_Text_190329, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B45C:: @ 815B45C
-	msgbox SootopolisCity_House8_Text_1902E4, 4
+	msgbox SootopolisCity_House8_Text_1902E4, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B466:: @ 815B466
-	msgbox SootopolisCity_House8_Text_19021D, 4
-	giveitem_std ITEM_ELIXIR
+	msgbox SootopolisCity_House8_Text_19021D, MSGBOX_DEFAULT
+	giveitem ITEM_ELIXIR
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B488
 	closemessage
@@ -46,7 +46,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466
 	end
 
 SootopolisCity_House8_EventScript_15B488:: @ 815B488
-	msgbox SootopolisCity_House8_Text_1902C4, 4
+	msgbox SootopolisCity_House8_Text_1902C4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -54,7 +54,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492
 	special GetBarboachSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_House8_Text_190431, 4
+	msgbox SootopolisCity_House8_Text_190431, MSGBOX_DEFAULT
 	special SelectMonForNPCTrade
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
@@ -71,23 +71,23 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492
 	end
 
 SootopolisCity_House8_EventScript_15B4D9:: @ 815B4D9
-	msgbox SootopolisCity_House8_Text_19065A, 4
+	msgbox SootopolisCity_House8_Text_19065A, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B4E3:: @ 815B4E3
-	msgbox SootopolisCity_House8_Text_190628, 4
+	msgbox SootopolisCity_House8_Text_190628, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED
-	msgbox SootopolisCity_House8_Text_1905E6, 4
+	msgbox SootopolisCity_House8_Text_1905E6, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7
-	msgbox SootopolisCity_House8_Text_190536, 4
-	giveitem_std ITEM_ELIXIR
+	msgbox SootopolisCity_House8_Text_190536, MSGBOX_DEFAULT
+	giveitem ITEM_ELIXIR
 	compare VAR_RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B519
 	closemessage
@@ -95,20 +95,20 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7
 	end
 
 SootopolisCity_House8_EventScript_15B519:: @ 815B519
-	msgbox SootopolisCity_House8_Text_1905C1, 4
+	msgbox SootopolisCity_House8_Text_1905C1, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_House8_EventScript_15B523:: @ 815B523
 	special GetShroomishSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_House8_Text_1903C9, 4
+	msgbox SootopolisCity_House8_Text_1903C9, MSGBOX_DEFAULT
 	releaseall
 	end
 
 SootopolisCity_House8_EventScript_15B531:: @ 815B531
 	special GetBarboachSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_House8_Text_1906BE, 4
+	msgbox SootopolisCity_House8_Text_1906BE, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 1687bd91e..132bca889 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -4,10 +4,10 @@ SootopolisCity_Mart_MapScripts:: @ 815B21A
 SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B
 	lock
 	faceplayer
-	message SootopolisCity_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart SootopolisCity_Mart_Items
-	msgbox SootopolisCity_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -31,12 +31,12 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268
 	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268
-	msgbox SootopolisCity_Mart_Text_18F8D7, 4
+	msgbox SootopolisCity_Mart_Text_18F8D7, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_Mart_EventScript_15B268:: @ 815B268
-	msgbox SootopolisCity_Mart_Text_18F890, 4
+	msgbox SootopolisCity_Mart_Text_18F890, MSGBOX_DEFAULT
 	release
 	end
 
@@ -45,11 +45,11 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290
 	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290
-	msgbox SootopolisCity_Mart_Text_18F96B, 4
+	msgbox SootopolisCity_Mart_Text_18F96B, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_Mart_EventScript_15B290:: @ 815B290
-	msgbox SootopolisCity_Mart_Text_18F8F2, 4
+	msgbox SootopolisCity_Mart_Text_18F8F2, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 96fbb9c5b..c82d98fef 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -1,5 +1,5 @@
 SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190
-	map_script 3, SootopolisCity_PokemonCenter_1F_MapScript1_15B196
+	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_MapScript1_15B196
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
@@ -8,7 +8,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
 
 @ 815B19A
 	setvar VAR_0x800B, 1
-	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
@@ -19,12 +19,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
 	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6
-	msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4
+	msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6
-	msgbox SootopolisCity_PokemonCenter_1F_Text_18F6A2, 4
+	msgbox SootopolisCity_PokemonCenter_1F_Text_18F6A2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -33,11 +33,11 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0
 	faceplayer
 	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
 	goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE
-	msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4
+	msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, MSGBOX_DEFAULT
 	release
 	end
 
 SootopolisCity_PokemonCenter_1F_EventScript_15B1EE:: @ 815B1EE
-	msgbox SootopolisCity_PokemonCenter_1F_Text_18F7EA, 4
+	msgbox SootopolisCity_PokemonCenter_1F_Text_18F7EA, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 0547e666f..ed5394de5 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 SootopolisCity_PokemonCenter_2F_MapScripts:: @ 815B1F8
-	map_script 2, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 SootopolisCity_PokemonCenter_2F_EventScript_15B208:: @ 815B208
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index abb25bda0..0e266bcce 100644
--- a/data/maps/SouthernIsland_Exterior/scripts.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -1,5 +1,5 @@
 SouthernIsland_Exterior_MapScripts:: @ 8160AD6
-	map_script 3, SouthernIsland_Exterior_MapScript1_160ADC
+	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_MapScript1_160ADC
 	.byte 0
 
 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
@@ -12,43 +12,43 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
 	msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SouthernIsland_Exterior_EventScript_160B25
-	msgbox SouthernIsland_Exterior_Text_1C5281, 4
+	msgbox SouthernIsland_Exterior_Text_1C5281, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845
+	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 30
 	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
 	setvar VAR_0x8004, 2
-	call SouthernIsland_Exterior_EventScript_1A047C
+	call Common_EventScript_FerryDepartIsland
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
 SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25
-	msgbox SouthernIsland_Exterior_Text_1C52A6, 4
+	msgbox SouthernIsland_Exterior_Text_1C52A6, MSGBOX_DEFAULT
 	release
 	end
 
-BattleTower_Outside_EventScript_160B2F:: @ 8160B2F
-	applymovement 255, BattleTower_Outside_Movement_160B45
+Ferry_EventScript_DepartIslandSouth:: @ 8160B2F
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B45
 	waitmovement 0
 	return
 
-BattleTower_Outside_EventScript_160B3A:: @ 8160B3A
-	applymovement 255, BattleTower_Outside_Movement_160B47
+Ferry_EventScript_DepartIslandWest:: @ 8160B3A
+	applymovement OBJ_EVENT_ID_PLAYER, BattleTower_Outside_Movement_160B47
 	waitmovement 0
 	return
 
 BattleTower_Outside_Movement_160B45:: @ 8160B45
 	walk_down
-	end_movement
+	step_end
 
 BattleTower_Outside_Movement_160B47:: @ 8160B47
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A
-	msgbox SouthernIsland_Exterior_Text_1C52FB, 3
+	msgbox SouthernIsland_Exterior_Text_1C52FB, MSGBOX_SIGN
 	end
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 1cd1d6f13..5da21e585 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -1,6 +1,6 @@
 SouthernIsland_Interior_MapScripts:: @ 8160B53
-	map_script 5, SouthernIsland_Interior_MapScript1_160B5E
-	map_script 3, SouthernIsland_Interior_MapScript1_160B6C
+	map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_MapScript1_160B5E
+	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_MapScript1_160B6C
 	.byte 0
 
 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
@@ -71,7 +71,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
 	end
 
 SouthernIsland_Interior_EventScript_160C08:: @ 8160C08
-	msgbox SouthernIsland_Interior_Text_1C52C5, 4
+	msgbox SouthernIsland_Interior_Text_1C52C5, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -79,7 +79,7 @@ SouthernIsland_Interior_Movement_160C12:: @ 8160C12
 	walk_up
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 SouthernIsland_Interior_Movement_160C16:: @ 8160C16
 	delay_16
@@ -93,7 +93,7 @@ SouthernIsland_Interior_Movement_160C16:: @ 8160C16
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 SouthernIsland_Interior_Movement_160C22:: @ 8160C22
 	walk_down
@@ -107,4 +107,4 @@ SouthernIsland_Interior_Movement_160C22:: @ 8160C22
 	walk_down
 	walk_down
 	walk_down
-	end_movement
+	step_end
diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc
index 464731b10..02f1ba05a 100644
--- a/data/maps/Underwater_Route134/scripts.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_Route134_MapScripts:: @ 815F071
-	map_script 5, Underwater_Route134_MapScript1_15F077
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_MapScript1_15F077
 	.byte 0
 
 Underwater_Route134_MapScript1_15F077:: @ 815F077
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index e66631fd6..19f880c1e 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -1,7 +1,7 @@
 Underwater_SeafloorCavern_MapScripts:: @ 815D99E
-	map_script 5, Underwater_SeafloorCavern_MapScript1_15DA36
-	map_script 3, Underwater_SeafloorCavern_MapScript1_15D9AE
-	map_script 1, Underwater_SeafloorCavern_MapScript1_15D9BF
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_MapScript1_15DA36
+	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_MapScript1_15D9AE
+	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_MapScript1_15D9BF
 	.byte 0
 
 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE
@@ -38,6 +38,6 @@ Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36
 
 Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F
 	lockall
-	msgbox Underwater_SeafloorCavern_Text_197435, 4
+	msgbox Underwater_SeafloorCavern_Text_197435, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 5d2236507..8de83458d 100644
--- a/data/maps/Underwater_SealedChamber/scripts.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_SealedChamber_MapScripts:: @ 815F080
-	map_script 6, Underwater_SealedChamber_MapScript1_15F086
+	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_MapScript1_15F086
 	.byte 0
 
 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086
diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index bba04eec8..fd3b9dd16 100644
--- a/data/maps/Underwater_SootopolisCity/scripts.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
@@ -1,5 +1,5 @@
 Underwater_SootopolisCity_MapScripts:: @ 815CAE4
-	map_script 5, Underwater_SootopolisCity_MapScript1_15CAEA
+	map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_MapScript1_15CAEA
 	.byte 0
 
 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA
diff --git a/data/maps/VerdanturfTown/map.json b/data/maps/VerdanturfTown/map.json
index e8b7d746d..71f176e2b 100644
--- a/data/maps/VerdanturfTown/map.json
+++ b/data/maps/VerdanturfTown/map.json
@@ -134,7 +134,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "VerdanturfTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -150,7 +150,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "VerdanturfTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
@@ -166,7 +166,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "VerdanturfTown_EventScript_1A00E1"
+      "script": "Common_EventScript_PokemartSign"
     },
     {
       "type": "sign",
@@ -174,7 +174,7 @@
       "y": 3,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "VerdanturfTown_EventScript_1A00EA"
+      "script": "Common_EventScript_PokemonCenterSign"
     },
     {
       "type": "sign",
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index c8adf85c3..24e6eb6c6 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_MapScripts:: @ 814E854
-	map_script 3, VerdanturfTown_MapScript1_14E85A
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_MapScript1_14E85A
 	.byte 0
 
 VerdanturfTown_MapScript1_14E85A:: @ 814E85A
@@ -12,52 +12,52 @@ VerdanturfTown_EventScript_14E866:: @ 814E866
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885
-	msgbox VerdanturfTown_Text_16CAEB, 4
-	applymovement 2, VerdanturfTown_Movement_1A083D
+	msgbox VerdanturfTown_Text_16CAEB, MSGBOX_DEFAULT
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 VerdanturfTown_EventScript_14E885:: @ 814E885
-	msgbox VerdanturfTown_Text_16CBCE, 4
-	applymovement 2, VerdanturfTown_Movement_1A083D
+	msgbox VerdanturfTown_Text_16CBCE, MSGBOX_DEFAULT
+	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
 VerdanturfTown_EventScript_14E899:: @ 814E899
-	msgbox VerdanturfTown_Text_16CC24, 2
+	msgbox VerdanturfTown_Text_16CC24, MSGBOX_NPC
 	end
 
 VerdanturfTown_EventScript_14E8A2:: @ 814E8A2
-	msgbox VerdanturfTown_Text_16CCD0, 2
+	msgbox VerdanturfTown_Text_16CCD0, MSGBOX_NPC
 	end
 
 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0
-	msgbox VerdanturfTown_Text_16CD4D, 4
+	msgbox VerdanturfTown_Text_16CD4D, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_EventScript_14E8C0:: @ 814E8C0
-	msgbox VerdanturfTown_Text_16CE30, 4
+	msgbox VerdanturfTown_Text_16CE30, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_EventScript_14E8CA:: @ 814E8CA
-	msgbox VerdanturfTown_Text_16CEC0, 3
+	msgbox VerdanturfTown_Text_16CEC0, MSGBOX_SIGN
 	end
 
 VerdanturfTown_EventScript_14E8D3:: @ 814E8D3
-	msgbox VerdanturfTown_Text_16CF0D, 3
+	msgbox VerdanturfTown_Text_16CF0D, MSGBOX_SIGN
 	end
 
 VerdanturfTown_EventScript_14E8DC:: @ 814E8DC
-	msgbox VerdanturfTown_Text_16CF1B, 3
+	msgbox VerdanturfTown_Text_16CF1B, MSGBOX_SIGN
 	end
 
 VerdanturfTown_EventScript_14E8E5:: @ 814E8E5
-	msgbox VerdanturfTown_Text_16CF6D, 3
+	msgbox VerdanturfTown_Text_16CF6D, MSGBOX_SIGN
 	end
diff --git a/data/maps/VerdanturfTown_ContestHall/scripts.inc b/data/maps/VerdanturfTown_ContestHall/scripts.inc
index 380385a88..86e914c63 100644
--- a/data/maps/VerdanturfTown_ContestHall/scripts.inc
+++ b/data/maps/VerdanturfTown_ContestHall/scripts.inc
@@ -4,17 +4,17 @@ VerdanturfTown_ContestHall_MapScripts:: @ 8153E95
 	.byte 0 @ XXX
 
 VerdanturfTown_ContestHall_EventScript_153E97:: @ 8153E97
-	msgbox VerdanturfTown_ContestHall_Text_177FB4, 2
+	msgbox VerdanturfTown_ContestHall_Text_177FB4, MSGBOX_NPC
 	end
 
 VerdanturfTown_ContestHall_EventScript_153EA0:: @ 8153EA0
-	msgbox VerdanturfTown_ContestHall_Text_178091, 2
+	msgbox VerdanturfTown_ContestHall_Text_178091, MSGBOX_NPC
 	end
 
 VerdanturfTown_ContestHall_EventScript_153EA9:: @ 8153EA9
-	msgbox VerdanturfTown_ContestHall_Text_178120, 2
+	msgbox VerdanturfTown_ContestHall_Text_178120, MSGBOX_NPC
 	end
 
 VerdanturfTown_ContestHall_EventScript_153EB2:: @ 8153EB2
-	msgbox VerdanturfTown_ContestHall_Text_1781A5, 3
+	msgbox VerdanturfTown_ContestHall_Text_1781A5, MSGBOX_SIGN
 	end
diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
index ff95f3c64..8eb1c0bcd 100644
--- a/data/maps/VerdanturfTown_ContestLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
@@ -1,5 +1,5 @@
 VerdanturfTown_ContestLobby_MapScripts:: @ 8153D6A
-	map_script 3, VerdanturfTown_ContestLobby_MapScript1_153D70
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_ContestLobby_MapScript1_153D70
 	.byte 0
 
 VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70
@@ -35,12 +35,12 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
 	delay 20
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35
 	waitmovement 0
-	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23
+	applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_ContestLobby_Movement_153E23
 	waitmovement 0
-	msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4
+	msgbox VerdanturfTown_ContestLobby_Text_1A6832, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C
-	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19
+	applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_ContestLobby_Movement_153E19
 	waitmovement 0
 	releaseall
 	return
@@ -55,22 +55,22 @@ VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C
 	walk_left
@@ -81,42 +81,42 @@ VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C
 	walk_up
 	delay_8
 	set_invisible
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37
 	lockall
-	fadescreen 1
-	drawcontestwinner 1
+	fadescreen FADE_TO_BLACK
+	showcontestwinner 1
 	releaseall
 	end
 
 VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
-	msgbox VerdanturfTown_ContestLobby_Text_177D6C, 2
+	msgbox VerdanturfTown_ContestLobby_Text_177D6C, MSGBOX_NPC
 	end
 
 VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76
-	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
-	giveitem_std ITEM_TM45_ATTRACT
+	msgbox VerdanturfTown_ContestLobby_Text_177DEC, MSGBOX_DEFAULT
+	giveitem ITEM_TM45_ATTRACT
 	compare VAR_RESULT, 0
-	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
+	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM45
 	release
 	end
 
 VerdanturfTown_ContestLobby_EventScript_153E76:: @ 8153E76
-	msgbox VerdanturfTown_ContestLobby_Text_177E98, 4
+	msgbox VerdanturfTown_ContestLobby_Text_177E98, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80
-	msgbox VerdanturfTown_ContestLobby_Text_177ECD, 2
+	msgbox VerdanturfTown_ContestLobby_Text_177ECD, MSGBOX_NPC
 	end
 
 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 4ec0af464..2479bb5e7 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
@@ -4,7 +4,7 @@ VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 815402F
 VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030
 	lock
 	faceplayer
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	switch VAR_RESULT
 	case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093
@@ -18,37 +18,37 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_154093:: @ 8154093
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C90, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C90, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_15409D:: @ 815409D
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C39, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178C39, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_1540A7:: @ 81540A7
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BFA, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BFA, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_1540B1:: @ 81540B1
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BC4, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178BC4, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_1540BB:: @ 81540BB
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B82, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B82, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_1540C5:: @ 81540C5
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B43, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178B43, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF:: @ 81540CF
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178AF2, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178AF2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -57,7 +57,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9
 	faceplayer
 	waitse
 	playmoncry SPECIES_PIKACHU, 0
-	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4
+	msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc
index 45a22ae93..242a79f9d 100644
--- a/data/maps/VerdanturfTown_House/scripts.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
@@ -2,9 +2,9 @@ VerdanturfTown_House_MapScripts:: @ 81540EC
 	.byte 0
 
 VerdanturfTown_House_EventScript_1540ED:: @ 81540ED
-	msgbox VerdanturfTown_House_Text_178D11, 2
+	msgbox VerdanturfTown_House_Text_178D11, MSGBOX_NPC
 	end
 
 VerdanturfTown_House_EventScript_1540F6:: @ 81540F6
-	msgbox VerdanturfTown_House_Text_178D8E, 2
+	msgbox VerdanturfTown_House_Text_178D8E, MSGBOX_NPC
 	end
diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index db72de227..c843d78ee 100644
--- a/data/maps/VerdanturfTown_Mart/scripts.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
@@ -4,10 +4,10 @@ VerdanturfTown_Mart_MapScripts:: @ 8153EBB
 VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC
 	lock
 	faceplayer
-	message VerdanturfTown_Mart_Text_1A0BE4
+	message Text_HowMayIServeYou
 	waitmessage
 	pokemart VerdanturfTown_Mart_Items
-	msgbox VerdanturfTown_Mart_Text_1A0C02, 4
+	msgbox Text_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
@@ -29,13 +29,13 @@ VerdanturfTown_Mart_Items:: @ 8153ED4
 	end
 
 VerdanturfTown_Mart_EventScript_153EEE:: @ 8153EEE
-	msgbox VerdanturfTown_Mart_Text_1781C9, 2
+	msgbox VerdanturfTown_Mart_Text_1781C9, MSGBOX_NPC
 	end
 
 VerdanturfTown_Mart_EventScript_153EF7:: @ 8153EF7
-	msgbox VerdanturfTown_Mart_Text_178240, 2
+	msgbox VerdanturfTown_Mart_Text_178240, MSGBOX_NPC
 	end
 
 VerdanturfTown_Mart_EventScript_153F00:: @ 8153F00
-	msgbox VerdanturfTown_Mart_Text_1782C0, 2
+	msgbox VerdanturfTown_Mart_Text_1782C0, MSGBOX_NPC
 	end
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 6aa3c746f..1c60fc1bb 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -1,25 +1,25 @@
 VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09
-	map_script 3, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F
+	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F
 	.byte 0
 
 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F
 	setrespawn HEAL_LOCATION_VERDANTURF_TOWN
-	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B
+	call Common_EventScript_UpdateBrineyLocation
 	end
 
 PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18
 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18
 	setvar VAR_0x800B, 1
-	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
+	call Common_EventScript_PkmnCenterNurse
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
 VerdanturfTown_PokemonCenter_1F_EventScript_153F26:: @ 8153F26
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_17831D, 2
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_17831D, MSGBOX_NPC
 	end
 
 VerdanturfTown_PokemonCenter_1F_EventScript_153F2F:: @ 8153F2F
-	msgbox VerdanturfTown_PokemonCenter_1F_Text_178389, 2
+	msgbox VerdanturfTown_PokemonCenter_1F_Text_178389, MSGBOX_NPC
 	end
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index ec52d45a7..e7ac09e6c 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
@@ -1,7 +1,7 @@
 VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8153F38
-	map_script 2, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88
-	map_script 4, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03
-	map_script 1, VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D03
+	map_script MAP_SCRIPT_ON_LOAD, VerdanturfTown_PokemonCenter_2F_MapScript1_1A3D32
 	.byte 0
 
 PacifidlogTown_PokemonCenter_2F_EventScript_153F48:: @ 8153F48
diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index 4410beaba..9d83597c1 100644
--- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
@@ -5,13 +5,13 @@ VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B
 	lock
 	faceplayer
 	goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73
-	msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1783F6, MSGBOX_DEFAULT
 	setflag FLAG_WALLY_SPEECH
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73
-	msgbox VerdanturfTown_WandasHouse_Text_178521, 4
+	msgbox VerdanturfTown_WandasHouse_Text_178521, MSGBOX_DEFAULT
 	release
 	end
 
@@ -20,22 +20,22 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D
 	faceplayer
 	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B
-	msgbox VerdanturfTown_WandasHouse_Text_17859A, 4
+	msgbox VerdanturfTown_WandasHouse_Text_17859A, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153F9B:: @ 8153F9B
-	msgbox VerdanturfTown_WandasHouse_Text_178683, 4
+	msgbox VerdanturfTown_WandasHouse_Text_178683, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153FA5:: @ 8153FA5
-	msgbox VerdanturfTown_WandasHouse_Text_1786B5, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1786B5, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF
-	msgbox VerdanturfTown_WandasHouse_Text_17886A, 2
+	msgbox VerdanturfTown_WandasHouse_Text_17886A, MSGBOX_NPC
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
@@ -43,17 +43,17 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8
 	faceplayer
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0
 	goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6
-	msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1787FB, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153FD6:: @ 8153FD6
-	msgbox VerdanturfTown_WandasHouse_Text_178739, 4
+	msgbox VerdanturfTown_WandasHouse_Text_178739, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0
-	msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1787FB, MSGBOX_DEFAULT
 	release
 	end
 
@@ -63,21 +63,21 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA
 	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011
-	msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1788B1, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_154011:: @ 8154011
-	msgbox VerdanturfTown_WandasHouse_Text_178983, 4
+	msgbox VerdanturfTown_WandasHouse_Text_178983, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_15401B:: @ 815401B
-	msgbox VerdanturfTown_WandasHouse_Text_1789DD, 4
+	msgbox VerdanturfTown_WandasHouse_Text_1789DD, MSGBOX_DEFAULT
 	release
 	end
 
 VerdanturfTown_WandasHouse_EventScript_154025:: @ 8154025
-	msgbox VerdanturfTown_WandasHouse_Text_178A47, 4
+	msgbox VerdanturfTown_WandasHouse_Text_178A47, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index 7247ce1d7..72debaf09 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -1,5 +1,5 @@
 VictoryRoad_1F_MapScripts:: @ 815DE83
-	map_script 3, VictoryRoad_1F_MapScript1_15DE89
+	map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_MapScript1_15DE89
 	.byte 0
 
 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
@@ -35,11 +35,11 @@ VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF
 	end
 
 VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
-	applymovement 255, VictoryRoad_1F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox VictoryRoad_1F_Text_19782B, 4
-	trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943
-	msgbox VictoryRoad_1F_Text_197967, 4
+	msgbox VictoryRoad_1F_Text_19782B, MSGBOX_DEFAULT
+	trainerbattle_no_intro TRAINER_WALLY_1, VictoryRoad_1F_Text_197943
+	msgbox VictoryRoad_1F_Text_197967, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
 	moveobjectoffscreen 4
 	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
@@ -59,7 +59,7 @@ VictoryRoad_1F_Movement_15DF07:: @ 815DF07
 	walk_up
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 VictoryRoad_1F_Movement_15DF13:: @ 815DF13
 	walk_up
@@ -72,7 +72,7 @@ VictoryRoad_1F_Movement_15DF13:: @ 815DF13
 	walk_up
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E
 	walk_up
@@ -84,36 +84,36 @@ VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E
 	walk_up
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 VictoryRoad_1F_EventScript_15DF28:: @ 815DF28
-	msgbox VictoryRoad_1F_Text_197967, 2
+	msgbox VictoryRoad_1F_Text_197967, MSGBOX_NPC
 	end
 
 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31
-	trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
+	trainerbattle_single TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, 1
 	goto_if_eq VictoryRoad_1F_EventScript_15DF58
-	msgbox VictoryRoad_1F_Text_197A47, 6
+	msgbox VictoryRoad_1F_Text_197A47, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_1F_EventScript_15DF58:: @ 815DF58
-	trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
-	msgbox VictoryRoad_1F_Text_197A47, 6
+	trainerbattle_rematch TRAINER_WALLY_3, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
+	msgbox VictoryRoad_1F_Text_197A47, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F
-	trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A
-	msgbox VictoryRoad_1F_Text_197B36, 6
+	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A
+	msgbox VictoryRoad_1F_Text_197B36, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_1F_EventScript_15DF86:: @ 815DF86
-	trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1
-	msgbox VictoryRoad_1F_Text_197BF7, 6
+	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1
+	msgbox VictoryRoad_1F_Text_197BF7, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D
-	trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D
-	msgbox VictoryRoad_1F_Text_197CAF, 6
+	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D
+	msgbox VictoryRoad_1F_Text_197CAF, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index 5667866d7..24430a300 100644
--- a/data/maps/VictoryRoad_B1F/scripts.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
@@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4
 	.byte 0
 
 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5
-	trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42
-	msgbox VictoryRoad_B1F_Text_197D5B, 6
+	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42
+	msgbox VictoryRoad_B1F_Text_197D5B, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC
-	trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8
-	msgbox VictoryRoad_B1F_Text_197E13, 6
+	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8
+	msgbox VictoryRoad_B1F_Text_197E13, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3
-	trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6
-	msgbox VictoryRoad_B1F_Text_197EB6, 6
+	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6
+	msgbox VictoryRoad_B1F_Text_197EB6, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 929af39e8..6416ce7f3 100644
--- a/data/maps/VictoryRoad_B2F/scripts.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
@@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA
 	.byte 0
 
 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB
-	trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46
-	msgbox VictoryRoad_B2F_Text_197F71, 6
+	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46
+	msgbox VictoryRoad_B2F_Text_197F71, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_B2F_EventScript_15E012:: @ 815E012
-	trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B
-	msgbox VictoryRoad_B2F_Text_198047, 6
+	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B
+	msgbox VictoryRoad_B2F_Text_198047, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_B2F_EventScript_15E029:: @ 815E029
-	trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD
-	msgbox VictoryRoad_B2F_Text_1980C8, 6
+	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD
+	msgbox VictoryRoad_B2F_Text_1980C8, MSGBOX_AUTOCLOSE
 	end
 
 VictoryRoad_B2F_EventScript_15E040:: @ 815E040
-	trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3
-	msgbox VictoryRoad_B2F_Text_1981BA, 6
+	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3
+	msgbox VictoryRoad_B2F_Text_1981BA, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 3f47da1da..31e5e8fcc 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -45,7 +45,7 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_clearflag               @ 0x2A
 	.4byte ScrCmd_checkflag               @ 0x2B
 	.4byte ScrCmd_initclock               @ 0x2C
-	.4byte ScrCmd_dodailyevents           @ 0x2D
+	.4byte ScrCmd_dotimebasedevents       @ 0x2D
 	.4byte ScrCmd_gettime                 @ 0x2E
 	.4byte ScrCmd_playse                  @ 0x2F
 	.4byte ScrCmd_waitse                  @ 0x30
@@ -68,15 +68,15 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_setholewarp             @ 0x41
 	.4byte ScrCmd_getplayerxy             @ 0x42
 	.4byte ScrCmd_getpartysize            @ 0x43
-	.4byte ScrCmd_giveitem                @ 0x44
-	.4byte ScrCmd_takeitem                @ 0x45
+	.4byte ScrCmd_additem                 @ 0x44
+	.4byte ScrCmd_removeitem              @ 0x45
 	.4byte ScrCmd_checkitemspace          @ 0x46
 	.4byte ScrCmd_checkitem               @ 0x47
 	.4byte ScrCmd_checkitemtype           @ 0x48
-	.4byte ScrCmd_givepcitem              @ 0x49
+	.4byte ScrCmd_addpcitem               @ 0x49
 	.4byte ScrCmd_checkpcitem             @ 0x4A
-	.4byte ScrCmd_givedecoration          @ 0x4B
-	.4byte ScrCmd_takedecoration          @ 0x4C
+	.4byte ScrCmd_adddecoration           @ 0x4B
+	.4byte ScrCmd_removedecoration        @ 0x4C
 	.4byte ScrCmd_checkdecor              @ 0x4D
 	.4byte ScrCmd_checkdecorspace         @ 0x4E
 	.4byte ScrCmd_applymovement           @ 0x4F
@@ -117,9 +117,9 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_drawbox                 @ 0x72
 	.4byte ScrCmd_erasebox                @ 0x73
 	.4byte ScrCmd_drawboxtext             @ 0x74
-	.4byte ScrCmd_drawmonpic              @ 0x75
-	.4byte ScrCmd_erasemonpic             @ 0x76
-	.4byte ScrCmd_drawcontestwinner       @ 0x77
+	.4byte ScrCmd_showmonpic              @ 0x75
+	.4byte ScrCmd_hidemonpic              @ 0x76
+	.4byte ScrCmd_showcontestwinner       @ 0x77
 	.4byte ScrCmd_braillemessage          @ 0x78
 	.4byte ScrCmd_givemon                 @ 0x79
 	.4byte ScrCmd_giveegg                 @ 0x7A
@@ -144,8 +144,8 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_showcontestresults      @ 0x8D
 	.4byte ScrCmd_contestlinktransfer     @ 0x8E
 	.4byte ScrCmd_random                  @ 0x8F
-	.4byte ScrCmd_givemoney               @ 0x90
-	.4byte ScrCmd_takemoney               @ 0x91
+	.4byte ScrCmd_addmoney                @ 0x90
+	.4byte ScrCmd_removemoney             @ 0x91
 	.4byte ScrCmd_checkmoney              @ 0x92
 	.4byte ScrCmd_showmoneybox            @ 0x93
 	.4byte ScrCmd_hidemoneybox            @ 0x94
@@ -180,8 +180,8 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_addelevmenuitem         @ 0xB1
 	.4byte ScrCmd_showelevmenu            @ 0xB2
 	.4byte ScrCmd_checkcoins              @ 0xB3
-	.4byte ScrCmd_givecoins               @ 0xB4
-	.4byte ScrCmd_takecoins               @ 0xB5
+	.4byte ScrCmd_addcoins                @ 0xB4
+	.4byte ScrCmd_removecoins             @ 0xB5
 	.4byte ScrCmd_setwildbattle           @ 0xB6
 	.4byte ScrCmd_dowildbattle            @ 0xB7
 	.4byte ScrCmd_setvaddress             @ 0xB8
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 1a72316bc..f7952540c 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -39,13 +39,13 @@ BerryTree_EventScript_1A1558:: @ 81A1558
 	end
 
 BerryTree_EventScript_1A1577:: @ 81A1577
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	closemessage
 	special Berry_FadeAndGoToBerryBagMenu
 	waitstate
 	compare VAR_ITEM_ID, 0
 	goto_if_eq BerryTree_EventScript_1A1593
-	takeitem VAR_ITEM_ID, 1
+	removeitem VAR_ITEM_ID, 1
 	call S_PlantBerryTree
 BerryTree_EventScript_1A1593:: @ 81A1593
 	release
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 56a03f346..0d84f3972 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -88,7 +88,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_1A3D88:: @ 81A3D88
 OldaleTown_PokemonCenter_2F_EventScript_1A3DB2:: @ 81A3DB2
 	special CloseLink
 	setvar VAR_CABLE_CLUB_STATE, 0
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
 	waitmovement 0
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3DD9
@@ -105,14 +105,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3DDA:: @ 81A3DDA
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
 	waitmovement 0
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
 	waitmovement 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3E0C:: @ 81A3E0C
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
 	waitmovement 0
 	return
 
@@ -130,7 +130,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
 	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A3E0C
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4361
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4361
 	waitmovement 0
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
@@ -139,7 +139,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
 	playse SE_PIN
 	message OldaleTown_PokemonCenter_2F_Text_1A4E79
 	waitmessage
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A4358
 	waitmovement 0
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
 	waitmovement 0
@@ -190,7 +190,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
 	case 127, OldaleTown_PokemonCenter_2F_EventScript_1A4319
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
@@ -226,13 +226,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
 	applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
 	closemessage
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	opendoor 5, 1
 	waitdooranim
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor 5, 1
 	waitdooranim
 	release
@@ -279,8 +279,8 @@ OldaleTown_PokemonCenter_2F_EventScript_1A403C:: @ 81A403C
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042
-	special CheckForAlivePartyMons
-	compare VAR_RESULT, 0
+	special HasEnoughMonsForDoubleBattle
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
 	goto_if_ne OldaleTown_PokemonCenter_2F_EventScript_1A4056
 	setvar VAR_0x8004, 2
 	return
@@ -359,7 +359,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
 	call OldaleTown_PokemonCenter_2F_EventScript_1A41BB
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -390,13 +390,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
 	applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
 	closemessage
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	opendoor 8, 1
 	waitdooranim
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor 8, 1
 	waitdooranim
 	release
@@ -452,7 +452,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A41FB:: @ 81A41FB
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4229
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
@@ -487,13 +487,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
 	applymovement VAR_LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
 	closemessage
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	opendoor 11, 1
 	waitdooranim
-	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435F
+	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_PokemonCenter_2F_Movement_1A435F
 	waitmovement 0
-	hideobjectat 255, MAP_PETALBURG_CITY
+	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor 11, 1
 	waitdooranim
 	release
@@ -554,43 +554,43 @@ OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4339:: @ 81A4339
-	msgbox OldaleTown_PokemonCenter_2F_Text_1A141C, 2
+	msgbox OldaleTown_PokemonCenter_2F_Text_1A141C, MSGBOX_NPC
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4342:: @ 81A4342
-	msgbox OldaleTown_PokemonCenter_2F_Text_1A13DF, 2
+	msgbox OldaleTown_PokemonCenter_2F_Text_1A13DF, MSGBOX_NPC
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B
-	msgbox OldaleTown_PokemonCenter_2F_Text_1A145C, 2
+	msgbox OldaleTown_PokemonCenter_2F_Text_1A145C, MSGBOX_NPC
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354
 	face_down
-	end_movement
+	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356
 	face_right
-	end_movement
+	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B
 	walk_right
 	walk_up
 	walk_up
-	end_movement
+	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F
 	walk_up
-	end_movement
+	step_end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
 	face_left
-	end_movement
+	step_end
 
 gUnknown_081A4363:: @ 81A4363
 	lockall
@@ -613,7 +613,7 @@ SingleBattleColosseum_EventScript_1A4379:: @ 81A4379
 	end
 
 DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_80C5568
 	waitstate
 	compare VAR_RESULT, 0
@@ -624,7 +624,7 @@ DoubleBattleColosseum_EventScript_1A4383:: @ 81A4383
 	end
 
 DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_80C5568
 	waitstate
 	compare VAR_RESULT, 0
@@ -635,7 +635,7 @@ DoubleBattleColosseum_EventScript_1A439E:: @ 81A439E
 	end
 
 DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_80C5568
 	waitstate
 	compare VAR_RESULT, 0
@@ -646,7 +646,7 @@ DoubleBattleColosseum_EventScript_1A43B9:: @ 81A43B9
 	end
 
 DoubleBattleColosseum_EventScript_1A43D4:: @ 81A43D4
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_80C5568
 	waitstate
 	compare VAR_RESULT, 0
@@ -685,7 +685,7 @@ TradeCenter_EventScript_1A43FA:: @ 81A43FA
 
 RecordCorner_EventScript_1A4418:: @ 81A4418
 	setvar VAR_0x8005, 0
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -693,7 +693,7 @@ RecordCorner_EventScript_1A4418:: @ 81A4418
 
 RecordCorner_EventScript_1A442D:: @ 81A442D
 	setvar VAR_0x8005, 1
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -701,7 +701,7 @@ RecordCorner_EventScript_1A442D:: @ 81A442D
 
 RecordCorner_EventScript_1A4442:: @ 81A4442
 	setvar VAR_0x8005, 2
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -709,7 +709,7 @@ RecordCorner_EventScript_1A4442:: @ 81A4442
 
 RecordCorner_EventScript_1A4457:: @ 81A4457
 	setvar VAR_0x8005, 3
-	special sub_80B929C
+	special RecordMixingPlayerSpotTriggered
 	waitstate
 	compare VAR_TEMP_1, 0
 	goto_if_ne RecordCorner_EventScript_1A446C
@@ -727,7 +727,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479
 	message CableClub_LookAtTrainerCard1
 	waitmessage
 	waitbuttonpress
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_8083BDC
 	waitstate
 	end
@@ -736,7 +736,7 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487
 	message CableClub_LookAtTrainerCard2
 	waitmessage
 	waitbuttonpress
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special sub_8083BDC
 	waitstate
 	end
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
new file mode 100644
index 000000000..0bc876575
--- /dev/null
+++ b/data/scripts/cave_hole.inc
@@ -0,0 +1,33 @@
+CaveHole_CheckFallDownHole:: @ 81C6BB5
+	map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
+	.2byte 0
+
+CaveHole_FixCrackedGround:: @ 81C6BBF
+	copyvar VAR_ICE_STEP_COUNT, 1
+	end
+
+EventScript_FallDownHole:: @ 81C6BC5
+	lockall
+	delay 20
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
+	warphole MAP_UNDEFINED
+	waitstate
+	end
+
+EventScript_FallDownHoleMtPyre:: @ 81C6BDE
+	lockall
+	delay 20
+	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
+	special DoFallWarp
+	waitstate
+	end
+
+Movement_SetInvisible:: @ 81C6BF7
+	set_invisible
+	step_end
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
new file mode 100644
index 000000000..0ec097533
--- /dev/null
+++ b/data/scripts/cave_of_origin.inc
@@ -0,0 +1,43 @@
+CaveOfOrigin_EventScript_LegendaryCry:: @ 81A04A0
+	lockall
+	waitse
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
+	waitmoncry
+	setvar VAR_TEMP_5, 1
+	releaseall
+	end
+
+CaveOfOrigin_EventScript_Shake1:: @ 81A04AF
+	lockall
+	setvar VAR_TEMP_1, 1
+	goto CaveOfOrigin_EventScript_Shake
+	end
+
+CaveOfOrigin_EventScript_Shake2:: @ 81A04BB
+	lockall
+	setvar VAR_TEMP_2, 1
+	goto CaveOfOrigin_EventScript_Shake
+	end
+
+@ Unused
+CaveOfOrigin_EventScript_Shake3:: @ 81A04C7
+	lockall
+	setvar VAR_TEMP_3, 1
+	goto CaveOfOrigin_EventScript_Shake
+	end
+
+CaveOfOrigin_EventScript_Shake:: @ 81A04D3
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 1
+	special ShakeCamera
+	waitstate
+	releaseall
+	end
+
+CaveOfOrigin_EventScript_DisableTriggers:: @ 81A04E3
+	setvar VAR_TEMP_1, 1
+	setvar VAR_TEMP_2, 1
+	setvar VAR_TEMP_3, 1
+	setvar VAR_TEMP_4, 1
+	setvar VAR_TEMP_5, 1
+	return
diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc
new file mode 100644
index 000000000..66df09e02
--- /dev/null
+++ b/data/scripts/check_furniture.inc
@@ -0,0 +1,27 @@
+EventScript_PictureBookshelf:: @ 81A085B
+    msgbox Text_PictureBookshelf, MSGBOX_SIGN
+    end
+
+EventScript_Bookshelf:: @ 81A0864
+    msgbox Text_Bookshelf, MSGBOX_SIGN
+    end
+
+EventScript_PokemonCenterBookshelf:: @ 81A086D
+    msgbox Text_PokemonCenterBookshelf, MSGBOX_SIGN
+    end
+
+EventScript_Vase:: @ 81A0876
+    msgbox Text_Vase, MSGBOX_SIGN
+    end
+
+EventScript_EmptyTrashCan:: @ 81A087F
+    msgbox Text_EmptyTrashCan, MSGBOX_SIGN
+    end
+
+EventScript_ShopShelf:: @ 81A0888
+    msgbox Text_ShopShelf, MSGBOX_SIGN
+    end
+
+EventScript_Blueprint:: @ 81A0891
+    msgbox Text_Blueprint, MSGBOX_SIGN
+    end
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 2a63d97f8..a99c33492 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_1A4E92:: @ 81A4E92
 	goto_if_ne FallarborTown_ContestLobby_EventScript_1A4F4E
 	goto_if_set FLAG_TEMP_1, FallarborTown_ContestLobby_EventScript_1A4F8F
 	bufferstdstring 0, VAR_0x800B
-	msgbox FallarborTown_ContestLobby_Text_1A5DFC, 4
+	msgbox FallarborTown_ContestLobby_Text_1A5DFC, MSGBOX_DEFAULT
 	checkitem ITEM_CONTEST_PASS, 1
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EE1
@@ -26,7 +26,7 @@ FallarborTown_ContestLobby_EventScript_1A4EDD:: @ 81A4EDD
 FallarborTown_ContestLobby_EventScript_1A4EE1:: @ 81A4EE1
 	compare VAR_CONTEST_RANK, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4EF6
-	msgbox FallarborTown_ContestLobby_Text_1A6340, 4
+	msgbox FallarborTown_ContestLobby_Text_1A6340, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -34,33 +34,33 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6
 	msgbox FallarborTown_ContestLobby_Text_1A64F4, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F13
-	msgbox FallarborTown_ContestLobby_Text_1A65EA, 4
+	msgbox FallarborTown_ContestLobby_Text_1A65EA, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13
 	goto_if_set FLAG_RECEIVED_CONTEST_PASS, FallarborTown_ContestLobby_EventScript_1A4F44
-	msgbox FallarborTown_ContestLobby_Text_1A6583, 4
-	giveitem_std ITEM_CONTEST_PASS
+	msgbox FallarborTown_ContestLobby_Text_1A6583, MSGBOX_DEFAULT
+	giveitem ITEM_CONTEST_PASS
 	setflag FLAG_RECEIVED_CONTEST_PASS
 	setflag FLAG_TEMP_1
-	msgbox FallarborTown_ContestLobby_Text_1A5E98, 4
+	msgbox FallarborTown_ContestLobby_Text_1A5E98, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A4F8F
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F44:: @ 81A4F44
-	msgbox FallarborTown_ContestLobby_Text_1A6590, 4
+	msgbox FallarborTown_ContestLobby_Text_1A6590, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F4E:: @ 81A4F4E
-	msgbox FallarborTown_ContestLobby_Text_1A685A, 4
+	msgbox FallarborTown_ContestLobby_Text_1A685A, MSGBOX_DEFAULT
 	switch VAR_CONTEST_PRIZE_PICKUP
 	case 4, FallarborTown_ContestLobby_EventScript_1A4F67
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86
 	setvar VAR_CONTEST_PRIZE_PICKUP, 0
@@ -69,7 +69,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F86:: @ 81A4F86
-	msgbox FallarborTown_ContestLobby_Text_1A68C6, 2
+	msgbox FallarborTown_ContestLobby_Text_1A68C6, MSGBOX_NPC
 	end
 
 FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F
@@ -96,27 +96,27 @@ FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC
 	end
 
 FallarborTown_ContestLobby_EventScript_1A5014:: @ 81A5014
-	msgbox FallarborTown_ContestLobby_Text_1A5E98, 4
+	msgbox FallarborTown_ContestLobby_Text_1A5E98, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A4FCC
 	end
 
 FallarborTown_ContestLobby_EventScript_1A5022:: @ 81A5022
-	msgbox FallarborTown_ContestLobby_Text_1A609B, 4
+	msgbox FallarborTown_ContestLobby_Text_1A609B, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A4FCC
 	end
 
 FallarborTown_ContestLobby_EventScript_1A5030:: @ 81A5030
-	msgbox FallarborTown_ContestLobby_Text_1A613F, 4
+	msgbox FallarborTown_ContestLobby_Text_1A613F, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A4FCC
 	end
 
 FallarborTown_ContestLobby_EventScript_1A503E:: @ 81A503E
-	msgbox FallarborTown_ContestLobby_Text_188559, 4
+	msgbox FallarborTown_ContestLobby_Text_188559, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048
-	msgbox FallarborTown_ContestLobby_Text_1A6319, 4
+	msgbox FallarborTown_ContestLobby_Text_1A6319, MSGBOX_DEFAULT
 	choosecontestmon
 	compare VAR_0x8004, 255
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A5097
@@ -145,7 +145,7 @@ FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097
 	end
 
 FallarborTown_ContestLobby_EventScript_1A50C8:: @ 81A50C8
-	msgbox FallarborTown_ContestLobby_Text_1A664A, 4
+	msgbox FallarborTown_ContestLobby_Text_1A664A, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A5048
 	release
 	end
@@ -165,19 +165,19 @@ FallarborTown_ContestLobby_EventScript_1A50FB:: @ 81A50FB
 	end
 
 FallarborTown_ContestLobby_EventScript_1A511F:: @ 81A511F
-	msgbox FallarborTown_ContestLobby_Text_1A669F, 4
+	msgbox FallarborTown_ContestLobby_Text_1A669F, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A5048
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1A512E:: @ 81A512E
-	msgbox FallarborTown_ContestLobby_Text_1A66DC, 4
+	msgbox FallarborTown_ContestLobby_Text_1A66DC, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1A5048
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D
-	msgbox FallarborTown_ContestLobby_Text_1A67C1, 4
+	msgbox FallarborTown_ContestLobby_Text_1A67C1, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
@@ -270,7 +270,7 @@ LinkContestRoom1_EventScript_1A5245:: @ 81A5245
 LinkContestRoom1_EventScript_1A525F:: @ 81A525F
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5273
-	msgbox LinkContestRoom1_Text_1A68F0, 3
+	msgbox LinkContestRoom1_Text_1A68F0, MSGBOX_SIGN
 	return
 
 LinkContestRoom1_EventScript_1A5273:: @ 81A5273
@@ -385,7 +385,7 @@ LinkContestRoom1_EventScript_1A5377:: @ 81A5377
 LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A53C7
-	msgbox LinkContestRoom1_Text_1A6A1F, 4
+	msgbox LinkContestRoom1_Text_1A6A1F, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7
@@ -782,7 +782,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE
 LinkContestRoom1_EventScript_1A5930:: @ 81A5930
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5944
-	msgbox LinkContestRoom1_Text_1A6AF5, 3
+	msgbox LinkContestRoom1_Text_1A6AF5, MSGBOX_SIGN
 	return
 
 LinkContestRoom1_EventScript_1A5944:: @ 81A5944
@@ -809,7 +809,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
 LinkContestRoom1_EventScript_1A5984:: @ 81A5984
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5998
-	msgbox LinkContestRoom1_Text_1A6C06, 4
+	msgbox LinkContestRoom1_Text_1A6C06, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A5998:: @ 81A5998
@@ -821,7 +821,7 @@ LinkContestRoom1_EventScript_1A5998:: @ 81A5998
 LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A59B6
-	msgbox LinkContestRoom1_Text_1A6C21, 4
+	msgbox LinkContestRoom1_Text_1A6C21, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6
@@ -833,7 +833,7 @@ LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6
 LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A59D4
-	msgbox LinkContestRoom1_Text_1A6C9D, 4
+	msgbox LinkContestRoom1_Text_1A6C9D, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4
@@ -845,7 +845,7 @@ LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4
 LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A59F2
-	msgbox LinkContestRoom1_Text_1A6D16, 4
+	msgbox LinkContestRoom1_Text_1A6D16, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2
@@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_1A5A49:: @ 81A5A49
 LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75
 	compare VAR_CONTEST_LOCATION, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5A89
-	msgbox LinkContestRoom1_Text_1A6D3C, 4
+	msgbox LinkContestRoom1_Text_1A6D3C, MSGBOX_DEFAULT
 	return
 
 LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89
@@ -995,7 +995,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 	goto_if_eq LinkContestRoom1_EventScript_1A5C4C
 	call LinkContestRoom1_EventScript_1A5C12
 	goto_if_set FLAG_TEMP_2, LinkContestRoom1_EventScript_1A5BF6
-	msgbox LinkContestRoom1_Text_1A6DC5, 3
+	msgbox LinkContestRoom1_Text_1A6DC5, MSGBOX_SIGN
 	waitmessage
 	call LinkContestRoom1_EventScript_1A5C7F
 	call LinkContestRoom1_EventScript_1A5CE5
@@ -1010,7 +1010,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 
 LinkContestRoom1_EventScript_1A5BF6:: @ 81A5BF6
 	incrementgamestat GAME_STAT_WON_CONTEST
-	msgbox LinkContestRoom1_Text_1A6DF1, 3
+	msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN
 	delay 90
 	special sub_80C4CF8
 	compare VAR_0x8004, 1
@@ -1110,7 +1110,7 @@ LinkContestRoom1_EventScript_1A5CE5:: @ 81A5CE5
 	special ScrSpecial_GetContestWinnerIdx
 	compare VAR_0x8005, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5CFC
-	msgbox LinkContestRoom1_Text_1A6DF1, 3
+	msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN
 	return
 
 LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
@@ -1122,19 +1122,19 @@ LinkContestRoom1_EventScript_1A5CFC:: @ 81A5CFC
 	goto_if_eq LinkContestRoom1_EventScript_1A5D5B
 	compare VAR_CONTEST_RANK, 3
 	goto_if_eq LinkContestRoom1_EventScript_1A5D3B
-	msgbox LinkContestRoom1_Text_1A6DF1, 3
+	msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN
 	return
 
 LinkContestRoom1_EventScript_1A5D2D:: @ 81A5D2D
-	msgbox LinkContestRoom1_Text_1A6E1F, 3
+	msgbox LinkContestRoom1_Text_1A6E1F, MSGBOX_SIGN
 	setvar VAR_CONTEST_PRIZE_PICKUP, 4
 	return
 
 LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B
-	giveitem_std ITEM_LUXURY_BALL
+	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, 0
 	goto_if_eq LinkContestRoom1_EventScript_1A5D2D
-	msgbox LinkContestRoom1_Text_1A6DF1, 3
+	msgbox LinkContestRoom1_Text_1A6DF1, MSGBOX_SIGN
 	return
 
 LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
@@ -1142,76 +1142,76 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
-	msgbox LinkContestRoom1_Text_1A6D6A, 4
+	msgbox LinkContestRoom1_Text_1A6D6A, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	msgbox LinkContestRoom1_Text_1A6D96, 4
+	msgbox LinkContestRoom1_Text_1A6D96, MSGBOX_DEFAULT
 	waitfanfare
 	special ScrSpecial_GetContestWinnerNick
-	msgbox LinkContestRoom1_Text_1A6DAC, 4
+	msgbox LinkContestRoom1_Text_1A6DAC, MSGBOX_DEFAULT
 	releaseall
 	return
 
 LinkContestRoom1_Movement_1A5D85:: @ 81A5D85
 	walk_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D87:: @ 81A5D87
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D
 	emote_heart
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D91:: @ 81A5D91
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D95:: @ 81A5D95
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D99:: @ 81A5D99
 	walk_up
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C
 	delay_16
 	delay_16
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5
 	walk_left
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
 	walk_left
@@ -1219,54 +1219,54 @@ LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
 	walk_left
 	walk_left
 	walk_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF
 	face_left
 	delay_16
 	face_original_direction
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3
 	face_up
 	delay_16
 	face_original_direction
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7
 	face_right
 	delay_16
 	face_original_direction
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB
 	face_down
 	delay_16
 	face_original_direction
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF
 	face_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1
 	face_up
 	delay_16
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
 	walk_up
@@ -1274,7 +1274,7 @@ LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
 	walk_fast_left
@@ -1282,31 +1282,31 @@ LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
 	walk_fast_left
 	walk_fast_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE
 	walk_fast_left
 	walk_fast_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2
 	walk_up
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6
 	walk_fast_right
 	walk_fast_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
 	walk_up
@@ -1314,7 +1314,7 @@ LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
 	walk_fast_right
@@ -1322,14 +1322,14 @@ LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
 	walk_fast_right
 	walk_fast_down
 	walk_in_place_fastest_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6
 	walk_right
 	walk_right
 	walk_up
-	end_movement
+	step_end
 
 LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA
 	walk_up
-	end_movement
+	step_end
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 1a7e56cfd..2eb32cc71 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -9,7 +9,7 @@ Route117_EventScript_1B222D:: @ 81B222D
 	goto_if_eq Route117_EventScript_1B22E7
 	compare VAR_RESULT, 3
 	goto_if_eq Route117_EventScript_1B22FE
-	msgbox Route117_Text_1B25CB, 4
+	msgbox Route117_Text_1B25CB, MSGBOX_DEFAULT
 	release
 	end
 
@@ -20,7 +20,7 @@ Route117_EventScript_1B2262:: @ 81B2262
 	msgbox Route117_Text_1B28C4, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_1B2298
-	msgbox Route117_Text_1B2745, 4
+	msgbox Route117_Text_1B2745, MSGBOX_DEFAULT
 	clearflag FLAG_PENDING_DAYCARE_EGG
 	special RejectEggFromDayCare
 	release
@@ -30,7 +30,7 @@ Route117_EventScript_1B2298:: @ 81B2298
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare VAR_RESULT, 6
 	goto_if_ne Route117_EventScript_1B22B2
-	msgbox Route117_Text_1B2766, 4
+	msgbox Route117_Text_1B2766, MSGBOX_DEFAULT
 	release
 	end
 
@@ -40,7 +40,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
 	waitfanfare
 	waitmessage
 	waitbuttonpress
-	msgbox Route117_Text_1B27CD, 4
+	msgbox Route117_Text_1B27CD, MSGBOX_DEFAULT
 	special GiveEggFromDaycare
 	clearflag FLAG_PENDING_DAYCARE_EGG
 	release
@@ -53,12 +53,12 @@ Route117_EventScript_1B22CD:: @ 81B22CD
 	return
 
 Route117_EventScript_1B22DE:: @ 81B22DE
-	msgbox Route117_Text_1B27E3, 4
+	msgbox Route117_Text_1B27E3, MSGBOX_DEFAULT
 	return
 
 Route117_EventScript_1B22E7:: @ 81B22E7
 	special GetDaycareMonNicknames
-	msgbox Route117_Text_1B2710, 4
+	msgbox Route117_Text_1B2710, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
 	call Route117_EventScript_1B22CD
 	release
@@ -66,7 +66,7 @@ Route117_EventScript_1B22E7:: @ 81B22E7
 
 Route117_EventScript_1B22FE:: @ 81B22FE
 	special GetDaycareMonNicknames
-	msgbox Route117_Text_1B2897, 4
+	msgbox Route117_Text_1B2897, MSGBOX_DEFAULT
 	special SetDaycareCompatibilityString
 	special ShowFieldMessageStringVar4
 	waitmessage
@@ -91,7 +91,7 @@ Route117_PokemonDayCare_EventScript_1B2327:: @ 81B2327
 	msgbox Route117_PokemonDayCare_Text_1B28F2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B236C
-	msgbox Route117_PokemonDayCare_Text_1B2A14, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A14, MSGBOX_DEFAULT
 	release
 	end
 
@@ -99,8 +99,8 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
 	specialvar VAR_RESULT, GetNumValidDaycarePartyMons
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B23F3
-	msgbox Route117_PokemonDayCare_Text_1B2947, 4
-	fadescreen 1
+	msgbox Route117_PokemonDayCare_Text_1B2947, MSGBOX_DEFAULT
+	fadescreen FADE_TO_BLACK
 	special ChooseSendDaycareMon
 	waitstate
 	compare VAR_0x8004, 255
@@ -111,7 +111,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
 	specialvar VAR_0x8005, GetSelectedDaycareMonNickname
 	waitse
 	playmoncry VAR_0x8005, 0
-	msgbox Route117_PokemonDayCare_Text_1B296E, 4
+	msgbox Route117_PokemonDayCare_Text_1B296E, MSGBOX_DEFAULT
 	waitmoncry
 	special StoreSelectedPokemonInDaycare
 	incrementgamestat GAME_STAT_USED_DAYCARE
@@ -122,7 +122,7 @@ Route117_PokemonDayCare_EventScript_1B236C:: @ 81B236C
 	end
 
 Route117_PokemonDayCare_EventScript_1B23D0:: @ 81B23D0
-	msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
 	release
 	end
 
@@ -134,22 +134,22 @@ Route117_PokemonDayCare_EventScript_1B23DA:: @ 81B23DA
 	end
 
 Route117_PokemonDayCare_EventScript_1B23F3:: @ 81B23F3
-	msgbox Route117_PokemonDayCare_Text_1B2BBB, 4
+	msgbox Route117_PokemonDayCare_Text_1B2BBB, MSGBOX_DEFAULT
 	release
 	end
 
 Route117_PokemonDayCare_EventScript_1B23FD:: @ 81B23FD
-	msgbox Route117_PokemonDayCare_Text_1B2C17, 4
+	msgbox Route117_PokemonDayCare_Text_1B2C17, MSGBOX_DEFAULT
 	release
 	end
 
 Route117_PokemonDayCare_EventScript_1B2407:: @ 81B2407
-	msgbox Route117_PokemonDayCare_Text_1B29F4, 4
+	msgbox Route117_PokemonDayCare_Text_1B29F4, MSGBOX_DEFAULT
 	release
 	end
 
 Route117_PokemonDayCare_EventScript_1B2411:: @ 81B2411
-	msgbox Route117_PokemonDayCare_Text_1B2ACC, 4
+	msgbox Route117_PokemonDayCare_Text_1B2ACC, MSGBOX_DEFAULT
 	return
 
 Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
@@ -159,7 +159,7 @@ Route117_PokemonDayCare_EventScript_1B241A:: @ 81B241A
 	return
 
 Route117_PokemonDayCare_EventScript_1B242B:: @ 81B242B
-	msgbox Route117_PokemonDayCare_Text_1B2A88, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_1B241A
 	msgbox Route117_PokemonDayCare_Text_1B29AD, MSGBOX_YESNO
@@ -199,7 +199,7 @@ Route117_PokemonDayCare_EventScript_1B24C4:: @ 81B24C4
 	specialvar VAR_RESULT, HasEnoughMoneyFor
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B24DE
-	msgbox Route117_PokemonDayCare_Text_1B2A30, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A30, MSGBOX_DEFAULT
 	release
 	end
 
@@ -209,10 +209,10 @@ Route117_PokemonDayCare_EventScript_1B24DE:: @ 81B24DE
 	specialvar VAR_RESULT, TakePokemonFromDaycare
 	special PayMoneyFor
 	playse SE_REGI
-	msgbox Route117_PokemonDayCare_Text_1B2B75, 4
+	msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT
 	waitse
 	playmoncry VAR_RESULT, 0
-	msgbox Route117_PokemonDayCare_Text_1B2B93, 4
+	msgbox Route117_PokemonDayCare_Text_1B2B93, MSGBOX_DEFAULT
 	waitmoncry
 	specialvar VAR_RESULT, GetDaycareState
 	compare VAR_RESULT, 2
@@ -228,7 +228,7 @@ Route117_PokemonDayCare_EventScript_1B2520:: @ 81B2520
 	end
 
 Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539
-	msgbox Route117_PokemonDayCare_Text_1B2AEF, 4
+	msgbox Route117_PokemonDayCare_Text_1B2AEF, MSGBOX_DEFAULT
 	release
 	end
 
@@ -252,13 +252,13 @@ Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
 	face_down
 	set_visible
 	walk_slow_down
-	end_movement
+	step_end
 
 @ 81B2557
 	end
 
 Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
-	msgbox Route117_PokemonDayCare_Text_1B2A88, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A88, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_1B241A
 	setvar VAR_0x8004, 1
@@ -266,7 +266,7 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	msgbox Route117_PokemonDayCare_Text_1B2BF6, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B2469
-	msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+	msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
 	release
 	end
 
@@ -277,14 +277,14 @@ Route117_PokemonDayCare_EventScript_1B2558:: @ 81B2558
 	goto_if_eq Route117_PokemonDayCare_EventScript_1B23D0
 	copyvar VAR_0x8004, VAR_RESULT
 	specialvar VAR_RESULT, TakePokemonFromDaycare
-	msgbox Route117_PokemonDayCare_Text_1B2B75, 4
-	msgbox Route117_PokemonDayCare_Text_1B2A76, 4
+	msgbox Route117_PokemonDayCare_Text_1B2B75, MSGBOX_DEFAULT
+	msgbox Route117_PokemonDayCare_Text_1B2A76, MSGBOX_DEFAULT
 	release
 	end
 
 S_EggHatch:: @ 81B25BC
 	lockall
-	msgbox UnknownString_81B2C68, 4
+	msgbox UnknownString_81B2C68, MSGBOX_DEFAULT
 	special EggHatch
 	waitstate
 	releaseall
diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index c11e78a8d..c683c90e0 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -2,14 +2,14 @@
 
 DebugScript_081C1CFE:: @ 81C1CFE
 	setflag FLAG_SYS_GAME_CLEAR
-	call EverGrandeCity_HallOfFame_EventScript_19FC13
+	call EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags
 	end
 
 DebugScript_081C1D07:: @ 81C1D07
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq DebugScript_081C1D1D
-	giveitem ITEM_COIN_CASE, 1
+	additem ITEM_COIN_CASE, 1
 	end
 
 DebugScript_081C1D1D:: @ 81C1D1D
@@ -26,7 +26,7 @@ DebugScript_081C1D24:: @ 81C1D24
 	end
 
 DebugScript_081C1D2A:: @ 81C1D2A
-	giveitem ITEM_SS_TICKET, 1
+	additem ITEM_SS_TICKET, 1
 	goto DebugScript_081C1CFE
 
 DebugScript_081C1D34:: @ 81C1D34
@@ -43,411 +43,411 @@ DebugScript_081C1D45:: @ 81C1D45
 	end
 
 DebugScript_081C1D46:: @ 81C1D46
-	giveitem ITEM_POTION, 99
-	giveitem ITEM_ANTIDOTE, 99
-	giveitem ITEM_BURN_HEAL, 99
-	giveitem ITEM_ICE_HEAL, 99
-	giveitem ITEM_AWAKENING, 99
-	giveitem ITEM_PARALYZE_HEAL, 99
-	giveitem ITEM_FULL_RESTORE, 99
-	giveitem ITEM_MAX_POTION, 99
-	giveitem ITEM_HYPER_POTION, 99
-	giveitem ITEM_SUPER_POTION, 99
-	giveitem ITEM_FULL_HEAL, 99
-	giveitem ITEM_REVIVE, 99
-	giveitem ITEM_MAX_REVIVE, 99
-	giveitem ITEM_FRESH_WATER, 99
-	giveitem ITEM_SODA_POP, 99
-	giveitem ITEM_LEMONADE, 99
-	giveitem ITEM_MOOMOO_MILK, 99
-	giveitem ITEM_ENERGY_POWDER, 99
-	giveitem ITEM_ENERGY_ROOT, 99
-	giveitem ITEM_HEAL_POWDER, 99
-	giveitem ITEM_ORANGE_MAIL, 92
-	giveitem ITEM_RETRO_MAIL, 94
-	giveitem ITEM_POTION, 89
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_ULTRA_BALL, 99
-	giveitem ITEM_GREAT_BALL, 99
-	giveitem ITEM_POKE_BALL, 99
-	giveitem ITEM_NET_BALL, 99
-	giveitem ITEM_DIVE_BALL, 99
-	giveitem ITEM_NEST_BALL, 99
-	giveitem ITEM_REPEAT_BALL, 99
-	giveitem ITEM_TIMER_BALL, 99
-	giveitem ITEM_LUXURY_BALL, 99
-	giveitem ITEM_PREMIER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_MASTER_BALL, 99
-	giveitem ITEM_GREAT_BALL, 79
-	giveitem ITEM_ULTRA_BALL, 84
-	giveitem ITEM_POKE_BALL, 89
-	giveitem ITEM_MASTER_BALL, 74
-	giveitem ITEM_TM01_FOCUS_PUNCH, 99
-	giveitem ITEM_TM02_DRAGON_CLAW, 99
-	giveitem ITEM_TM03_WATER_PULSE, 99
-	giveitem ITEM_TM04_CALM_MIND, 99
-	giveitem ITEM_TM05_ROAR, 99
-	giveitem ITEM_TM06_TOXIC, 99
-	giveitem ITEM_TM07_HAIL, 99
-	giveitem ITEM_TM08_BULK_UP, 99
-	giveitem ITEM_TM09_BULLET_SEED, 99
-	giveitem ITEM_TM10_HIDDEN_POWER, 99
-	giveitem ITEM_TM11_SUNNY_DAY, 99
-	giveitem ITEM_TM12_TAUNT, 99
-	giveitem ITEM_TM13_ICE_BEAM, 99
-	giveitem ITEM_TM14_BLIZZARD, 99
-	giveitem ITEM_TM15_HYPER_BEAM, 99
-	giveitem ITEM_TM16_LIGHT_SCREEN, 99
-	giveitem ITEM_TM17_PROTECT, 99
-	giveitem ITEM_TM18_RAIN_DANCE, 99
-	giveitem ITEM_TM19_GIGA_DRAIN, 99
-	giveitem ITEM_TM20_SAFEGUARD, 99
-	giveitem ITEM_TM21_FRUSTRATION, 99
-	giveitem ITEM_TM22_SOLARBEAM, 99
-	giveitem ITEM_TM23_IRON_TAIL, 99
-	giveitem ITEM_TM24_THUNDERBOLT, 99
-	giveitem ITEM_TM25_THUNDER, 99
-	giveitem ITEM_TM26_EARTHQUAKE, 99
-	giveitem ITEM_TM27_RETURN, 99
-	giveitem ITEM_TM28_DIG, 99
-	giveitem ITEM_TM29_PSYCHIC, 99
-	giveitem ITEM_TM30_SHADOW_BALL, 99
-	giveitem ITEM_TM31_BRICK_BREAK, 99
-	giveitem ITEM_TM32_DOUBLE_TEAM, 99
-	giveitem ITEM_TM33_REFLECT, 99
-	giveitem ITEM_TM34_SHOCK_WAVE, 99
-	giveitem ITEM_TM35_FLAMETHROWER, 99
-	giveitem ITEM_TM36_SLUDGE_BOMB, 99
-	giveitem ITEM_TM37_SANDSTORM, 99
-	giveitem ITEM_TM38_FIRE_BLAST, 99
-	giveitem ITEM_TM39_ROCK_TOMB, 99
-	giveitem ITEM_TM40_AERIAL_ACE, 99
-	giveitem ITEM_TM41_TORMENT, 99
-	giveitem ITEM_TM42_FACADE, 99
-	giveitem ITEM_TM43_SECRET_POWER, 99
-	giveitem ITEM_TM44_REST, 99
-	giveitem ITEM_TM45_ATTRACT, 99
-	giveitem ITEM_TM46_THIEF, 99
-	giveitem ITEM_TM47_STEEL_WING, 99
-	giveitem ITEM_TM48_SKILL_SWAP, 99
-	giveitem ITEM_TM49_SNATCH, 99
-	giveitem ITEM_TM50_OVERHEAT, 99
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 200
-	giveitem ITEM_CHERI_BERRY, 199
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 200
-	giveitem ITEM_CHESTO_BERRY, 199
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 200
-	giveitem ITEM_PECHA_BERRY, 199
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 200
-	giveitem ITEM_RAWST_BERRY, 199
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 200
-	giveitem ITEM_ASPEAR_BERRY, 199
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 200
-	giveitem ITEM_LEPPA_BERRY, 199
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 200
-	giveitem ITEM_ORAN_BERRY, 199
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 200
-	giveitem ITEM_PERSIM_BERRY, 199
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 200
-	giveitem ITEM_LUM_BERRY, 199
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 200
-	giveitem ITEM_SITRUS_BERRY, 199
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 200
-	giveitem ITEM_FIGY_BERRY, 199
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 200
-	giveitem ITEM_WIKI_BERRY, 199
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 200
-	giveitem ITEM_MAGO_BERRY, 199
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 200
-	giveitem ITEM_AGUAV_BERRY, 199
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 200
-	giveitem ITEM_IAPAPA_BERRY, 199
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 200
-	giveitem ITEM_RAZZ_BERRY, 199
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 200
-	giveitem ITEM_BLUK_BERRY, 199
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 200
-	giveitem ITEM_NANAB_BERRY, 199
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 200
-	giveitem ITEM_WEPEAR_BERRY, 199
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 200
-	giveitem ITEM_PINAP_BERRY, 199
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 200
-	giveitem ITEM_POMEG_BERRY, 199
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 200
-	giveitem ITEM_KELPSY_BERRY, 199
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 200
-	giveitem ITEM_QUALOT_BERRY, 199
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 200
-	giveitem ITEM_HONDEW_BERRY, 199
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 200
-	giveitem ITEM_GREPA_BERRY, 199
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 200
-	giveitem ITEM_TAMATO_BERRY, 199
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 200
-	giveitem ITEM_CORNN_BERRY, 199
-	giveitem ITEM_MAGOST_BERRY, 999
-	giveitem ITEM_RABUTA_BERRY, 999
-	giveitem ITEM_NOMEL_BERRY, 999
-	giveitem ITEM_SPELON_BERRY, 999
-	giveitem ITEM_PAMTRE_BERRY, 999
-	giveitem ITEM_WATMEL_BERRY, 999
-	giveitem ITEM_DURIN_BERRY, 999
-	giveitem ITEM_BELUE_BERRY, 999
-	giveitem ITEM_LIECHI_BERRY, 999
-	giveitem ITEM_GANLON_BERRY, 999
-	giveitem ITEM_SALAC_BERRY, 999
-	giveitem ITEM_PETAYA_BERRY, 999
-	giveitem ITEM_APICOT_BERRY, 999
-	giveitem ITEM_LANSAT_BERRY, 999
-	giveitem ITEM_STARF_BERRY, 999
-	giveitem ITEM_ENIGMA_BERRY, 999
+	additem ITEM_POTION, 99
+	additem ITEM_ANTIDOTE, 99
+	additem ITEM_BURN_HEAL, 99
+	additem ITEM_ICE_HEAL, 99
+	additem ITEM_AWAKENING, 99
+	additem ITEM_PARALYZE_HEAL, 99
+	additem ITEM_FULL_RESTORE, 99
+	additem ITEM_MAX_POTION, 99
+	additem ITEM_HYPER_POTION, 99
+	additem ITEM_SUPER_POTION, 99
+	additem ITEM_FULL_HEAL, 99
+	additem ITEM_REVIVE, 99
+	additem ITEM_MAX_REVIVE, 99
+	additem ITEM_FRESH_WATER, 99
+	additem ITEM_SODA_POP, 99
+	additem ITEM_LEMONADE, 99
+	additem ITEM_MOOMOO_MILK, 99
+	additem ITEM_ENERGY_POWDER, 99
+	additem ITEM_ENERGY_ROOT, 99
+	additem ITEM_HEAL_POWDER, 99
+	additem ITEM_ORANGE_MAIL, 92
+	additem ITEM_RETRO_MAIL, 94
+	additem ITEM_POTION, 89
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_ULTRA_BALL, 99
+	additem ITEM_GREAT_BALL, 99
+	additem ITEM_POKE_BALL, 99
+	additem ITEM_NET_BALL, 99
+	additem ITEM_DIVE_BALL, 99
+	additem ITEM_NEST_BALL, 99
+	additem ITEM_REPEAT_BALL, 99
+	additem ITEM_TIMER_BALL, 99
+	additem ITEM_LUXURY_BALL, 99
+	additem ITEM_PREMIER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_MASTER_BALL, 99
+	additem ITEM_GREAT_BALL, 79
+	additem ITEM_ULTRA_BALL, 84
+	additem ITEM_POKE_BALL, 89
+	additem ITEM_MASTER_BALL, 74
+	additem ITEM_TM01_FOCUS_PUNCH, 99
+	additem ITEM_TM02_DRAGON_CLAW, 99
+	additem ITEM_TM03_WATER_PULSE, 99
+	additem ITEM_TM04_CALM_MIND, 99
+	additem ITEM_TM05_ROAR, 99
+	additem ITEM_TM06_TOXIC, 99
+	additem ITEM_TM07_HAIL, 99
+	additem ITEM_TM08_BULK_UP, 99
+	additem ITEM_TM09_BULLET_SEED, 99
+	additem ITEM_TM10_HIDDEN_POWER, 99
+	additem ITEM_TM11_SUNNY_DAY, 99
+	additem ITEM_TM12_TAUNT, 99
+	additem ITEM_TM13_ICE_BEAM, 99
+	additem ITEM_TM14_BLIZZARD, 99
+	additem ITEM_TM15_HYPER_BEAM, 99
+	additem ITEM_TM16_LIGHT_SCREEN, 99
+	additem ITEM_TM17_PROTECT, 99
+	additem ITEM_TM18_RAIN_DANCE, 99
+	additem ITEM_TM19_GIGA_DRAIN, 99
+	additem ITEM_TM20_SAFEGUARD, 99
+	additem ITEM_TM21_FRUSTRATION, 99
+	additem ITEM_TM22_SOLARBEAM, 99
+	additem ITEM_TM23_IRON_TAIL, 99
+	additem ITEM_TM24_THUNDERBOLT, 99
+	additem ITEM_TM25_THUNDER, 99
+	additem ITEM_TM26_EARTHQUAKE, 99
+	additem ITEM_TM27_RETURN, 99
+	additem ITEM_TM28_DIG, 99
+	additem ITEM_TM29_PSYCHIC, 99
+	additem ITEM_TM30_SHADOW_BALL, 99
+	additem ITEM_TM31_BRICK_BREAK, 99
+	additem ITEM_TM32_DOUBLE_TEAM, 99
+	additem ITEM_TM33_REFLECT, 99
+	additem ITEM_TM34_SHOCK_WAVE, 99
+	additem ITEM_TM35_FLAMETHROWER, 99
+	additem ITEM_TM36_SLUDGE_BOMB, 99
+	additem ITEM_TM37_SANDSTORM, 99
+	additem ITEM_TM38_FIRE_BLAST, 99
+	additem ITEM_TM39_ROCK_TOMB, 99
+	additem ITEM_TM40_AERIAL_ACE, 99
+	additem ITEM_TM41_TORMENT, 99
+	additem ITEM_TM42_FACADE, 99
+	additem ITEM_TM43_SECRET_POWER, 99
+	additem ITEM_TM44_REST, 99
+	additem ITEM_TM45_ATTRACT, 99
+	additem ITEM_TM46_THIEF, 99
+	additem ITEM_TM47_STEEL_WING, 99
+	additem ITEM_TM48_SKILL_SWAP, 99
+	additem ITEM_TM49_SNATCH, 99
+	additem ITEM_TM50_OVERHEAT, 99
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 200
+	additem ITEM_CHERI_BERRY, 199
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 200
+	additem ITEM_CHESTO_BERRY, 199
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 200
+	additem ITEM_PECHA_BERRY, 199
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 200
+	additem ITEM_RAWST_BERRY, 199
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 200
+	additem ITEM_ASPEAR_BERRY, 199
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 200
+	additem ITEM_LEPPA_BERRY, 199
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 200
+	additem ITEM_ORAN_BERRY, 199
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 200
+	additem ITEM_PERSIM_BERRY, 199
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 200
+	additem ITEM_LUM_BERRY, 199
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 200
+	additem ITEM_SITRUS_BERRY, 199
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 200
+	additem ITEM_FIGY_BERRY, 199
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 200
+	additem ITEM_WIKI_BERRY, 199
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 200
+	additem ITEM_MAGO_BERRY, 199
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 200
+	additem ITEM_AGUAV_BERRY, 199
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 200
+	additem ITEM_IAPAPA_BERRY, 199
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 200
+	additem ITEM_RAZZ_BERRY, 199
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 200
+	additem ITEM_BLUK_BERRY, 199
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 200
+	additem ITEM_NANAB_BERRY, 199
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 200
+	additem ITEM_WEPEAR_BERRY, 199
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 200
+	additem ITEM_PINAP_BERRY, 199
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 200
+	additem ITEM_POMEG_BERRY, 199
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 200
+	additem ITEM_KELPSY_BERRY, 199
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 200
+	additem ITEM_QUALOT_BERRY, 199
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 200
+	additem ITEM_HONDEW_BERRY, 199
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 200
+	additem ITEM_GREPA_BERRY, 199
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 200
+	additem ITEM_TAMATO_BERRY, 199
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 200
+	additem ITEM_CORNN_BERRY, 199
+	additem ITEM_MAGOST_BERRY, 999
+	additem ITEM_RABUTA_BERRY, 999
+	additem ITEM_NOMEL_BERRY, 999
+	additem ITEM_SPELON_BERRY, 999
+	additem ITEM_PAMTRE_BERRY, 999
+	additem ITEM_WATMEL_BERRY, 999
+	additem ITEM_DURIN_BERRY, 999
+	additem ITEM_BELUE_BERRY, 999
+	additem ITEM_LIECHI_BERRY, 999
+	additem ITEM_GANLON_BERRY, 999
+	additem ITEM_SALAC_BERRY, 999
+	additem ITEM_PETAYA_BERRY, 999
+	additem ITEM_APICOT_BERRY, 999
+	additem ITEM_LANSAT_BERRY, 999
+	additem ITEM_STARF_BERRY, 999
+	additem ITEM_ENIGMA_BERRY, 999
 	end
 
 DebugScript_081C221F:: @ 81C221F
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_DESK
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_SMALL_CHAIR
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_PLANT
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_RED_BRICK
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_JUMP_MAT
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_BALL_POSTER
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_DUSKULL_DOLL
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
-	givedecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_DESK
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_SMALL_CHAIR
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_PLANT
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_RED_BRICK
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_JUMP_MAT
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_BALL_POSTER
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_DUSKULL_DOLL
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
+	adddecoration DECOR_KISS_CUSHION
 	end
 
 DebugScript_081C23E2:: @ 81C23E2
-	givecoins 9999
+	addcoins 9999
 	end
 
 DebugScript_081C23E6:: @ 81C23E6
@@ -458,7 +458,7 @@ DebugScript_081C23E6:: @ 81C23E6
 	end
 
 DebugScript_081C23F6:: @ 81C23F6
-	takemoney 999999, 0x00
+	removemoney 999999, 0
 	end
 
 DebugScript_081C23FD:: @ 81C23FD
@@ -476,15 +476,15 @@ DebugScript_081C23FD:: @ 81C23FD
 	end
 
 DebugScript_081C2436:: @ 81C2436
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2445:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2454:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2463:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 DebugScript_081C2472:
-	givemon SPECIES_BARBOACH, 99, 0, 0, 0, 0
+	givemon SPECIES_BARBOACH, 99, ITEM_NONE
 	end
 
 DebugScript_081C2482:: @ 81C2482
@@ -502,15 +502,15 @@ DebugScript_081C2482:: @ 81C2482
 	end
 
 DebugScript_081C24BB:: @ 81C24BB
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24CA:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24D9:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24E8:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 DebugScript_081C24F7:
-	givemon SPECIES_SHROOMISH, 99, 0, 0, 0, 0
+	givemon SPECIES_SHROOMISH, 99, ITEM_NONE
 	end
 
 DebugScript_081C2507:: @ 81C2507
diff --git a/data/scripts/dynamic_npc_graphics.inc b/data/scripts/dynamic_npc_graphics.inc
new file mode 100644
index 000000000..2af18fbcd
--- /dev/null
+++ b/data/scripts/dynamic_npc_graphics.inc
@@ -0,0 +1,59 @@
+Common_EventScript_SetupRivalGfxId:: @ 81A014E
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq EventScript_SetupRivalGfxIdFemale
+	compare VAR_RESULT, FEMALE
+	goto_if_eq EventScript_SetupRivalGfxIdMale
+	end
+
+EventScript_SetupRivalGfxIdFemale:: @ 81A0166
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
+	return
+
+EventScript_SetupRivalGfxIdMale:: @ 81A016C
+	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+Common_EventScript_SetupRivalOnBikeGfxId:: @ 81A0172
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq EventScript_SetupRivalOnBikeGfxIdFemale
+	compare VAR_RESULT, FEMALE
+	goto_if_eq EventScript_SetupRivalOnBikeGfxIdMale
+	end
+
+EventScript_SetupRivalOnBikeGfxIdFemale:: @ 81A018A
+	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE
+	return
+
+EventScript_SetupRivalOnBikeGfxIdMale:: @ 81A0190
+	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE
+	return
+
+Common_EventScript_SetupEvilTeamGfxIds:: @ 81A0196
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_MAXIE
+	.else
+	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, OBJ_EVENT_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, OBJ_EVENT_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, OBJ_EVENT_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, OBJ_EVENT_GFX_ARCHIE
+	.endif
+	return
+
+Common_EventScript_SetupLegendaryGfxIds:: @ 81A01B5
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_KYOGRE_2
+	.else
+	setvar VAR_OBJ_GFX_ID_8, OBJ_EVENT_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, OBJ_EVENT_GFX_GROUDON_2
+	.endif
+	return
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
new file mode 100644
index 000000000..39d52825e
--- /dev/null
+++ b/data/scripts/elite_four.inc
@@ -0,0 +1,62 @@
+PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 81A0693
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
+	waitmovement 0
+	playse SE_DOOR
+	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
+	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
+	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	special DrawWholeMapView
+	return
+
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 81A0710
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
+	waitmovement 0
+	playse SE_TRACK_DOOR
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	special DrawWholeMapView
+	return
+
+@ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 81A0757
+	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
+	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 0, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 1, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 2, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 3, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 4, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 8, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 9, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 10, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	setmetatile 11, 2, METATILE_EliteFour_RightSpotlightOff, 1
+	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
+	return
+
+PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 81A07FA
+	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
+	setmetatile 5, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 6, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	setmetatile 7, 13, METATILE_EliteFour_EntryDoor_ClosedBottom, 1
+	return
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index f8d57f084..cb5e230b9 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -124,78 +124,78 @@ Route111_EventScript_1AE41E:: @ 81AE41E
 	return
 
 Route111_EventScript_1AE422:: @ 81AE422
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
-	msgbox Route111_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2
+	msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1AE442:: @ 81AE442
-	trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
-	msgbox Route111_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2
+	msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_1AE462:: @ 81AE462
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
-	msgbox Route118_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+	msgbox Route118_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_1AE482:: @ 81AE482
-	trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
-	msgbox Route118_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+	msgbox Route118_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1AE4A2:: @ 81AE4A2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
-	msgbox Route120_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F
+	msgbox Route120_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route120_EventScript_1AE4C2:: @ 81AE4C2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
-	msgbox Route120_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F
+	msgbox Route120_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1AE4E2:: @ 81AE4E2
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
-	msgbox Route111_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+	msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1AE502:: @ 81AE502
-	trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
-	msgbox Route111_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+	msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_1AE522:: @ 81AE522
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
-	msgbox Route118_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F
+	msgbox Route118_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route118_EventScript_1AE542:: @ 81AE542
-	trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
-	msgbox Route118_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F
+	msgbox Route118_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1AE562:: @ 81AE562
 Route118_EventScript_1AE562:: @ 81AE562
 Route120_EventScript_1AE562:: @ 81AE562
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
-	msgbox Route111_Text_1AC59E, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F
+	msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1AE582:: @ 81AE582
 Route118_EventScript_1AE582:: @ 81AE582
 Route120_EventScript_1AE582:: @ 81AE582
-	trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
-	msgbox Route111_Text_1AC7E4, 4
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F
+	msgbox Route111_Text_1AC7E4, MSGBOX_DEFAULT
 	release
 	end
 
@@ -220,13 +220,13 @@ Route111_EventScript_1AE5E0:: @ 81AE5E0
 
 Route111_EventScript_1AE5EB:: @ 81AE5EB
 	applymovement VAR_0x8004, Route111_Movement_1AE69B
-	applymovement VAR_0x8005, Route111_Movement_1A0841
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
 Route111_EventScript_1AE5FD:: @ 81AE5FD
 	applymovement VAR_0x8004, Route111_Movement_1AE69D
-	applymovement VAR_0x8005, Route111_Movement_1A083F
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
@@ -245,7 +245,7 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_1AE69F
-	msgbox Route111_Text_1AC10A, 4
+	msgbox Route111_Text_1AC10A, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
 	switch VAR_RESULT
 	case 0, Route111_EventScript_1AE6AD
@@ -257,15 +257,15 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 
 Route111_Movement_1AE699:: @ 81AE699
 	walk_in_place_down
-	end_movement
+	step_end
 
 Route111_Movement_1AE69B:: @ 81AE69B
 	walk_in_place_up
-	end_movement
+	step_end
 
 Route111_Movement_1AE69D:: @ 81AE69D
 	walk_in_place_left
-	end_movement
+	step_end
 
 Route111_EventScript_1AE69F:: @ 81AE69F
 	msgbox Route111_Text_1AC60B, MSGBOX_YESNO
@@ -300,26 +300,26 @@ Route111_EventScript_1AE6E5:: @ 81AE6E5
 Route111_EventScript_1AE6F3:: @ 81AE6F3
 	compare VAR_RESULT, NO
 	goto_if_eq Route111_EventScript_1AE72D
-	msgbox Route111_Text_1AC40F, 4
+	msgbox Route111_Text_1AC40F, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 10
-	call Route111_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_1AE72D
-	msgbox Route111_Text_1AC487, 4
+	msgbox Route111_Text_1AC487, MSGBOX_DEFAULT
 	special GabbyAndTyAfterInterview
 	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_1AE72D:: @ 81AE72D
-	msgbox Route111_Text_1AC553, 4
+	msgbox Route111_Text_1AC553, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	release
 	end
 
 Route111_EventScript_1AE73A:: @ 81AE73A
-	msgbox Route111_Text_1AC59E, 4
+	msgbox Route111_Text_1AC59E, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
new file mode 100644
index 000000000..21ea702d4
--- /dev/null
+++ b/data/scripts/hall_of_fame.inc
@@ -0,0 +1,34 @@
+EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 819FC13
+	clearflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	clearflag FLAG_HIDE_STEVENS_LETTER
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	clearflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	special UpdateTrainerFanClubGameClear
+	call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent
+	call_if_unset FLAG_LATIOS_OR_LATIAS_ROAMING, EverGrandeCity_HallOfFame_EventScript_ReadyLatiTVEvent
+	call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_ShowStevensBeldum
+	call_if_unset FLAG_RECEIVED_HM08, EverGrandeCity_HallOfFame_EventScript_ShowHM08
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ShowStevensBeldum:: @ 819FC5A
+	clearflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ShowHM08:: @ 819FC5E
+	clearflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 819FC62
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 3
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3
+	clearflag FLAG_HIDE_NORMAN_LITTLEROOT
+	return
+
+EverGrandeCity_HallOfFame_EventScript_ReadyLatiTVEvent:: @ 819FC70
+	setflag FLAG_SYS_TV_LATI
+	return
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index ff31d8b97..70e91f09b 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -4,7 +4,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
 	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CB9
 	call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_1B2CC2
 	closemessage
-	applymovement 1, MtChimney_Movement_1A083D
+	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	setflag FLAG_EVIL_LEADER_PLEASE_STOP
 	release
@@ -12,69 +12,69 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
 
 MtChimney_EventScript_1B2CB9:: @ 81B2CB9
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B350B, 4
+	msgbox MtChimney_Text_1B350B, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B3EC1, 4
+	msgbox MtChimney_Text_1B3EC1, MSGBOX_DEFAULT
 	.endif
 	return
 
 MtChimney_EventScript_1B2CC2:: @ 81B2CC2
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3598, 4
+	msgbox MtChimney_Text_1B3598, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B3F8C, 4
+	msgbox MtChimney_Text_1B3F8C, MSGBOX_DEFAULT
 	.endif
 	return
 
 MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	lockall
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B2DEE, 4
+	msgbox MtChimney_Text_1B2DEE, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B37BB, 4
+	msgbox MtChimney_Text_1B37BB, MSGBOX_DEFAULT
 	.endif
-	applymovement 2, MtChimney_Movement_1A0839
+	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement 2, MtChimney_Movement_1A0833
+	applymovement 2, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement 2, MtChimney_Movement_1A0835
+	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B2ED9, 4
+	msgbox MtChimney_Text_1B2ED9, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B38B3, 4
+	msgbox MtChimney_Text_1B38B3, MSGBOX_DEFAULT
 	.endif
 	.ifdef SAPPHIRE
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099
+	trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3099
 	.else
-	trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68
+	trainerbattle_no_intro TRAINER_MT_CHIMNEY_GRUNT_3, MtChimney_Text_1B3A68
 	.endif
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B30C2, 4
+	msgbox MtChimney_Text_1B30C2, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B3A90, 4
+	msgbox MtChimney_Text_1B3A90, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	delay 30
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 2
 	removeobject 3
 	removeobject 22
 	setflag FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	setobjectxyperm 1, 10, 12
 	addobject 1
 	compare VAR_FACING, 4
 	call_if_eq MtChimney_EventScript_1B2D7D
 	compare VAR_FACING, 2
 	call_if_eq MtChimney_EventScript_1B2D88
-	applymovement 255, MtChimney_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3608, 4
+	msgbox MtChimney_Text_1B3608, MSGBOX_DEFAULT
 	.else
-	msgbox MtChimney_Text_1B3FFE, 4
+	msgbox MtChimney_Text_1B3FFE, MSGBOX_DEFAULT
 	.endif
 	closemessage
 	compare VAR_FACING, 4
diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc
index 0992a62c0..403bf2e37 100644
--- a/data/scripts/magma_summit.inc
+++ b/data/scripts/magma_summit.inc
@@ -1,29 +1,29 @@
 MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5
-	msgbox UnknownString_81B5131, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, UnknownString_81B50C3, UnknownString_81B50F5
+	msgbox UnknownString_81B5131, MSGBOX_AUTOCLOSE
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
-	msgbox MtPyre_Summit_Text_1B5D6D, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_1, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30
+	msgbox MtPyre_Summit_Text_1B5D6D, MSGBOX_AUTOCLOSE
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F
-	msgbox UnknownString_81B51B5, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, UnknownString_81B5166, UnknownString_81B519F
+	msgbox UnknownString_81B51B5, MSGBOX_AUTOCLOSE
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
-	msgbox MtPyre_Summit_Text_1B5DF1, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_2, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB
+	msgbox MtPyre_Summit_Text_1B5DF1, MSGBOX_AUTOCLOSE
 	.endif
 	end
 
 MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7
 	.ifdef SAPPHIRE
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224
-	msgbox UnknownString_81B5248, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, UnknownString_81B51EB, UnknownString_81B5224
+	msgbox UnknownString_81B5248, MSGBOX_AUTOCLOSE
 	.else
-	trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
-	msgbox MtPyre_Summit_Text_1B5E84, 6
+	trainerbattle_single TRAINER_MT_PYRE_SUMMIT_GRUNT_3, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60
+	msgbox MtPyre_Summit_Text_1B5E84, MSGBOX_AUTOCLOSE
 	.endif
 	end
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 9e2db94a1..b3a91702b 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -34,12 +34,12 @@ yes_hear_song:
 	compare VAR_RESULT, FALSE
 	@ Prompt new lyrics only if song hasn't been changed
 	goto_if_eq prompt_write_lyrics
-	msgbox gTextBard_OhWhatAMovingSong, 4
+	msgbox gTextBard_OhWhatAMovingSong, MSGBOX_DEFAULT
 	release
 	end
 
 dont_hear_song:
-	msgbox gTextBard_OhYouveLeftMe, 4
+	msgbox gTextBard_OhYouveLeftMe, MSGBOX_DEFAULT
 	release
 	end
 
@@ -53,12 +53,12 @@ prompt_write_lyrics:
 
 write_lyrics:
 	setvar VAR_0x8004, 6
-	call MauvilleCity_PokemonCenter_1F_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, NO
 	goto_if_eq dont_write_lyrics
-	msgbox gTextBard_ThankYouKindly, 4
+	msgbox gTextBard_ThankYouKindly, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
 	@ Give the player ear rape again
 	special ScrSpecial_PlayBardSong
@@ -67,12 +67,12 @@ write_lyrics:
 	compare VAR_RESULT, NO
 	goto_if_eq write_lyrics		@ Keep looping until player responds YES
 	special ScrSpecial_SaveBardSongLyrics
-	msgbox gTextBard_OkayThatsIt, 4
+	msgbox gTextBard_OkayThatsIt, MSGBOX_DEFAULT
 	release
 	end
 
 dont_write_lyrics:
-	msgbox gTextBard_OhYouveLeftMe2, 4
+	msgbox gTextBard_OhYouveLeftMe2, MSGBOX_DEFAULT
 	release
 	end
 
@@ -85,11 +85,11 @@ SpeakToHipster:
 	lock
 	faceplayer
 	setflag FLAG_SYS_HIPSTER_MEET
-	msgbox gTextHipster_TheyCallMeTheHipster, 4
+	msgbox gTextHipster_TheyCallMeTheHipster, MSGBOX_DEFAULT
 	special ScrSpecial_GetHipsterSpokenFlag
 	compare VAR_RESULT, FALSE
 	goto_if_eq hipster_first_time
-	msgbox gTextHipster_TaughtYouAlready, 4
+	msgbox gTextHipster_TaughtYouAlready, MSGBOX_DEFAULT
 	release
 	end
 
@@ -97,12 +97,12 @@ hipster_first_time:
 	special ScrSpecial_HipsterTeachWord
 	compare VAR_RESULT, TRUE		@ TRUE if player learned a new word
 	goto_if_eq teach_new_word
-	msgbox gTextHipster_YouAlreadyKnowALot, 4
+	msgbox gTextHipster_YouAlreadyKnowALot, MSGBOX_DEFAULT
 	release
 	end
 
 teach_new_word:
-	msgbox gTextHipster_HaveYouHeardAbout, 4
+	msgbox gTextHipster_HaveYouHeardAbout, MSGBOX_DEFAULT
 	special ScrSpecial_SetHipsterSpokenFlag
 	release
 	end
@@ -129,11 +129,11 @@ SpeakToTrader:
 	end
 
 dont_want_to_trade:
-	msgbox gTextTrader_FeelUnwanted1, 2
+	msgbox gTextTrader_FeelUnwanted1, MSGBOX_NPC
 	end
 
 already_traded:
-	msgbox gTextTrader_TradedAlready, 2
+	msgbox gTextTrader_TradedAlready, MSGBOX_NPC
 	end
 
 do_trader_menu_get:
@@ -153,7 +153,7 @@ do_trader_menu_get:
 	end
 
 cancelled_get_menu:
-	msgbox gTextTrader_DontWantAnything, 2
+	msgbox gTextTrader_DontWantAnything, MSGBOX_NPC
 	end
 
 rare_item_cant_trade_away:
@@ -169,11 +169,11 @@ dont_want_item:
 	end
 
 player_has_no_decorations:
-	msgbox gTextTrader_YouDontHaveDecorations, 2
+	msgbox gTextTrader_YouDontHaveDecorations, MSGBOX_NPC
 	end
 
 do_trader_menu_give:
-	msgbox gTextTrader_PickDecorationYoullTrade, 4
+	msgbox gTextTrader_PickDecorationYoullTrade, MSGBOX_DEFAULT
 	special ScrSpecial_TraderMenuGiveDecoration
 	waitstate
 	compare VAR_0x8006, 0
@@ -187,20 +187,20 @@ do_trader_menu_give:
 	compare VAR_RESULT, NO
 	goto_if_eq do_trader_menu_give
 	special ScrSpecial_TraderDoDecorationTrade
-	msgbox gTextTrader_ThenWellTrade, 2
+	msgbox gTextTrader_ThenWellTrade, MSGBOX_NPC
 	end
 
 cancelled_give_menu:
-	msgbox gTextTrader_FeelUnwanted2, 2
+	msgbox gTextTrader_FeelUnwanted2, MSGBOX_NPC
 	end
 
 decoration_is_in_use:
-	msgbox gTextTrader_InUseYouCantTradeIt, 4
+	msgbox gTextTrader_InUseYouCantTradeIt, MSGBOX_DEFAULT
 	goto do_trader_menu_give
 	end
 
 decorations_full:
-	msgbox gTextTrader_NoRoomForThis, 2
+	msgbox gTextTrader_NoRoomForThis, MSGBOX_NPC
 	end
 
 
@@ -243,7 +243,7 @@ cancel_story_menu:
 	goto_if_eq dont_hear_story
 	goto yes_hear_story
 no_stat_update:
-	msgbox gTextStoryteller_CouldThereBeOtherTrainers, 4
+	msgbox gTextStoryteller_CouldThereBeOtherTrainers, MSGBOX_DEFAULT
 	msgbox gTextStoryteller_HearAnotherLegendaryTale, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq choose_story
@@ -256,7 +256,7 @@ yes_hear_story:
 	goto_if_eq cant_record_story		@ story list is full
 	goto prompt_record_story
 no_stories_recorded:
-	msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, 4
+	msgbox gTextStoryteller_ButIKnowOfNoLegendaryTrainers, MSGBOX_DEFAULT
 prompt_record_story:
 	msgbox gTextStoryteller_HaveYouAnyTales, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -264,25 +264,25 @@ prompt_record_story:
 	specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
 	compare VAR_RESULT, TRUE
 	goto_if_eq stat_update
-	msgbox gTextStoryteller_ImNotSatisfied, 4
+	msgbox gTextStoryteller_ImNotSatisfied, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
 stat_update:
-	msgbox gTextStoryteller_BirthOfANewLegend, 4
+	msgbox gTextStoryteller_BirthOfANewLegend, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
 dont_hear_story:
-	msgbox gTextStoryteller_OhIFeelStifled, 4
+	msgbox gTextStoryteller_OhIFeelStifled, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
 cant_record_story:
-	msgbox gTextStoryteller_WishMorePeopleWould, 4
+	msgbox gTextStoryteller_WishMorePeopleWould, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
@@ -321,7 +321,7 @@ tell_another_giddy_tale:
 	end
 
 also_i_was_thinking:
-	msgbox gTextGiddy_AlsoIWasThinking, 4
+	msgbox gTextGiddy_AlsoIWasThinking, MSGBOX_DEFAULT
 	goto tell_giddy_tale
 	end
 
@@ -337,12 +337,12 @@ tell_giddy_tale:
 	end
 
 dont_hear_giddy:
-	msgbox gTextGiddy_YouveDeflatedMe, 4
+	msgbox gTextGiddy_YouveDeflatedMe, MSGBOX_DEFAULT
 	release
 	end
 
 bye_bye:
-	msgbox gTextGiddy_ByeBye, 4
+	msgbox gTextGiddy_ByeBye, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
new file mode 100644
index 000000000..fb2d1ae2c
--- /dev/null
+++ b/data/scripts/movement.inc
@@ -0,0 +1,71 @@
+Common_Movement_QuestionMark:: @ 81A0831
+	emote_question_mark
+	step_end
+
+Common_Movement_ExclamationMark:: @ 81A0833
+	emote_exclamation_mark
+	step_end
+
+Common_Movement_Delay48:: @ 81A0835
+	delay_16
+	delay_16
+	delay_16
+	step_end
+
+Common_Movement_FacePlayer:: @ 81A0839
+	face_player
+	step_end
+
+Common_Movement_FaceAwayPlayer:: @ 81A083B
+	face_away_player
+	step_end
+
+Common_Movement_FaceOriginalDirection:: @ 81A083D
+	face_original_direction
+	step_end
+
+Common_Movement_WalkInPlaceFastestLeft:: @ 81A083F
+	walk_in_place_fastest_left
+	step_end
+
+Common_Movement_WalkInPlaceFastestUp:: @ 81A0841
+	walk_in_place_fastest_up
+	step_end
+
+Common_Movement_WalkInPlaceFastestRight:: @ 81A0843
+	walk_in_place_fastest_right
+	step_end
+
+Common_Movement_WalkInPlaceFastestDown:: @ 81A0845
+	walk_in_place_fastest_down
+	step_end
+
+Common_Movement_WalkUp6:: @ 81A0847
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Common_Movement_WalkUp4:: @ 81A084E
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	step_end
+
+Common_Movement_Delay32:: @ 81A0853
+	delay_16
+	delay_16
+	step_end
+
+Common_Movement_WalkUp:: @ 81A0856
+	walk_up
+	step_end
+
+Common_Movement_WalkUp2:: @ 81A0858
+	walk_up
+	walk_up
+	step_end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 34c546a39..0577cad57 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -2,12 +2,12 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, MSGBOX_DEFAULT
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D10, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D10, MSGBOX_DEFAULT
 	multichoice 17, 6, 20, 0
 	switch VAR_RESULT
 	case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A
@@ -17,15 +17,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D:: @ 81B1B2D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, MSGBOX_DEFAULT
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 0
-	call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_0x8004, 1
@@ -37,7 +37,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FF0, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FF0, MSGBOX_DEFAULT
 	release
 	end
 
@@ -46,22 +46,22 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB
 	special sub_80EB7C4
 	waitmessage
 	delay 80
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1BD1:: @ 81B1BD1
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FA3, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1FA3, MSGBOX_DEFAULT
 	release
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB:: @ 81B1BDB
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B202F, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B202F, MSGBOX_DEFAULT
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B2063, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B2063, MSGBOX_DEFAULT
 	multichoice 17, 6, 20, 0
 	switch VAR_RESULT
 	case 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C36
@@ -71,15 +71,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9:: @ 81B1BE9
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1D3A, MSGBOX_DEFAULT
 	goto PetalburgCity_PokemonCenter_1F_EventScript_1B1BE9
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, 0
-	call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
+	call Common_EventScript_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_0x8004, 1
@@ -91,7 +91,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36
 	end
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B20CE, 4
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B20CE, MSGBOX_DEFAULT
 	release
 	end
 
@@ -99,7 +99,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77
 	goto_if_unset FLAG_BADGE05_GET, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
 	goto_if_set FLAG_SYS_EXDATA_ENABLE, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96
 	setflag FLAG_SYS_EXDATA_ENABLE
-	msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3
+	msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, MSGBOX_SIGN
 	release
 	end
 
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
new file mode 100644
index 000000000..f27b43107
--- /dev/null
+++ b/data/scripts/new_game.inc
@@ -0,0 +1,218 @@
+EventScript_ResetAllBerryTrees: @ 19F940
+	setberrytree 2, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 1, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 11, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 13, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 4, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 76, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 8, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 10, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 25, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 26, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 66, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 67, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 69, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 70, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 71, ITEM_TO_BERRY(ITEM_KELPSY_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 55, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 56, ITEM_TO_BERRY(ITEM_BLUK_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 5, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 6, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 7, ITEM_TO_BERRY(ITEM_CHERI_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 16, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 17, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 18, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 29, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 28, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 27, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 24, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 23, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 22, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 21, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 19, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 20, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 80, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 81, ITEM_TO_BERRY(ITEM_ORAN_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 77, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 78, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 68, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 31, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 33, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 34, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 35, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 36, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 83, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 84, ITEM_TO_BERRY(ITEM_HONDEW_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 85, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 86, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 37, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 38, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 39, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 40, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 41, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 42, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 46, ITEM_TO_BERRY(ITEM_WEPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 45, ITEM_TO_BERRY(ITEM_PINAP_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 44, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 43, ITEM_TO_BERRY(ITEM_RAZZ_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 47, ITEM_TO_BERRY(ITEM_PERSIM_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 48, ITEM_TO_BERRY(ITEM_ASPEAR_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 49, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 50, ITEM_TO_BERRY(ITEM_CHESTO_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 52, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 53, ITEM_TO_BERRY(ITEM_NANAB_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 62, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 64, ITEM_TO_BERRY(ITEM_LEPPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 58, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 59, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 60, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 61, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 79, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 14, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 15, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 30, ITEM_TO_BERRY(ITEM_POMEG_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 65, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 72, ITEM_TO_BERRY(ITEM_GREPA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 73, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 74, ITEM_TO_BERRY(ITEM_QUALOT_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 87, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 88, ITEM_TO_BERRY(ITEM_SITRUS_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 89, ITEM_TO_BERRY(ITEM_RAWST_BERRY), BERRY_STAGE_BERRIES
+	setberrytree 82, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
+	return
+
+EventScript_ResetAllMapFlags:: @ 819FA81
+	setflag FLAG_LINK_CONTEST_ROOM_POKEBALL
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	setflag FLAG_UNKNOWN_363
+	setflag FLAG_HIDE_GRUNT_RUSTBORO
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_HIDE_RIVAL_RUSTBORO
+	setflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	setflag FLAG_UNKNOWN_2E1
+	setflag FLAG_UNKNOWN_2EB
+	setflag FLAG_UNKNOWN_2EC
+	setflag FLAG_UNKNOWN_2ED
+	setflag FLAG_UNKNOWN_2F4
+	setflag FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	setflag FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	setflag FLAG_UNKNOWN_30E
+	setflag FLAG_UNKNOWN_30F
+	setflag FLAG_HIDE_NORMAN_LITTLEROOT
+	setflag FLAG_HIDE_MAY_PICHU_DOLL
+	setflag FLAG_HIDE_FANCLUB_OLD_LADY
+	setflag FLAG_HIDE_FANCLUB_BOY
+	setflag FLAG_HIDE_FANCLUB_LITTLE_BOY
+	setflag FLAG_HIDE_FANCLUB_LADY
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	setflag FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	setflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	setflag FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+	setflag FLAG_HIDE_WALLY_FATHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	setflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	setflag FLAG_UNKNOWN_337
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	setflag FLAG_UNKNOWN_34B
+	setflag FLAG_UNKNOWN_34C
+	setflag FLAG_UNKNOWN_34F
+	setflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	setflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setflag FLAG_HIDE_STERN_SLATEPORT
+	setflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	setflag FLAG_HIDE_RIVAL_ROUTE119
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	setflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setflag FLAG_HIDE_LANETTE
+	setflag FLAG_HIDE_TRICKMASTER_ENTRANCE
+	setflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	setflag FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	setflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	setflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setflag FLAG_HIDE_MOM_UPSTAIRS
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_UNKNOWN_393
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	setflag FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+	setflag FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	setflag FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	setflag FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_1
+	setflag FLAG_HIDE_RIVAL_LAVARIDGE_2
+	setflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	setflag FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	setflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	setflag FLAG_HIDE_PROF_COSMO_FALLARBOR
+	setflag FLAG_HIDE_STEVEN_ROUTE128
+	setflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	setflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	setflag FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_HM08
+	setflag FLAG_HIDE_STEVENS_LETTER
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	setflag FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+	setflag FLAG_HIDE_BOY_ROUTE101
+	call EventScript_ResetAllBerryTrees
+	end
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
new file mode 100644
index 000000000..2be28646e
--- /dev/null
+++ b/data/scripts/obtain_item.inc
@@ -0,0 +1,161 @@
+Std_ObtainItem: @ 819FDF7
+	additem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainItemMessage
+	return
+
+EventScript_ObtainItemMessage: @ 819FE07
+	bufferitemname 1, VAR_0x8000
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_ObtainedItem
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomForItem
+	return
+
+EventScript_BufferPocketNameAndTryFanfare:
+	switch VAR_RESULT
+	case POCKET_ITEMS,	    EventScript_BufferItemsPocket
+	case POCKET_KEY_ITEMS,  EventScript_BufferKeyItemsPocket
+	case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket
+	case POCKET_TM_HM,	    EventScript_BufferTMHMsPocket
+	case POCKET_BERRIES,	EventScript_BufferBerriesPocket
+	end
+
+EventScript_BufferItemsPocket:
+	bufferstdstring 2, STDSTRING_ITEMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferKeyItemsPocket:
+	bufferstdstring 2, STDSTRING_KEYITEMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferPokeballsPocket:
+	bufferstdstring 2, STDSTRING_POKEBALLS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferTMHMsPocket:
+	bufferstdstring 2, STDSTRING_TMHMS
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedTMHM
+	return
+
+EventScript_BufferBerriesPocket:
+	bufferstdstring 2, STDSTRING_BERRIES
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_ObtainedItem: @ 819FEB7
+	message Text_ObtainedTheItem
+	waitfanfare
+	waitmessage
+	msgbox Text_PutItemInPocket
+	setvar VAR_RESULT, TRUE
+	return
+
+EventScript_NoRoomForItem: @ 819FECC
+	setvar VAR_RESULT, FALSE
+	return
+
+EventScript_PlayFanfareObtainedItem:
+	playfanfare MUS_FANFA4
+	return
+
+EventScript_PlayFanfareObtainedTMHM:
+	playfanfare MUS_ME_WAZA
+	return
+
+Std_ObtainDecoration: @ 819FEDA
+	adddecoration VAR_0x8000
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainDecorationMessage
+	return
+
+EventScript_ObtainDecorationMessage: @ 819FEE8
+	bufferdecorationname 1, VAR_0x8000
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_ObtainedDecor
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomForDecor
+	return
+
+EventScript_ObtainedDecor: @ 819FF03
+	playfanfare MUS_FANFA4
+	message Text_ObtainedTheDecor
+	waitfanfare
+	waitmessage
+	msgbox Text_TheDecorWasTransferredToThePC
+	setvar VAR_RESULT, TRUE
+	return
+
+EventScript_NoRoomForDecor: @ 819FF1B
+	setvar VAR_RESULT, FALSE
+	return
+
+Std_FindItem: @ 819FF21
+	lock
+	faceplayer
+	waitse
+	additem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemname 1, VAR_0x8000
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	call_if_eq EventScript_PickUpItem
+	compare VAR_0x8007, FALSE
+	call_if_eq EventScript_NoRoomToPickUpItem
+	release
+	return
+
+EventScript_PickUpItem: @ 819FF52
+	removeobject VAR_LAST_TALKED
+	message Text_FoundOneItem
+	waitfanfare
+	waitmessage
+	msgbox Text_PutItemInPocket
+	return
+
+EventScript_NoRoomToPickUpItem: @ 819FF65
+	msgbox Text_ObtainedTheItem
+	msgbox Text_TooBadBagIsFull
+	setvar VAR_RESULT, FALSE
+	return
+
+EventScript_HiddenItem:: @ 819FF7B
+	lockall
+	waitse
+	additem VAR_0x8005
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemname 1, VAR_0x8005
+	checkitemtype VAR_0x8005
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, TRUE
+	goto_if_eq EventScript_PickUpHiddenItem
+	compare VAR_0x8007, FALSE
+	goto_if_eq EventScript_NoRoomToPickUpHiddenItem
+	end
+
+EventScript_PickUpHiddenItem:
+	message Text_FoundOneItem
+	waitfanfare
+	waitmessage
+	msgbox Text_PutItemInPocket
+	special SetHiddenItemFlag
+	releaseall
+	end
+
+EventScript_NoRoomToPickUpHiddenItem:
+	msgbox Text_FoundOneItem
+	msgbox Text_TooBadBagIsFull
+	setvar VAR_RESULT, FALSE
+	releaseall
+	end
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
new file mode 100644
index 000000000..91b47004d
--- /dev/null
+++ b/data/scripts/pc.inc
@@ -0,0 +1,66 @@
+EventScript_PC:: @ 81A0009
+	lockall
+	setvar VAR_0x8004, 0
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox Text_BootUpPC, MSGBOX_DEFAULT
+	goto EventScript_PCMainMenu
+	end
+
+EventScript_PCMainMenu:
+	message Text_WhichPCShouldBeAccessed
+	waitmessage
+	special ScriptMenu_CreatePCMultichoice
+	waitstate
+	goto EventScript_AccessPC
+	end
+
+EventScript_AccessPC:
+	switch VAR_RESULT
+	case 0, EventScript_AccessPokemonStorage
+	case 1, EventScript_AccessPlayersPC
+	case 2, EventScript_AccessHallOfFame
+	case 3, EventScript_TurnOffPC
+	case MULTI_B_PRESSED, EventScript_TurnOffPC
+	end
+
+EventScript_AccessPlayersPC:
+	playse SE_PC_LOGON
+	msgbox Text_AccessedPlayersPC, MSGBOX_DEFAULT
+	special PlayerPC
+	waitstate
+	goto EventScript_PCMainMenu
+	end
+
+EventScript_AccessPokemonStorage:
+	playse SE_PC_LOGON
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
+	msgbox Text_StorageSystemOpened, MSGBOX_DEFAULT
+	special ShowPokemonStorageSystem
+	waitstate
+	goto EventScript_PCMainMenu
+	end
+
+EventScript_AccessSomeonesPC:
+	msgbox Text_AccessedSomeonesPC, MSGBOX_DEFAULT
+	return
+
+EventScript_AccessLanettesPC:
+	msgbox Text_AccessedLanettesPC, MSGBOX_DEFAULT
+	return
+
+EventScript_TurnOffPC:
+	setvar VAR_0x8004, 0
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
+
+EventScript_AccessHallOfFame:
+	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
+	playse SE_PC_LOGON
+	special AccessHallOfFamePC
+	waitstate
+	goto EventScript_AccessPC
+	end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
new file mode 100644
index 000000000..79359ae55
--- /dev/null
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -0,0 +1,57 @@
+Common_EventScript_PkmnCenterNurse:: @ 819FD5B
+	lock
+	faceplayer
+	msgbox gText_NurseJoy_Welcome, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq EventScript_PkmnCenterNurse_HealPkmn
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_PkmnCenterNurse_Goodbye
+	end
+
+EventScript_PkmnCenterNurse_HealPkmn:: @ 819FD7C
+	incrementgamestat GAME_STAT_USED_POKECENTER
+	message gText_NurseJoy_OkayIllTakeYourPokemon
+	waitmessage
+	applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
+	waitmovement 0
+	dofieldeffect FLDEFF_POKECENTER_HEAL
+	waitfieldeffect FLDEFF_POKECENTER_HEAL
+	applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestDown
+	waitmovement 0
+	special ScrSpecial_HealPlayerParty
+	goto_if_unset FLAG_POKERUS_EXPLAINED, EventScript_PkmnCenterNurse_CheckPokerus
+	goto EventScript_PkmnCenterNurse_ReturnPkmn
+	end
+
+EventScript_PkmnCenterNurse_ReturnPkmn:: @ 819FDB0
+	message gText_NurseJoy_ThankYouForWaiting
+	waitmessage
+	applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
+	waitmovement 0
+	message gText_NurseJoy_WeHopeToSeeYouAgain
+	waitmessage
+	return
+
+EventScript_PkmnCenterNurse_Goodbye:: @ 819FDC7
+	message gText_NurseJoy_WeHopeToSeeYouAgain
+	waitmessage
+	return
+
+EventScript_PkmnCenterNurse_CheckPokerus:: @ 819FDCE
+	specialvar VAR_RESULT, IsPokerusInParty
+	compare VAR_RESULT, TRUE
+	goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
+	end
+
+EventScript_PkmnCenterNurse_ExplainPokerus:: @ 819FDEA
+	message gText_NurseJoy_Pokerus
+	waitmessage
+	setflag FLAG_POKERUS_EXPLAINED
+	return
+
+Movement_PkmnCenterNurse_Bow:: @ 819FDF4
+	nurse_joy_bow
+	delay_4
+	step_end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a4de5d113..2b746dbe0 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -5,42 +5,42 @@ LittlerootTown_MaysHouse_2F_EventScript_1B6950:: @ 81B6950
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6956:: @ 81B6956
 LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0839
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT
+	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_0x8005, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B699F
 	compare VAR_0x8005, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172453, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_LITTLEROOT_INTRO_STATE, 4
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B699F:: @ 81B699F
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172531, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
+	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
 	waitmovement 0
 	releaseall
 	end
@@ -60,7 +60,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1B69DF:: @ 81B69DF
 LittlerootTown_BrendansHouse_2F_EventScript_1B69EB:: @ 81B69EB
 LittlerootTown_MaysHouse_2F_EventScript_1B69EB:: @ 81B69EB
 	goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_1B6A91
-	msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_172E18, MSGBOX_DEFAULT
 	call LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B
 	delay 30
 	setvar VAR_LITTLEROOT_INTRO_STATE, 6
@@ -82,9 +82,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA2
 	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9
 	waitmovement 0
@@ -95,9 +95,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AAD
 	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4
 	waitmovement 0
@@ -105,14 +105,14 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B6A91:: @ 81B6A91
 	incrementgamestat GAME_STAT_CHECKED_CLOCK
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special ScrSpecial_ViewWallClock
 	waitstate
 	releaseall
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special StartWallClock
 	waitstate
 	return
@@ -124,13 +124,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2
 	delay_16
 	delay_8
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9
 	walk_right
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
 	delay_8
@@ -139,13 +139,13 @@ LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
 	delay_16
 	delay_8
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4
 	walk_left
 	walk_up
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
@@ -154,23 +154,23 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0843
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
 	waitmovement 0
 	playbgm MUS_INTER_V, FALSE
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
 	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
 	waitmovement 0
 	call LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, MSGBOX_DEFAULT
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172644, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_1, 1
 	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1
@@ -179,23 +179,23 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
-	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1A083F
+	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
 	waitmovement 0
 	playbgm MUS_INTER_V, FALSE
-	msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4
+	msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
 	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
 	waitmovement 0
 	call LittlerootTown_MaysHouse_1F_EventScript_1B6BBE
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4
-	msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4
+	msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, MSGBOX_DEFAULT
+	msgbox LittlerootTown_MaysHouse_1F_Text_172644, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_1, 1
 	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5
@@ -206,19 +206,19 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
 LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
 LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
 	playse SE_PIN
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0833
+	applymovement VAR_0x8005, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835
+	applymovement VAR_0x8005, Common_Movement_Delay48
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, MSGBOX_DEFAULT
 	closemessage
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A0841
+	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, MSGBOX_DEFAULT
 	fadedefaultbgm
 	special TurnOffTVScreen
 	setflag FLAG_SYS_TV_HOME
@@ -228,24 +228,24 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB
 	walk_left
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE
 	walk_right
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1
 	walk_left
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5
 	walk_right
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
@@ -261,46 +261,46 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C80
 	compare VAR_LITTLEROOT_INTRO_STATE, 7
 	goto_if_ge LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172429, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172429, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172BBC, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D
 	goto_if_set FLAG_RECEIVED_AMULET_COIN, LittlerootTown_BrendansHouse_1F_EventScript_1B6C72
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4
-	giveitem_std ITEM_AMULET_COIN
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172782, MSGBOX_DEFAULT
+	giveitem ITEM_AMULET_COIN
 	compare VAR_RESULT, 0
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4
+	goto_if_eq Common_EventScript_ShowBagIsFull
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_AMULET_COIN
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C72:: @ 81B6C72
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172717, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172717, MSGBOX_DEFAULT
 	goto LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1726D2, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A
 	closemessage
-	call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA
+	call Common_EventScript_OutOfCenterPartyHeal
 	incrementgamestat GAME_STAT_RESTED_AT_HOME
-	msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, MSGBOX_DEFAULT
 	release
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C9C:: @ 81B6C9C
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1726E7, MSGBOX_DEFAULT
 	release
 	end
 
@@ -310,7 +310,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CA6:: @ 81B6CA6
 	faceplayer
 	waitse
 	playmoncry SPECIES_MACHOKE, 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_17281D, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
@@ -321,7 +321,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9
 	faceplayer
 	waitse
 	playmoncry SPECIES_MACHOKE, 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172831, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172831, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
@@ -332,11 +332,11 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC
 	walk_left
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
 	walk_down
@@ -344,15 +344,15 @@ LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
 	walk_right
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC
 	walk_up
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
@@ -366,27 +366,27 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D
 	compare VAR_0x8008, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6E28
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0839
+	applymovement VAR_0x8009, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0833
+	applymovement VAR_0x8009, Common_Movement_ExclamationMark
 	waitmovement 0
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1A0835
+	applymovement VAR_0x8009, Common_Movement_Delay48
 	waitmovement 0
 	delay 20
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DCD
 	compare VAR_0x8008, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DD8
-	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
-	giveitem_std ITEM_SS_TICKET
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, MSGBOX_DEFAULT
+	giveitem ITEM_SS_TICKET
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
 	compare VAR_0x8008, 1
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9
@@ -433,44 +433,44 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE:: @ 81B6DEE
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9:: @ 81B6DF9
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
 	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E3D
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6E0B:: @ 81B6E0B
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E4F
 	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_1B6E43
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6E1D:: @ 81B6E1D
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E49
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
+	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_1B6E54
 	waitmovement 0
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33
 	walk_right
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36
 	walk_left
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39
 	walk_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B
 	walk_right
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
 	walk_down
@@ -478,7 +478,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
 	walk_right
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
 	walk_down
@@ -486,7 +486,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
 	walk_left
 	walk_down
 	delay_8
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
 	delay_16
@@ -494,14 +494,14 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
-	end_movement
+	step_end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
 	delay_16
@@ -509,4 +509,4 @@ LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
-	end_movement
+	step_end
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 95525b4c9..8d4a92cf4 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -9,7 +9,7 @@ FallarborTown_ContestLobby_EventScript_1B7604:: @ 81B7604
 SlateportCity_ContestLobby_EventScript_1B761E:: @ 81B761E
 	setvar VAR_0x8008, 2
 	setvar VAR_0x8009, 2
-	applymovement 6, SlateportCity_ContestLobby_Movement_1A083D
+	applymovement 6, Common_Movement_FaceOriginalDirection
 	applymovement VAR_0x8008, SlateportCity_ContestLobby_Movement_1B7821
 	waitmovement 0
 	goto SlateportCity_ContestLobby_EventScript_1B7681
@@ -26,8 +26,8 @@ VerdanturfTown_ContestLobby_EventScript_1B763F:: @ 81B763F
 LilycoveCity_ContestLobby_EventScript_1B7659:: @ 81B7659
 	setvar VAR_0x8008, 3
 	setvar VAR_0x8009, 3
-	applymovement 9, LilycoveCity_ContestLobby_Movement_1A083D
-	applymovement 10, LilycoveCity_ContestLobby_Movement_1A083D
+	applymovement 9, Common_Movement_FaceOriginalDirection
+	applymovement 10, Common_Movement_FaceOriginalDirection
 	applymovement VAR_0x8008, LilycoveCity_ContestLobby_Movement_1B7821
 	waitmovement 0
 	goto LilycoveCity_ContestLobby_EventScript_1B7681
@@ -52,7 +52,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B770E
-	msgbox FallarborTown_ContestLobby_Text_1B6E9D, 4
+	msgbox FallarborTown_ContestLobby_Text_1B6E9D, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetFirstFreePokeblockSlot
 	compare VAR_RESULT, -1
 	goto_if_ne FallarborTown_ContestLobby_EventScript_1B76EF
@@ -61,7 +61,7 @@ FallarborTown_ContestLobby_EventScript_1B76A1:: @ 81B76A1
 	end
 
 FallarborTown_ContestLobby_EventScript_1B76E5:: @ 81B76E5
-	msgbox FallarborTown_ContestLobby_Text_1B6EA8, 4
+	msgbox FallarborTown_ContestLobby_Text_1B6EA8, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -74,49 +74,49 @@ FallarborTown_ContestLobby_EventScript_1B76EF:: @ 81B76EF
 	end
 
 FallarborTown_ContestLobby_EventScript_1B770E:: @ 81B770E
-	msgbox FallarborTown_ContestLobby_Text_1B6FF0, 4
-	dodailyevents
+	msgbox FallarborTown_ContestLobby_Text_1B6FF0, MSGBOX_DEFAULT
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B774F
 	goto FallarborTown_ContestLobby_EventScript_1B7759
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7726:: @ 81B7726
-	msgbox FallarborTown_ContestLobby_Text_1B6F1F, 4
+	msgbox FallarborTown_ContestLobby_Text_1B6F1F, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1B7734
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7734:: @ 81B7734
-	msgbox FallarborTown_ContestLobby_Text_1B6EF1, 4
+	msgbox FallarborTown_ContestLobby_Text_1B6EF1, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1B7742
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7742:: @ 81B7742
 	copyvar VAR_0x8004, VAR_0x8009
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special DoBerryBlending
 	waitstate
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B774F:: @ 81B774F
-	msgbox FallarborTown_ContestLobby_Text_1B70F6, 4
+	msgbox FallarborTown_ContestLobby_Text_1B70F6, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7759:: @ 81B7759
-	msgbox FallarborTown_ContestLobby_Text_1B704A, 4
-	giveitem_std ITEM_PECHA_BERRY
+	msgbox FallarborTown_ContestLobby_Text_1B704A, MSGBOX_DEFAULT
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
 	goto FallarborTown_ContestLobby_EventScript_1B76EF
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7776:: @ 81B7776
-	msgbox FallarborTown_ContestLobby_Text_1B717C, 4
+	msgbox FallarborTown_ContestLobby_Text_1B717C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7780:: @ 81B7780
-	msgbox FallarborTown_ContestLobby_Text_1B71D2, 4
+	msgbox FallarborTown_ContestLobby_Text_1B71D2, MSGBOX_DEFAULT
 	releaseall
 	end
 
@@ -146,7 +146,7 @@ SlateportCity_ContestLobby_EventScript_1B77B6:: @ 81B77B6
 VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
 	lock
 	faceplayer
-	msgbox FallarborTown_ContestLobby_Text_1B742F, 4
+	msgbox FallarborTown_ContestLobby_Text_1B742F, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, 1
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B77DC
@@ -155,26 +155,26 @@ VerdanturfTown_ContestLobby_EventScript_1B77B6:: @ 81B77B6
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77DC:: @ 81B77DC
-	msgbox FallarborTown_ContestLobby_Text_1B7469, 4
+	msgbox FallarborTown_ContestLobby_Text_1B7469, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77E6:: @ 81B77E6
-	dodailyevents
+	dotimebasedevents
 	goto_if_set FLAG_DAILY_RECEIVED_BERRY_FALLARBOR, FallarborTown_ContestLobby_EventScript_1B77F6
 	goto FallarborTown_ContestLobby_EventScript_1B7800
 	end
 
 FallarborTown_ContestLobby_EventScript_1B77F6:: @ 81B77F6
-	msgbox FallarborTown_ContestLobby_Text_1B7578, 4
+	msgbox FallarborTown_ContestLobby_Text_1B7578, MSGBOX_DEFAULT
 	release
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7800:: @ 81B7800
-	msgbox FallarborTown_ContestLobby_Text_1B74B4, 4
-	giveitem_std ITEM_PECHA_BERRY
+	msgbox FallarborTown_ContestLobby_Text_1B74B4, MSGBOX_DEFAULT
+	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_RECEIVED_BERRY_FALLARBOR
-	msgbox FallarborTown_ContestLobby_Text_1B753A, 4
+	msgbox FallarborTown_ContestLobby_Text_1B753A, MSGBOX_DEFAULT
 	release
 	end
 
@@ -183,7 +183,7 @@ LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821
 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821
 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
 	walk_in_place_fastest_right
-	end_movement
+	step_end
 
 FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
 	goto FallarborTown_ContestLobby_EventScript_1B783B
@@ -228,12 +228,12 @@ FallarborTown_ContestLobby_EventScript_1B7878:: @ 81B7878
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7897:: @ 81B7897
-	msgbox FallarborTown_ContestLobby_Text_1B7381, 4
+	msgbox FallarborTown_ContestLobby_Text_1B7381, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
-	call S_DoSaveDialog
+	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936
 	message FallarborTown_ContestLobby_Text_1B7304
@@ -253,23 +253,23 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
 	end
 
 FallarborTown_ContestLobby_EventScript_1B78F3:: @ 81B78F3
-	msgbox FallarborTown_ContestLobby_Text_1B733B, 4
+	msgbox FallarborTown_ContestLobby_Text_1B733B, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7901:: @ 81B7901
-	msgbox FallarborTown_ContestLobby_Text_1B7347, 4
+	msgbox FallarborTown_ContestLobby_Text_1B7347, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B790F:: @ 81B790F
-	msgbox FallarborTown_ContestLobby_Text_1B735A, 4
+	msgbox FallarborTown_ContestLobby_Text_1B735A, MSGBOX_DEFAULT
 	goto FallarborTown_ContestLobby_EventScript_1B791D
 	end
 
 FallarborTown_ContestLobby_EventScript_1B791D:: @ 81B791D
 	setvar VAR_0x8004, 0
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	removeobject 240
 	removeobject 239
 	removeobject 238
@@ -284,41 +284,41 @@ FallarborTown_ContestLobby_EventScript_1B7936:: @ 81B7936
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7938:: @ 81B7938
-	msgbox FallarborTown_ContestLobby_Text_1B73B7, 4
+	msgbox FallarborTown_ContestLobby_Text_1B73B7, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7942:: @ 81B7942
-	msgbox FallarborTown_ContestLobby_Text_1B73F1, 4
+	msgbox FallarborTown_ContestLobby_Text_1B73F1, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B794C:: @ 81B794C
 	special CloseLink
-	msgbox FallarborTown_ContestLobby_Text_1A4A30, 4
+	msgbox FallarborTown_ContestLobby_Text_1A4A30, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7959:: @ 81B7959
 	special CloseLink
-	msgbox FallarborTown_ContestLobby_Text_1A4B1D, 4
+	msgbox FallarborTown_ContestLobby_Text_1A4B1D, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7966:: @ 81B7966
 	special CloseLink
-	msgbox FallarborTown_ContestLobby_Text_1A10EB, 4
+	msgbox FallarborTown_ContestLobby_Text_1A10EB, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7973:: @ 81B7973
 	special CloseLink
-	msgbox FallarborTown_ContestLobby_Text_1A4A85, 4
+	msgbox FallarborTown_ContestLobby_Text_1A4A85, MSGBOX_DEFAULT
 	releaseall
 	end
 
 FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
 	copyvar VAR_0x8004, VAR_0x8008
@@ -327,7 +327,7 @@ FallarborTown_ContestLobby_EventScript_1B7980:: @ 81B7980
 	end
 
 FallarborTown_ContestLobby_EventScript_1B799A:: @ 81B799A
-	fadescreen 0
+	fadescreen FADE_FROM_BLACK
 	switch VAR_0x8008
 	case 2, FallarborTown_ContestLobby_EventScript_1B78F3
 	case 3, FallarborTown_ContestLobby_EventScript_1B7901
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
new file mode 100644
index 000000000..92c79a07a
--- /dev/null
+++ b/data/scripts/prof_birch.inc
@@ -0,0 +1,84 @@
+ProfBirch_EventScript_UpdateLocation:: @ 81A02F4
+	compare VAR_PETALBURG_GYM_STATE, 0
+	goto_if_eq Common_EventScript_Return
+	compare VAR_BIRCH_STATE, 0
+	call_if_eq ProfBirch_EventScript_MoveToLab
+	compare VAR_BIRCH_STATE, 1
+	call_if_eq ProfBirch_EventScript_MoveToLab
+	compare VAR_BIRCH_STATE, 2
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
+	compare VAR_BIRCH_STATE, 3
+	call_if_eq ProfBirch_EventScript_MoveToRoute101
+	compare VAR_BIRCH_STATE, 4
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
+	compare VAR_BIRCH_STATE, 5
+	call_if_eq ProfBirch_EventScript_MoveToRoute103
+	compare VAR_BIRCH_STATE, 6
+	call_if_eq ProfBirch_EventScript_MoveToLab
+	compare VAR_BIRCH_STATE, 7
+	call_if_eq ProfBirch_EventScript_MoveToLab
+	return
+
+ProfBirch_EventScript_MoveToLab:: @ 81A0358
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	clearflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	return
+
+ProfBirch_EventScript_MoveToRoute101:: @ 81A0365
+	clearflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
+	setflag FLAG_HIDE_BIRCH_ROUTE103
+	return
+
+ProfBirch_EventScript_MoveToRoute103:: @ 81A0372
+	clearflag FLAG_HIDE_BIRCH_ROUTE103
+	setflag FLAG_HIDE_BIRCH_ROUTE101
+	setflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_UNKNOWN_BIRCH_380
+	return
+
+ProfBirch_EventScript_AskRatePokedex:: @ 81A037F
+	lock
+	faceplayer
+	msgbox gBirchDexRatingText_ComeToShowMePokedex, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq ProfBirch_EventScript_DeclineRating
+	call ProfBirch_EventScript_RatePokedex
+	release
+	end
+
+ProfBirch_EventScript_DeclineRating:: @ 81A039B
+	msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
+	release
+	end
+
+ProfBirch_EventScript_ShowRatingMessage:: @ 81A03A5
+	copyvar VAR_0x8004, VAR_0x8009
+	special ShowPokedexRatingMessage
+	waitmessage
+	waitbuttonpress
+	return
+
+ProfBirch_EventScript_RatePokedex:: @ 81A03B0
+	setvar VAR_0x8004, 0
+	specialvar VAR_RESULT, ScriptGetPokedexInfo
+	copyvar VAR_0x8008, VAR_0x8005
+	copyvar VAR_0x8009, VAR_0x8006
+	copyvar VAR_0x800A, VAR_RESULT
+	buffernumberstring 0, VAR_0x8008  @ Num Hoenn seen
+	buffernumberstring 1, VAR_0x8009  @ Num Hoenn caught
+	msgbox gBirchDexRatingText_SoYouveSeenAndCaught, MSGBOX_DEFAULT
+	call ProfBirch_EventScript_ShowRatingMessage
+	compare VAR_0x800A, 0
+	goto_if_eq Common_EventScript_Return  @ National dex not enabled
+	setvar VAR_0x8004, 1
+	specialvar VAR_RESULT, ScriptGetPokedexInfo
+	copyvar VAR_0x8008, VAR_0x8005
+	copyvar VAR_0x8009, VAR_0x8006
+	buffernumberstring 0, VAR_0x8008  @ Num National seen
+	buffernumberstring 1, VAR_0x8009  @ Num National caught
+	msgbox gBirchDexRatingText_OnANationwideBasis, MSGBOX_DEFAULT
+	return
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
new file mode 100644
index 000000000..6415f9ceb
--- /dev/null
+++ b/data/scripts/record_mix.inc
@@ -0,0 +1,22 @@
+@ Seems this was superseded by the Record Center, and the below scripts are now unused
+EventScript_MixRecordsPrompt: @ 819FFD5
+	lock
+	faceplayer
+	msgbox UnusedMixRecordsPromptText, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq EventScript_MixRecords
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_EndMixRecords
+	goto EventScript_EndMixRecords
+	
+EventScript_MixRecords: @ 819FFFA
+	special RecordMixingPlayerSpotTriggered
+	waitstate
+	lock
+	faceplayer
+EventScript_EndMixRecords: @ 81A0000
+	message UnusedMixRecordsSeeYouAgainText
+	waitmessage
+	waitbuttonpress
+	release
+	end
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index aad2e3237..68efec328 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -52,7 +52,7 @@ gUnknown_081C346A:: @ 81C346A
 	end
 
 EventScript_1C348E:
-	fadescreen 1
+	fadescreen FADE_TO_BLACK
 	special OpenPokeblockCaseOnFeeder
 	waitstate
 	compare VAR_RESULT, 0xFFFF
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
new file mode 100644
index 000000000..8a82583b2
--- /dev/null
+++ b/data/scripts/secret_base.inc
@@ -0,0 +1,683 @@
+gUnknown_081A2C51:: @ 81A2C51
+	special sub_80BB70C
+	special CheckPlayerHasSecretBase
+	compare VAR_RESULT, 1
+	goto_if_eq AskToMoveSecretBase
+	checkpartymove MOVE_SECRET_POWER
+	setfieldeffectargument 0, VAR_RESULT
+	buffermovename 1, MOVE_SECRET_POWER
+	compare VAR_0x8007, 1
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_0x8007, 2
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_0x8007, 3
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_0x8007, 4
+	goto_if_eq EventScript_1A2CB0
+	compare VAR_0x8007, 5
+	goto_if_eq EventScript_1A2D08
+	compare VAR_0x8007, 6
+	goto_if_eq EventScript_1A2D60
+	end
+
+EventScript_1A2CB0:
+	lockall
+	compare VAR_RESULT, 6
+	goto_if_eq EventScript_1A2CF1
+	bufferpartymonnick 0, VAR_RESULT
+	msgbox UnknownString_8198F34, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
+	closemessage
+	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
+	waitstate
+	goto EventScript_1A2CFA
+	end
+
+DoSecretBaseCaveFieldEffectScript:: @ 81A2CE6
+	lockall
+	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
+	waitstate
+	goto EventScript_1A2CFA
+	end
+
+EventScript_1A2CF1:
+	msgbox UnknownString_8198F10, MSGBOX_SIGN
+	end
+
+EventScript_1A2CFA:
+	msgbox UnknownString_8198F6E, MSGBOX_DEFAULT
+	goto EventScript_1A2DB8
+	end
+
+EventScript_1A2D08:
+	lockall
+	compare VAR_RESULT, 6
+	goto_if_eq EventScript_1A2D49
+	bufferpartymonnick 0, VAR_RESULT
+	msgbox UnknownString_81A197B, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
+	closemessage
+	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
+	waitstate
+	goto EventScript_1A2D52
+	end
+
+DoSecretBaseTreeFieldEffectScript:: @ 81A2D3E
+	lockall
+	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
+	waitstate
+	goto EventScript_1A2D52
+	end
+
+EventScript_1A2D49:
+	msgbox UnknownString_81A1948, MSGBOX_SIGN
+	end
+
+EventScript_1A2D52:
+	msgbox UnknownString_81A19C4, MSGBOX_DEFAULT
+	goto EventScript_1A2DB8
+	end
+
+EventScript_1A2D60:
+	lockall
+	compare VAR_RESULT, 6
+	goto_if_eq EventScript_1A2DA1
+	bufferpartymonnick 0, VAR_RESULT
+	msgbox UnknownString_81A1A4B, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
+	closemessage
+	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
+	waitstate
+	goto EventScript_1A2DAA
+	end
+
+DoSecretBaseShrubFieldEffectScript:: @ 81A2D96
+	lockall
+	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
+	waitstate
+	goto EventScript_1A2DAA
+	end
+
+EventScript_1A2DA1:
+	msgbox UnknownString_81A1A03, MSGBOX_SIGN
+	end
+
+EventScript_1A2DAA:
+	msgbox UnknownString_81A1AA9, MSGBOX_DEFAULT
+	goto EventScript_1A2DB8
+	end
+
+EventScript_1A2DB8:
+	closemessage
+	playse SE_KAIDAN
+	setvar VAR_INIT_SECRET_BASE, 0
+	setflag FLAG_DECORATION_1
+	special sub_80BB8CC
+	special sub_80BBAF0
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	special sub_80BBDD0
+	setvar VAR_SECRET_BASE_INITIALIZED, 1
+	waitstate
+	end
+
+SecretBase_EventScript_FirstEntrance:: @ 81A2DDE
+	applymovement OBJ_EVENT_ID_PLAYER, SecretBase_RedCave1_Movement_1A2E11
+	waitmovement 0
+	setvar VAR_INIT_SECRET_BASE, 1
+	msgbox SecretBase_RedCave1_Text_198F89, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
+	closemessage
+	playse SE_KAIDAN
+	special sub_80BC440
+	end
+
+SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
+	closemessage
+	setflag FLAG_RECEIVED_SECRET_POWER
+	special sub_80BBC78
+	waitstate
+	end
+
+SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
+	walk_up
+	walk_up
+	step_end
+
+gUnknown_081A2E14:: @ 81A2E14
+	lockall
+	setvar VAR_INIT_SECRET_BASE, 1
+	playse SE_KAIDAN
+	special sub_80BC114
+	compare VAR_RESULT, 0
+	goto_if_eq EventScript_1A2E38
+	clearflag FLAG_DECORATION_1
+	special sub_80BBAF0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
+	waitstate
+	end
+
+EventScript_1A2E38:
+	setflag FLAG_DECORATION_1
+	special sub_80BBAF0
+	setvar VAR_SECRET_BASE_INITIALIZED, 0
+	waitstate
+	end
+
+AskToMoveSecretBase:
+	checkpartymove MOVE_SECRET_POWER
+	compare VAR_RESULT, 6
+	goto_if_eq EventScript_1A2EF7
+	setfieldeffectargument 0, VAR_RESULT
+	setorcopyvar VAR_0x8004, VAR_RESULT
+	lockall
+	special GetSecretBaseNearbyMapName
+	msgbox UnknownString_81A3C71, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	fadescreen FADE_TO_BLACK
+	special MoveSecretBase
+	closemessage
+	fadescreen FADE_FROM_BLACK
+	msgbox UnknownString_81A3CC9, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_1A2F3A
+	bufferpartymonnick 0, VAR_0x8004
+	buffermovename 1, MOVE_SECRET_POWER
+	msgbox UsedCutRockSmashText, MSGBOX_DEFAULT
+	closemessage
+	closemessage
+	compare VAR_0x8007, 1
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
+	compare VAR_0x8007, 2
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
+	compare VAR_0x8007, 3
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
+	compare VAR_0x8007, 4
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
+	compare VAR_0x8007, 5
+	goto_if_eq DoSecretBaseTreeFieldEffectScript
+	compare VAR_0x8007, 6
+	goto_if_eq DoSecretBaseShrubFieldEffectScript
+	releaseall
+	end
+
+EventScript_1A2EF7::
+	compare VAR_0x8007, 1
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_0x8007, 2
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_0x8007, 3
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_0x8007, 4
+	goto_if_eq EventScript_1A2CF1
+	compare VAR_0x8007, 5
+	goto_if_eq EventScript_1A2D49
+	compare VAR_0x8007, 6
+	goto_if_eq EventScript_1A2DA1
+	end
+
+EventScript_1A2F3A::
+	closemessage
+	releaseall
+	end
+
+SecretBase_EventScript_SetDecorationFlags:: @ 81A2F3D
+	setflag FLAG_DECORATION_2
+	setflag FLAG_DECORATION_3
+	setflag FLAG_DECORATION_4
+	setflag FLAG_DECORATION_5
+	setflag FLAG_DECORATION_6
+	setflag FLAG_DECORATION_7
+	setflag FLAG_DECORATION_8
+	setflag FLAG_DECORATION_9
+	setflag FLAG_DECORATION_10
+	setflag FLAG_DECORATION_11
+	setflag FLAG_DECORATION_12
+	setflag FLAG_DECORATION_13
+	setflag FLAG_DECORATION_14
+	setflag FLAG_DECORATION_15
+	return
+
+SecretBase_EventScript_InitDecorations:: @ 81A2F68
+	setvar VAR_0x8004, 0
+	setvar VAR_0x8005, 0
+	special sub_80BBDD0
+	setvar VAR_SECRET_BASE_INITIALIZED, 1
+	end
+
+gUnknown_081A2F7B:: @ 81A2F7B
+	setvar VAR_0x8005, 0
+	goto EventScript_1A2F86
+	end
+
+EventScript_1A2F86:
+	special sub_80FF474
+	end
+
+gUnknown_081A2F8A:: @ 81A2F8A
+	setvar VAR_0x8004, 0
+	goto EventScript_1A2F95
+	end
+
+EventScript_1A2F95:
+	special sub_8100A7C
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_1A2FBF
+	addvar VAR_0x8004, 1
+	compare VAR_0x8005, 0
+	goto_if_eq EventScript_1A2F95
+	removeobject VAR_0x8006
+	setflag VAR_0x8005
+	goto EventScript_1A2F95
+	end
+
+EventScript_1A2FBF:
+	end
+
+SecretBase_BlueCave1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BlueCave2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BlueCave3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BlueCave4_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BrownCave1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BrownCave2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BrownCave3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_BrownCave4_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_RedCave1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_RedCave2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_RedCave3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_RedCave4_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Shrub1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Shrub2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Shrub3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Shrub4_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Tree1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Tree2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Tree3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_Tree4_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_YellowCave1_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_YellowCave2_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_YellowCave3_EventScript_1A2FC0:: @ 81A2FC0
+SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0
+	special sub_80BCE90
+	compare VAR_0x8004, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3032
+	compare VAR_0x8004, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A30AE
+	compare VAR_0x8004, 2
+	goto_if_eq SecretBase_RedCave1_EventScript_1A312A
+	compare VAR_0x8004, 3
+	goto_if_eq SecretBase_RedCave1_EventScript_1A31A6
+	compare VAR_0x8004, 4
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3222
+	compare VAR_0x8004, 5
+	goto_if_eq SecretBase_RedCave1_EventScript_1A329E
+	compare VAR_0x8004, 6
+	goto_if_eq SecretBase_RedCave1_EventScript_1A331A
+	compare VAR_0x8004, 7
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3396
+	compare VAR_0x8004, 8
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3412
+	compare VAR_0x8004, 9
+	goto_if_eq SecretBase_RedCave1_EventScript_1A348E
+	end
+
+SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3086
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A30A5
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A1AEA, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1B83, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
+	msgbox SecretBase_RedCave1_Text_1A1C3B, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1B97, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5
+	msgbox SecretBase_RedCave1_Text_1A1BF8, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3102
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3121
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A1E67, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1F04, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
+	msgbox SecretBase_RedCave1_Text_1A1FBD, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1F2E, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121
+	msgbox SecretBase_RedCave1_Text_1A1F88, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A317E
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A319D
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A218F, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2220, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
+	msgbox SecretBase_RedCave1_Text_1A22FA, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2230, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D
+	msgbox SecretBase_RedCave1_Text_1A2280, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A31FA
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3219
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A24E1, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A256F, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
+	msgbox SecretBase_RedCave1_Text_1A2609, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A258A, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219
+	msgbox SecretBase_RedCave1_Text_1A25D2, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3276
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3295
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A2830, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A28D7, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
+	msgbox SecretBase_RedCave1_Text_1A297C, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A28F4, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295
+	msgbox SecretBase_RedCave1_Text_1A294D, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A32F2
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3311
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A1CB2, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1D48, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
+	msgbox SecretBase_RedCave1_Text_1A1DF6, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A1D59, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311
+	msgbox SecretBase_RedCave1_Text_1A1DC0, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A336E
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A338D
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A2026, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2095, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
+	msgbox SecretBase_RedCave1_Text_1A2147, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A20AE, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D
+	msgbox SecretBase_RedCave1_Text_1A2109, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A33EA
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3409
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A236A, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2405, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
+	msgbox SecretBase_RedCave1_Text_1A2480, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2420, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409
+	msgbox SecretBase_RedCave1_Text_1A2446, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A3466
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3485
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A2663, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2710, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
+	msgbox SecretBase_RedCave1_Text_1A27A4, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2736, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485
+	msgbox SecretBase_RedCave1_Text_1A276A, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_RedCave1_EventScript_1A34E2
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_RedCave1_EventScript_1A3501
+	lock
+	faceplayer
+	msgbox SecretBase_RedCave1_Text_1A2A13, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
+	setvar VAR_RESULT, 1
+	special sub_80BCE4C
+	call Common_EventScript_SaveGame
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2AE2, MSGBOX_DEFAULT
+	goto SecretBase_RedCave1_EventScript_1A350A
+	end
+
+SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
+	msgbox SecretBase_RedCave1_Text_1A2BA4, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
+	setvar VAR_RESULT, 0
+	special sub_80BCE4C
+	erasebox 0, 0, 15, 10
+	msgbox SecretBase_RedCave1_Text_1A2AFB, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A3501:: @ 81A3501
+	msgbox SecretBase_RedCave1_Text_1A2B69, MSGBOX_NPC
+	end
+
+SecretBase_RedCave1_EventScript_1A350A:: @ 81A350A
+	special sub_80BCE1C
+	setvar VAR_0x8004, 1
+	setvar VAR_0x8005, 0
+	special StartSpecialBattle
+	waitstate
+	special ScrSpecial_HealPlayerParty
+	release
+	end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 22f998d14..5042bd211 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -4,15 +4,15 @@ Route111_EventScript_1A3858:: @ 81A3858
 	msgbox Route111_Text_1A3520, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route111_EventScript_1A3877
-	msgbox Route111_Text_1A37B5, 4
+	msgbox Route111_Text_1A37B5, MSGBOX_DEFAULT
 	release
 	end
 
 Route111_EventScript_1A3877:: @ 81A3877
-	giveitem_std ITEM_TM43_SECRET_POWER
+	giveitem ITEM_TM43_SECRET_POWER
 	compare VAR_RESULT, 0
 	goto_if_eq Route111_EventScript_1A38D9
-	msgbox Route111_Text_1A35C5, 4
+	msgbox Route111_Text_1A35C5, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_RECEIVED_SECRET_POWER
 	clearflag FLAG_HIDE_TM_SALESMAN_SLATEPORT
@@ -37,7 +37,7 @@ Route111_EventScript_1A38CE:: @ 81A38CE
 	return
 
 Route111_EventScript_1A38D9:: @ 81A38D9
-	msgbox Route111_Text_1A37F6, 4
+	msgbox Route111_Text_1A37F6, MSGBOX_DEFAULT
 	release
 	end
 
@@ -53,7 +53,7 @@ Route111_Movement_1A38E3:: @ 81A38E3
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
 
 Route111_Movement_1A38EF:: @ 81A38EF
 	walk_left
@@ -67,4 +67,4 @@ Route111_Movement_1A38EF:: @ 81A38EF
 	walk_left
 	walk_down
 	walk_down
-	end_movement
+	step_end
diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc
new file mode 100644
index 000000000..3248c2d82
--- /dev/null
+++ b/data/scripts/set_gym_trainers.inc
@@ -0,0 +1,74 @@
+Common_EventScript_SetGymTrainers:: @ 81A01C0
+	switch VAR_0x8008
+	case 1, RusboroCity_Gym_SetGymTrainers
+	case 2, DewfordTown_Gym_SetGymTrainers
+	case 3, MauvilleCity_Gym_SetGymTrainers
+	case 4, LavaridgeTown_Gym_SetGymTrainers
+	case 5, PetalburgCity_Gym_SetGymTrainers
+	case 6, FortreeCity_Gym_SetGymTrainers
+	case 7, MossdeepCity_Gym_SetGymTrainers
+	case 8, SootopolisCity_Gym_SetGymTrainers
+	end
+
+RusboroCity_Gym_SetGymTrainers:: @ 81A021E
+	settrainerflag TRAINER_JOSH
+	settrainerflag TRAINER_TOMMY
+	return
+
+DewfordTown_Gym_SetGymTrainers:: @ 81A0225
+	settrainerflag TRAINER_HIDEKI
+	settrainerflag TRAINER_TESSA
+	settrainerflag TRAINER_LAURA
+	return
+
+MauvilleCity_Gym_SetGymTrainers:: @ 81A022F
+	settrainerflag TRAINER_KIRK
+	settrainerflag TRAINER_SHAWN
+	settrainerflag TRAINER_BEN
+	settrainerflag TRAINER_VIVIAN
+	return
+
+LavaridgeTown_Gym_SetGymTrainers:: @ 81A023C
+	settrainerflag TRAINER_COLE
+	settrainerflag TRAINER_AXLE
+	settrainerflag TRAINER_ANDY
+	settrainerflag TRAINER_ZANE
+	settrainerflag TRAINER_SADIE
+	return
+
+PetalburgCity_Gym_SetGymTrainers:: @ 81A024C
+	settrainerflag TRAINER_RANDALL
+	settrainerflag TRAINER_PARKER
+	settrainerflag TRAINER_GEORGE
+	settrainerflag TRAINER_BERKE
+	settrainerflag TRAINER_MARY
+	settrainerflag TRAINER_LORI
+	settrainerflag TRAINER_JODY
+	return
+
+FortreeCity_Gym_SetGymTrainers:: @ 81A0262
+	settrainerflag TRAINER_JARED
+	settrainerflag TRAINER_TERRELL
+	settrainerflag TRAINER_KYLEE
+	settrainerflag TRAINER_WILL
+	return
+
+MossdeepCity_Gym_SetGymTrainers:: @ 81A026F
+	settrainerflag TRAINER_PRESTON
+	settrainerflag TRAINER_VIRGIL
+	settrainerflag TRAINER_FRITZ
+	settrainerflag TRAINER_HANNAH
+	settrainerflag TRAINER_SAMANTHA
+	settrainerflag TRAINER_MAURA
+	return
+
+SootopolisCity_Gym_SetGymTrainers:: @ 81A0282
+	settrainerflag TRAINER_ANDREA
+	settrainerflag TRAINER_CRISSY
+	settrainerflag TRAINER_BRIANNA_2
+	settrainerflag TRAINER_CONNIE
+	settrainerflag TRAINER_BRIDGET
+	settrainerflag TRAINER_OLIVIA
+	settrainerflag TRAINER_TIFFANY
+	settrainerflag TRAINER_MARISSA
+	return
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
new file mode 100644
index 000000000..e3b87f1ea
--- /dev/null
+++ b/data/scripts/shared_secret_base.inc
@@ -0,0 +1,190 @@
+SecretBase_MapScripts:: @ 815F337
+    map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SecretBase_OnWarp
+    map_script MAP_SCRIPT_ON_TRANSITION, SecretBase_OnTransition
+    map_script MAP_SCRIPT_ON_FRAME_TABLE, SecretBase_OnFrame
+    map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume
+    .byte 0
+
+SecretBase_OnResume:: @ 815F34C
+    setstepcallback 6
+    end
+
+SecretBase_OnTransition:: @ 815F34F
+    call SecretBase_EventScript_SetDecorationFlags
+    special SetSecretBaseOwnerGfxId
+    end
+
+SecretBase_OnWarp:: @ 815F358
+    map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations
+    .2byte 0
+
+SecretBase_OnFrame:: @ 815F362
+    map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance
+    .2byte 0
+
+SecretBase_EventScript_PC:: @ 815F36C
+	lockall
+	playse SE_PC_LOGON
+	message SecretBase_Text_BootUpPC
+	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
+	waitstate
+	waitmessage
+	waitbuttonpress
+	playse SE_SELECT
+	goto SecretBase_EventScript_PCShowMainMenu
+	end
+
+SecretBase_EventScript_PCShowMainMenu:
+	message SecretBase_Text_WhatWouldYouLikeToDo
+	waitmessage
+	goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister
+	goto SecretBase_EventScript_PCMainMenuWithoutRegister
+	end
+
+SecretBase_EventScript_PCCancel:: @ 815F399
+	lockall
+	goto SecretBase_EventScript_PCShowMainMenu
+	end
+
+SecretBase_EventScript_PCMainMenuWithRegister:
+	multichoice 0, 0, 6, 0
+	switch VAR_RESULT
+	case 0, SecretBase_EventScript_PCDecorationMenu
+	case 1, SecretBase_EventScript_PCPackUp
+	case 2, SecretBase_EventScript_PCRegistryMenu
+	case 3, SecretBase_EventScript_PCTurnOff
+	case 127, SecretBase_EventScript_PCTurnOff
+	end
+
+SecretBase_EventScript_PCMainMenuWithoutRegister:
+	multichoice 0, 0, 5, 0
+	switch VAR_RESULT
+	case 0, SecretBase_EventScript_PCDecorationMenu
+	case 1, SecretBase_EventScript_PCPackUp
+	case 2, SecretBase_EventScript_PCTurnOff
+	case 127, SecretBase_EventScript_PCTurnOff
+	end
+
+SecretBase_EventScript_PCPackUp:
+	msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_EventScript_PCShowMainMenu
+	closemessage
+	special MoveOutOfSecretBase
+	releaseall
+	end
+
+SecretBase_EventScript_PCDecorationMenu:
+	special SecretBasePC_Decoration
+	end
+
+SecretBase_EventScript_PCRegistryMenu:
+	special SecretBasePC_Registry
+	end
+
+SecretBase_EventScript_RecordMixingPC:: @ 815F43A
+	lockall
+	message SecretBase_Text_BootUpPC
+	playse SE_PC_LOGON
+	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
+	waitstate
+	waitmessage
+	waitbuttonpress
+	playse SE_SELECT
+	goto SecretBase_EventScript_PCRegisterMenu
+	end
+
+SecretBase_EventScript_PCRegisterMenu:
+	message SecretBase_Text_WhatWouldYouLikeToDo
+	waitmessage
+	multichoice 0, 0, 7, 0
+	switch VAR_RESULT
+	case 0, SecretBase_EventScript_PCRegister
+	case 1, SecretBase_EventScript_PCRegistryMenu
+	case 2, SecretBase_EventScript_PCRegistryInfo
+	case 3, SecretBase_EventScript_PCTurnOff
+	case 127, SecretBase_EventScript_PCTurnOff
+	end
+
+SecretBase_EventScript_ShowRegisterMenu:: @ 815F49A
+	lockall
+	goto SecretBase_EventScript_PCRegisterMenu
+	end
+
+SecretBase_EventScript_PCRegister:
+	special GetCurSecretBaseRegistrationValidity
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_EventScript_AlreadyRegistered
+	compare VAR_RESULT, 2
+	goto_if_eq SecretBase_EventScript_CantRegisterTooManyBases
+	special BufferSecretBaseOwnerName
+	msgbox SecretBase_Text_WantToRegisterSecretBase, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_EventScript_PCRegisterMenu
+	msgbox SecretBase_Text_RegistrationCompleted, MSGBOX_SIGN
+	special ToggleCurSecretBaseRegistry
+	special DoSecretBasePCTurnOffEffect
+	releaseall
+	end
+
+SecretBase_EventScript_AlreadyRegistered:
+	msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq SecretBase_EventScript_PCRegisterMenu
+	msgbox SecretBase_Text_DataUnregistered, MSGBOX_SIGN
+	special ToggleCurSecretBaseRegistry
+	special DoSecretBasePCTurnOffEffect
+	releaseall
+	end
+
+SecretBase_EventScript_CantRegisterTooManyBases:
+	msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN
+	special DoSecretBasePCTurnOffEffect
+	closemessage
+	releaseall
+	end
+
+SecretBase_EventScript_PCRegistryInfo:
+	message SecretBase_Text_RegistryInfo
+	waitmessage
+	goto SecretBase_EventScript_PCRegisterMenu
+	end
+
+SecretBase_EventScript_PCTurnOff:
+	special DoSecretBasePCTurnOffEffect
+	closemessage
+	releaseall
+	end
+
+SecretBase_EventScript_SandOrnament:: @ 815F523
+	dofieldeffect FLDEFF_SAND_PILLAR
+	waitstate
+	end
+
+SecretBase_EventScript_ShieldOrToyTV:: @ 815F528
+	special GetShieldToyTVDecorationInfo
+	compare VAR_RESULT, 0
+	goto_if_eq SecretBase_EventScript_BattleTowerShield
+	compare VAR_RESULT, 1
+	goto_if_eq SecretBase_EventScript_ToyTV
+	compare VAR_RESULT, 2
+	goto_if_eq SecretBase_EventScript_SeedotTV
+	compare VAR_RESULT, 3
+	goto_if_eq SecretBase_EventScript_SkittyTV
+	end
+
+SecretBase_EventScript_BattleTowerShield:
+	msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN
+	end
+
+SecretBase_EventScript_ToyTV:
+	msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN
+	end
+
+SecretBase_EventScript_SeedotTV:
+	msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN
+	end
+
+SecretBase_EventScript_SkittyTV:
+	msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN
+	end
diff --git a/data/scripts/static_pokemon.inc b/data/scripts/static_pokemon.inc
new file mode 100644
index 000000000..c881d9518
--- /dev/null
+++ b/data/scripts/static_pokemon.inc
@@ -0,0 +1,177 @@
+Hideout_B1F_EventScript_Electrode1:: @ 81A04FD
+	lock
+	faceplayer
+	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	release
+	end
+
+Hideout_B1F_EventScript_Electrode2:: @ 81A051B
+	lock
+	faceplayer
+	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
+	waitse
+	playmoncry SPECIES_ELECTRODE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	release
+	end
+
+Route120_EventScript_Kecleon1:: @ 81A0539
+	lock
+	faceplayer
+	setvar VAR_0x8004, 1
+	goto EventScript_Kecleon
+	end
+
+Route120_EventScript_Kecleon2:: @ 81A0546
+	lock
+	faceplayer
+	setvar VAR_0x8004, 2
+	goto EventScript_Kecleon
+	end
+
+Route120_EventScript_Kecleon3:: @ 81A0553
+	lock
+	faceplayer
+	setvar VAR_0x8004, 3
+	goto EventScript_Kecleon
+	end
+
+Route120_EventScript_Kecleon4:: @ 81A0560
+	lock
+	faceplayer
+	setvar VAR_0x8004, 4
+	goto EventScript_Kecleon
+	end
+
+Route120_EventScript_Kecleon5:: @ 81A056D
+	lock
+	faceplayer
+	setvar VAR_0x8004, 5
+	goto EventScript_Kecleon
+	end
+
+Route119_EventScript_Kecleon1:: @ 81A057A
+	lock
+	faceplayer
+	setvar VAR_0x8004, 6
+	goto EventScript_Kecleon
+	end
+
+Route119_EventScript_Kecleon2:: @ 81A0587
+	lock
+	faceplayer
+	setvar VAR_0x8004, 7
+	goto EventScript_Kecleon
+	end
+
+EventScript_Kecleon:: @ 81A0594
+	checkitem ITEM_DEVON_SCOPE, 1
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_AskUseDevonScope
+	msgbox Text_SomethingUnseeable, MSGBOX_DEFAULT
+	release
+	end
+
+EventScript_AskUseDevonScope:: @ 81A05AE
+	msgbox Text_WantToUseDevonScope, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq EventScript_BattleKecleon
+	release
+	end
+
+EventScript_BattleKecleon:: @ 81A05C3
+	msgbox Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT
+	closemessage
+	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
+	waitmovement 0
+	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
+	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
+	compare VAR_0x8004, 1
+	call_if_eq Route120_EventScript_HideKecleon1
+	compare VAR_0x8004, 2
+	call_if_eq Route120_EventScript_HideKecleon2
+	compare VAR_0x8004, 3
+	call_if_eq Route120_EventScript_HideKecleon3
+	compare VAR_0x8004, 4
+	call_if_eq Route120_EventScript_HideKecleon4
+	compare VAR_0x8004, 5
+	call_if_eq Route120_EventScript_HideKecleon5
+	compare VAR_0x8004, 6
+	call_if_eq Route119_EventScript_HideKecleon1
+	compare VAR_0x8004, 7
+	call_if_eq Route119_EventScript_HideKecleon2
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	release
+	end
+
+Route120_EventScript_HideKecleon1:: @ 81A0646
+	setflag FLAG_HIDE_KECLEON_ROUTE120_3
+	return
+
+Route120_EventScript_HideKecleon2:: @ 81A064A
+	setflag FLAG_HIDE_KECLEON_ROUTE120_4
+	return
+
+Route120_EventScript_HideKecleon3:: @ 81A064E
+	setflag FLAG_HIDE_KECLEON_ROUTE120_5
+	return
+
+Route120_EventScript_HideKecleon4:: @ 81A0652
+	setflag FLAG_HIDE_KECLEON_ROUTE120_6
+	return
+
+Route120_EventScript_HideKecleon5:: @ 81A0656
+	setflag FLAG_HIDE_KECLEON_ROUTE120_7
+	return
+
+Route119_EventScript_HideKecleon1:: @ 81A065A
+	setflag FLAG_HIDE_KECLEON_ROUTE119_1
+	return
+
+Route119_EventScript_HideKecleon2:: @ 81A065E
+	setflag FLAG_HIDE_KECLEON_ROUTE119_2
+	return
+
+Movement_KecleonAppears:: @ 81A0662
+	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
+	step_end
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
new file mode 100644
index 000000000..912f88fa1
--- /dev/null
+++ b/data/scripts/std_msgbox.inc
@@ -0,0 +1,36 @@
+Std_MsgboxNPC:
+	lock
+	faceplayer
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
+
+Std_MsgboxSign:
+	lockall
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	releaseall
+	return
+
+Std_MsgboxDefault:
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	return
+
+Std_MsgboxYesNo:
+	message 0x0
+	waitmessage
+	yesnobox 20, 8
+	return
+
+EventScript_UnusedReturn: @ 819F805
+	return
+
+Common_EventScript_SaveGame:: @ 819F806
+	special SaveGame
+	waitstate
+	return
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
new file mode 100644
index 000000000..49b7a1162
--- /dev/null
+++ b/data/scripts/surf.inc
@@ -0,0 +1,16 @@
+EventScript_UseSurf:: @ 81A0117
+	checkpartymove MOVE_SURF
+	compare VAR_RESULT, PARTY_SIZE
+	goto_if_eq EventScript_EndUseSurf
+	bufferpartymonnick 0, VAR_RESULT
+	setfieldeffectargument 0, VAR_RESULT
+	lockall
+	msgbox gText_WantToUseSurf, MSGBOX_YESNO
+	compare VAR_RESULT, NO
+	goto_if_eq EventScript_ReleaseUseSurf
+	msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_SURF
+EventScript_ReleaseUseSurf: @ 81A014C
+	releaseall
+EventScript_EndUseSurf: @ 81A014D
+	end
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
new file mode 100644
index 000000000..4615435d1
--- /dev/null
+++ b/data/scripts/trainer_battle.inc
@@ -0,0 +1,136 @@
+EventScript_StartTrainerBattle:: @ 819F80B
+	lock
+	special PlayTrainerEncounterMusic
+	special EndTrainerApproach
+	waitstate
+	goto EventScript_DoTrainerBattle
+
+EventScript_TryDoNormalTrainerBattle:: @ 819F818
+	lock
+	faceplayer
+	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
+	waitmovement 0
+	specialvar VAR_RESULT, GetTrainerFlag
+	compare VAR_RESULT, 0
+	goto_if_ne EventScript_NoNormalTrainerBattle
+	special PlayTrainerEncounterMusic
+	special SetUpTrainerMovement
+	goto EventScript_DoTrainerBattle
+
+EventScript_NoNormalTrainerBattle:
+	gotopostbattlescript
+
+EventScript_TryDoDoubleTrainerBattle:: @ 819F840
+	lock
+	faceplayer
+	call EventScript_RevealTrainer
+	specialvar VAR_RESULT, GetTrainerFlag
+	compare VAR_RESULT, 0
+	goto_if_ne EventScript_NoDoubleTrainerBattle
+	special HasEnoughMonsForDoubleBattle
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne EventScript_NotEnoughMonsForDoubleBattle
+	special PlayTrainerEncounterMusic
+	special SetUpTrainerMovement
+	goto EventScript_DoTrainerBattle
+
+EventScript_NotEnoughMonsForDoubleBattle:
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EventScript_NoDoubleTrainerBattle:
+	gotopostbattlescript
+
+EventScript_DoNoIntroTrainerBattle:: @ 819F878
+	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
+	waitmovement 0
+	special PlayTrainerEncounterMusic
+	trainerbattlebegin
+	gotopostbattlescript
+
+EventScript_TryDoRematchBattle:: @ 819F887
+	call EventScript_RevealTrainer
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_NoRematchTrainerBattle
+	special PlayTrainerEncounterMusic
+	special SetUpTrainerMovement
+	special ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	special BattleSetup_StartRematchBattle
+	waitstate
+	releaseall
+	end
+
+EventScript_NoRematchTrainerBattle:
+	gotopostbattlescript
+
+EventScript_TryDoDoubleRematchBattle:: @ 819F8AE
+	specialvar VAR_RESULT, IsTrainerReadyForRematch
+	compare VAR_RESULT, FALSE
+	goto_if_eq EventScript_NoDoubleRematchTrainerBattle
+	special HasEnoughMonsForDoubleBattle
+	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
+	goto_if_ne EventScript_NotEnoughMonsForDoubleRematchBattle
+	special PlayTrainerEncounterMusic
+	special SetUpTrainerMovement
+	special ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	special BattleSetup_StartRematchBattle
+	waitstate
+	releaseall
+	end
+
+EventScript_NoDoubleRematchTrainerBattle:
+	gotopostbattlescript
+
+EventScript_NotEnoughMonsForDoubleRematchBattle:
+	special ScrSpecial_ShowTrainerNonBattlingSpeech
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EventScript_RevealTrainer:
+	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
+	waitmovement 0
+	return
+
+Movement_RevealTrainer::
+	reveal_trainer
+	step_end
+
+EventScript_DoTrainerBattle:
+	special ShowTrainerIntroSpeech
+	waitmessage
+	waitbuttonpress
+	trainerbattlebegin
+	specialvar VAR_RESULT, ScrSpecial_GetTrainerBattleMode
+	compare VAR_RESULT, TRAINER_BATTLE_SINGLE
+	goto_if_eq EventScript_EndTrainerBattle
+	compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT
+	goto_if_eq EventScript_GoToBeatenScript
+	compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC
+	goto_if_eq EventScript_GoToBeatenScript
+	compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE
+	goto_if_eq EventScript_GoToBeatenScript
+	compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
+	goto_if_eq EventScript_GoToBeatenScript
+EventScript_EndTrainerBattle:
+	releaseall
+	end
+
+EventScript_GoToBeatenScript:
+	gotobeatenscript
+
+Std_MsgboxAutoclose::
+	message 0x0
+	waitmessage
+	waitbuttonpress
+	release
+	return
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 486e5d68c..9c22f6595 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -30,21 +30,21 @@ EventScript_1A6EBB:
 
 EventScript_1A6EF1:
 	special GetMomOrDadStringForTVMessage
-	msgbox UnknownString_81A0E68, 4
+	msgbox UnknownString_81A0E68, MSGBOX_DEFAULT
 	special TurnOffTVScreen
 	releaseall
 	end
 
 EventScript_1A6F01:
-	msgbox UnknownString_817288C, 4
+	msgbox UnknownString_817288C, MSGBOX_DEFAULT
 	releaseall
 	end
 
 EventScript_1A6F0B:
 	.ifdef SAPPHIRE
-	msgbox UnknownString_8172D30, 4
+	msgbox UnknownString_8172D30, MSGBOX_DEFAULT
 	.else
-	msgbox UnknownString_8172C50, 4
+	msgbox UnknownString_8172C50, MSGBOX_DEFAULT
 	.endif
 	special InitRoamer
 	clearflag FLAG_SYS_TV_LATI
@@ -70,7 +70,7 @@ EventScript_1A6F37:
 
 EventScript_1A6F3F:
 	special GetMomOrDadStringForTVMessage
-	msgbox UnknownString_81A0E68, 4
+	msgbox UnknownString_81A0E68, MSGBOX_DEFAULT
 	goto EventScript_1A6F37
 	end
 
diff --git a/data/specials.inc b/data/specials.inc
index 86e62455c..a511742e3 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -18,10 +18,10 @@ gSpecials::
 	def_special CheckPlayerHasSecretBase
 	def_special sub_80BBAF0
 	def_special sub_80BC440
-	def_special SecretBasePC_PackUp
+	def_special MoveOutOfSecretBase
 	def_special sub_80BC114
-	def_special sub_80BC56C
-	def_special sub_80BC5BC
+	def_special GetCurSecretBaseRegistrationValidity
+	def_special ToggleCurSecretBaseRegistry
 	def_special SecretBasePC_Decoration
 	def_special SecretBasePC_Registry
 	def_special sub_80BCE1C
@@ -30,12 +30,12 @@ gSpecials::
 	def_special sub_80FF474
 	def_special sub_8100B20
 	def_special sub_80BB70C
-	def_special sub_80BBFA4
+	def_special SetSecretBaseOwnerGfxId
 	def_special sub_8100A7C
 	def_special sub_80BBC78
 	def_special sub_80BCE4C
 	def_special DoSecretBasePCTurnOffEffect
-	def_special sub_80B929C
+	def_special RecordMixingPlayerSpotTriggered
 	def_special sub_808347C
 	def_special sub_80834E4
 	def_special sub_808350C
@@ -60,16 +60,16 @@ gSpecials::
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
 	def_special ScrSpecial_GetTrainerBattleMode
-	def_special ScrSpecial_ShowTrainerIntroSpeech
+	def_special ShowTrainerIntroSpeech
 	def_special ScrSpecial_ShowTrainerNonBattlingSpeech
-	def_special ScrSpecial_HasTrainerBeenFought
-	def_special ScrSpecial_EndTrainerApproach
+	def_special GetTrainerFlag
+	def_special EndTrainerApproach
 	def_special PlayTrainerEncounterMusic
 	def_special ShouldTryRematchBattle
-	def_special ScrSpecial_GetTrainerEyeRematchFlag
-	def_special ScrSpecial_StartTrainerEyeRematch
+	def_special IsTrainerReadyForRematch
+	def_special BattleSetup_StartRematchBattle
 	def_special ShowPokemonStorageSystem
-	def_special CheckForAlivePartyMons
+	def_special HasEnoughMonsForDoubleBattle
 	def_special TurnOffTVScreen
 	def_special DoTVShow
 	def_special DoPokeNews
@@ -101,9 +101,9 @@ gSpecials::
 	def_special sub_80C5044
 	def_special GiveMonArtistRibbon
 	def_special sub_808363C
-	def_special ScrSpecial_DoSaveDialog
+	def_special SaveGame
 	def_special DoWateringBerryTreeAnim
-	def_special sub_80E60D8
+	def_special ShowEasyChatScreen
 	def_special sub_80EB7C4
 	def_special ScrSpecial_GetCurrentMauvilleMan
 	def_special ScrSpecial_HasBardSongBeenChanged
@@ -158,7 +158,7 @@ gSpecials::
 	def_special GetPlayerTrainerIdOnesDigit
 	def_special GetPlayerBigGuyGirlString
 	def_special GetRivalSonDaughterString
-	def_special SetFlagInVar
+	def_special SetHiddenItemFlag
 	def_special CableCarWarp
 	def_special CableCar
 	def_special Overworld_PlaySpecialMapMusic
@@ -177,7 +177,7 @@ gSpecials::
 	def_special sub_810FA74
 	def_special UpdateMovedLilycoveFanClubMembers
 	def_special sub_810FF48
-	def_special sub_810FAA0
+	def_special UpdateTrainerFanClubGameClear
 	def_special sub_810FF60
 	def_special ScrSpecial_RockSmashWildEncounter
 	def_special GabbyAndTyGetBattleNum
@@ -270,7 +270,7 @@ gSpecials::
 	def_special ShowBerryBlenderRecordWindow
 	def_special ResetTrickHouseEndRoomFlag
 	def_special SetTrickHouseEndRoomFlag
-	def_special ScrSpecial_CreatePCMenu
+	def_special ScriptMenu_CreatePCMultichoice
 	def_special AccessHallOfFamePC
 	def_special ScrSpecial_ShowDiploma
 	def_special CheckLeadMonCool
@@ -318,16 +318,16 @@ gSpecials::
 	def_special GetShieldToyTVDecorationInfo
 	def_special IsPokerusInParty
 	def_special SetSootopolisGymCrackedIceMetatiles
-	def_special sub_810F758
+	def_special ShakeCamera
 	def_special ScrSpecial_StartGroudonKyogreBattle
 	def_special ScrSpecial_StartRayquazaBattle
 	def_special ScrSpecial_StartRegiBattle
-	def_special sub_8082524
+	def_special SetUpTrainerMovement
 	def_special DoSealedChamberShakingEffect2
 	def_special FoundBlackGlasses
 	def_special sub_807E25C
 	def_special sp13E_warp_to_last_warp
-	def_special sp13F_fall_to_last_warp
+	def_special DoFallWarp
 	def_special ShowContestEntryMonPic
 	def_special sub_80C5164
 	def_special SetEReaderTrainerGfxId
diff --git a/data/text/check_furniture.inc b/data/text/check_furniture.inc
new file mode 100644
index 000000000..a8e008e7c
--- /dev/null
+++ b/data/text/check_furniture.inc
@@ -0,0 +1,27 @@
+Text_PictureBookshelf: @ 81C6A69
+	.string "There's a set of POKéMON picture books.$"
+
+Text_Bookshelf: @ 81C6A91
+	.string "It's filled with all sorts of books.$"
+
+Text_PokemonCenterBookshelf: @ 81C6AB6
+	.string "POKéMON magazines!\n"
+	.string "POKéMON PAL...\p"
+	.string "POKéMON HANDBOOK...\n"
+	.string "ADORABLE POKéMON...$"
+
+Text_Vase: @ 81C6B00
+	.string "This vase looks expensive...\n"
+	.string "Peered inside...\p"
+	.string "But, it was empty.$"
+
+Text_EmptyTrashCan: @ 81C6B41
+	.string "It's empty.$"
+
+Text_ShopShelf: @ 81C6B4D
+	.string "The shelves brim with all sorts of\n"
+	.string "POKéMON merchandise.$"
+
+Text_Blueprint: @ 81C6B85
+	.string "A blueprint of some sort?\n"
+	.string "It's too complicated!$"
diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc
new file mode 100644
index 000000000..a974e7b0f
--- /dev/null
+++ b/data/text/mart_clerk.inc
@@ -0,0 +1,15 @@
+Text_HowMayIServeYou:: @ 81A0BE4
+	.string "Welcome!\p"
+	.string "How may I serve you?$"
+
+Text_PleaseComeAgain:: @ 81A0C02
+	.string "Please come again!$"
+
+@ Unused
+Text_DiscountSaleToday: @ 81A0C15
+	.string "Welcome!\p"
+	.string "We're having a discount sale today!$"
+
+Text_PlayerWhatCanIDoForYou:: @ 81A0C42
+	.string "{PLAYER}{KUN}, welcome!\p"
+	.string "What can I do for you?$"
diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc
new file mode 100644
index 000000000..3473487ef
--- /dev/null
+++ b/data/text/obtain_item.inc
@@ -0,0 +1,27 @@
+Text_ObtainedTheItem: @ 81A0C68
+	.string "Obtained the {STR_VAR_2}.$"
+
+Text_TheBagIsFull:: @ 81A0C79
+	.string "The BAG is full...$"
+
+Text_PutItemInPocket: @ 81A0C8C
+	.string "{PLAYER} put away the {STR_VAR_2}\n"
+	.string "in the {STR_VAR_3} POCKET.$"
+
+Text_FoundOneItem: @ 81A0CB1
+	.string "{PLAYER} found one {STR_VAR_2}!$"
+
+Text_TooBadBagIsFull:
+	.string "Too bad!\n"
+	.string "The BAG is full...$"
+
+Text_ObtainedTheDecor: @ 81A0CDE
+	.string "Obtained the {STR_VAR_2}.$"
+
+Text_NoRoomLeftForAnother:: @ 81A0CEF
+	.string "Too bad! There's no room left for\n"
+	.string "another {STR_VAR_2}...$"
+
+Text_TheDecorWasTransferredToThePC: @ 81A0D1F
+	.string "The {STR_VAR_2} was transferred\n"
+	.string "to the PC.$"
diff --git a/data/text/pc.inc b/data/text/pc.inc
new file mode 100644
index 000000000..1d350d24b
--- /dev/null
+++ b/data/text/pc.inc
@@ -0,0 +1,17 @@
+Text_BootUpPC: @ 81A09EC
+	.string "{PLAYER} booted up the PC.$"
+
+Text_WhichPCShouldBeAccessed:: @ 81A0A01
+	.string "Which PC should be accessed?$"
+
+Text_AccessedSomeonesPC: @ 81A0A1E
+	.string "Accessed someone's PC.$"
+
+Text_StorageSystemOpened: @ 81A0A35
+	.string "POKéMON Storage System opened.$"
+
+Text_AccessedPlayersPC: @ 81A0A54
+	.string "Accessed {PLAYER}'s PC.$"
+
+Text_AccessedLanettesPC: @ 81A0A66
+	.string "Accessed LANETTE's PC.$"
diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc
new file mode 100644
index 000000000..6c63f8d93
--- /dev/null
+++ b/data/text/pkmn_center_nurse.inc
@@ -0,0 +1,26 @@
+gText_NurseJoy_Welcome:: @ 81A0A7D
+	.string "Hello, and welcome to the POKéMON\n"
+	.string "CENTER.\p"
+	.string "We restore your tired POKéMON to\n"
+	.string "full health.\p"
+	.string "Would you like to rest your POKéMON?$"
+
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
+	.string "We hope to see you again!$"
+
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
+	.string "Thank you for waiting.\p"
+	.string "We've restored your POKéMON to\n"
+	.string "full health.$"
+
+UnknownString_81A0B57: @ 81A0B57
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TRADE CENTER.$"
+
+UnknownString_81A0B87: @ 81A0B87
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "COLOSSEUM.$"
+
+UnknownString_81A0BB4: @ 81A0BB4
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TIME CAPSULE.$"
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 07495b000..267130b26 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -1,13 +1,13 @@
-Route101_Text_1C4449:: @ 81C4449
+gBirchDexRatingText_ComeToShowMePokedex:: @ 81C4449
 	.string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p"
 	.string "Have you come to show me how your\n"
 	.string "POKéDEX is coming along?$"
 
-Route101_Text_1C449B:: @ 81C449B
+gBirchDexRatingText_Cancel:: @ 81C449B
 	.string "Hm? Oh, you haven't caught enough\n"
 	.string "POKéMON to make it worthwhile.$"
 
-Route101_Text_1C44DC:: @ 81C44DC
+gBirchDexRatingText_SoYouveSeenAndCaught:: @ 81C44DC
 	.string "Hmhm...\p"
 	.string "So, you've seen {STR_VAR_1} POKéMON,\n"
 	.string "and you've caught {STR_VAR_2} POKéMON...$"
@@ -99,7 +99,7 @@ gBirchDexRatingText_DexCompleted:: @ 81C4ADA
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"
 
-Route101_Text_1C4B05:: @ 81C4B05
+gBirchDexRatingText_OnANationwideBasis:: @ 81C4B05
 	.string "Hmhm...\n"
 	.string "On a nationwide basis...\p"
 	.string "You've seen {STR_VAR_1} POKéMON,\n"
diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc
new file mode 100644
index 000000000..d542d0c78
--- /dev/null
+++ b/data/text/record_mix.inc
@@ -0,0 +1,6 @@
+UnusedMixRecordsPromptText: @ 81A099F
+	.string "Would you like to mix records with other\n"
+	.string "TRAINERS?$"
+
+UnusedMixRecordsSeeYouAgainText: @ 81A09D2
+	.string "We hope to see you again!$"
diff --git a/data/text/sample_message.inc b/data/text/sample_message.inc
new file mode 100644
index 000000000..e061b9328
--- /dev/null
+++ b/data/text/sample_message.inc
@@ -0,0 +1,17 @@
+Text_SampleMessage1:: @ 81A089A
+	.string "This is sample message 1.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
+
+Text_SampleMessage2:: @ 81A08F1
+	.string "This is sample message 2.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
+
+Text_SampleMessage3:: @ 81A0948
+	.string "This is sample message 3.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
diff --git a/data/text/secret_base.inc b/data/text/secret_base.inc
new file mode 100644
index 000000000..303483c9a
--- /dev/null
+++ b/data/text/secret_base.inc
@@ -0,0 +1,64 @@
+SecretBase_Text_AllDecorationsWillBeReturned: @ 81A38FB
+	.string "All decorations and furniture in your\n"
+	.string "SECRET BASE will be returned to your PC.\p"
+	.string "Is that okay?$"
+
+SecretBase_Text_WantToRegisterSecretBase: @ 81A3958
+	.string "Do you want to register\n"
+	.string "{STR_VAR_1}'s SECRET BASE?$"
+
+SecretBase_Text_AlreadyRegisteredDelete: @ 81A3982
+	.string "This data is already registered.\n"
+	.string "Would you like to delete it?$"
+
+SecretBase_Text_TooManyBasesDeleteSome: @ 81A39C0
+	.string "Up to 10 locations can be registered.\p"
+	.string "Delete a location if you want to\n"
+	.string "register another location.$"
+
+SecretBase_Text_RegistrationCompleted: @ 81A3A22
+	.string "Registration completed.$"
+
+SecretBase_Text_DataUnregistered: @ 81A3A3A
+	.string "Data has been unregistered.$"
+
+UnknownString_81A3A56: @ 81A3A56
+	.string "There are no decorations...$"
+
+SecretBase_Text_BootUpPC: @ 81A3A72
+	.string "{PLAYER} booted up the PC.$"
+
+SecretBase_Text_WhatWouldYouLikeToDo: @ 81A3A87
+	.string "What would you like to do?$"
+
+SecretBase_Text_RegistryInfo: @ 81A3AA2
+	.string "The registered SECRET BASE will remain\n"
+	.string "unless the owner moves away.\p"
+	.string "If it is removed from the registry,\n"
+	.string "another SECRET BASE may take its place.\p"
+	.string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$"
+
+SecretBase_Text_BattleTowerShield: @ 81A3B5B
+	.string "A shield of {STR_VAR_2} that marks winning\n"
+	.string "{STR_VAR_1} times in a row at the BATTLE TOWER.$"
+
+SecretBase_Text_ToyTV: @ 81A3BA4
+	.string "A realistic toy TV. It could be easily\n"
+	.string "mistaken for the real thing.$"
+
+SecretBase_Text_SeedotTV: @ 81A3BE8
+	.string "A toy TV shaped like a SEEDOT.\n"
+	.string "It looks ready to roll away on its own...$"
+
+SecretBase_Text_SkittyTV: @ 81A3C31
+	.string "A toy TV shaped like a SKITTY.\n"
+	.string "It looks ready to stroll away...$"
+
+UnknownString_81A3C71: @ 81A3C71
+	.string "You may only make one SECRET BASE.\p"
+	.string "Would you like to move from the SECRET\n"
+	.string "BASE near {STR_VAR_1}?$"
+
+UnknownString_81A3CC9: @ 81A3CC9
+	.string "Moving completed.\p"
+	.string "Would you like to use the SECRET POWER?$"
diff --git a/data/text/secret_base_trainers.inc b/data/text/secret_base_trainers.inc
new file mode 100644
index 000000000..57b37bf7f
--- /dev/null
+++ b/data/text/secret_base_trainers.inc
@@ -0,0 +1,316 @@
+UnknownString_81A1948: @ 81A1948
+	.string "If some vines drop down, this tree can\n"
+	.string "be climbed.$"
+
+UnknownString_81A197B: @ 81A197B
+	.string "If some vines drop down, this tree can\n"
+	.string "be climbed.\p"
+	.string "Use the SECRET POWER?$"
+
+UnknownString_81A19C4: @ 81A19C4
+	.string "A thick vine dropped down!$"
+
+UnknownString_81A19DF: @ 81A19DF
+	.string "Want to make your SECRET BASE here?$"
+
+UnknownString_81A1A03: @ 81A1A03
+	.string "If this clump of grass can be moved,\n"
+	.string "it might be possible to go inside.$"
+
+UnknownString_81A1A4B: @ 81A1A4B
+	.string "If this clump of grass can be moved,\n"
+	.string "it might be possible to go inside.\p"
+	.string "Use the SECRET POWER?$"
+
+UnknownString_81A1AA9: @ 81A1AA9
+	.string "Discovered a small entrance!$"
+
+UnknownString_81A1AC6: @ 81A1AC6
+	.string "Want to make your SECRET BASE here?$"
+
+SecretBase_RedCave1_Text_1A1AEA:: @ 81A1AEA
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Since you're already here, how would\n"
+	.string "you like to battle?$"
+
+SecretBase_RedCave1_Text_1A1B83:: @ 81A1B83
+	.string "Okay!\n"
+	.string "Here we come!$"
+
+SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97
+	.string "Hunh?\n"
+	.string "Oh, you can't now...$"
+
+UnknownString_81A1BB2:: @ 81A1BB2
+	.string "Waaargh! You're too strong!\n"
+	.string "About me losing... Please keep it secret!$"
+
+SecretBase_RedCave1_Text_1A1BF8:: @ 81A1BF8
+	.string "What do you think of my SECRET BASE?\n"
+	.string "Come visit me again tomorrow.$"
+
+SecretBase_RedCave1_Text_1A1C3B:: @ 81A1C3B
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Feel free to hang out!$"
+
+SecretBase_RedCave1_Text_1A1CB2:: @ 81A1CB2
+	.string "There're a lot of places where you can\n"
+	.string "make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?\p"
+	.string "Oh, would you like to have a battle?$"
+
+SecretBase_RedCave1_Text_1A1D48:: @ 81A1D48
+	.string "Okay, here goes!$"
+
+SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59
+	.string "Oh...\n"
+	.string "You can't now, okay.$"
+
+UnknownString_81A1D74:: @ 81A1D74
+	.string "Hmmm... It's our loss...\n"
+	.string "But don't tell anyone!\l"
+	.string "It's a confidential secret!$"
+
+SecretBase_RedCave1_Text_1A1DC0:: @ 81A1DC0
+	.string "If you're in this area again, I hope\n"
+	.string "you'll visit me.$"
+
+SecretBase_RedCave1_Text_1A1DF6:: @ 81A1DF6
+	.string "There're a lot of places where you can\n"
+	.string "make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?$"
+
+SecretBase_RedCave1_Text_1A1E67:: @ 81A1E67
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "Oh! Were you thinking about taking this\n"
+	.string "spot, too?\p"
+	.string "I'll tell you what, you can have this\n"
+	.string "spot if you can beat me.$"
+
+SecretBase_RedCave1_Text_1A1F04:: @ 81A1F04
+	.string "Okay!\n"
+	.string "I'm going to defend my SECRET BASE!$"
+
+SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E
+	.string "Hunh? Is that right?\n"
+	.string "You're not interested in this spot?$"
+
+UnknownString_81A1F67:: @ 81A1F67
+	.string "I can't keep going!\n"
+	.string "I surrender!$"
+
+SecretBase_RedCave1_Text_1A1F88:: @ 81A1F88
+	.string "Okay, when I move one day, this place\n"
+	.string "will be yours!$"
+
+SecretBase_RedCave1_Text_1A1FBD:: @ 81A1FBD
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "I waited a long time for it to open.\n"
+	.string "I finally got to use it!$"
+
+SecretBase_RedCave1_Text_1A2026:: @ 81A2026
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.\p"
+	.string "Would you like to see how strong I am?$"
+
+SecretBase_RedCave1_Text_1A2095:: @ 81A2095
+	.string "I'm going to go all out!$"
+
+SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE
+	.string "Oh.\n"
+	.string "Some other time, then!$"
+
+UnknownString_81A20C9:: @ 81A20C9
+	.string "Hmm... I've still got lots to learn.\n"
+	.string "I have to study some more.$"
+
+SecretBase_RedCave1_Text_1A2109:: @ 81A2109
+	.string "Thanks for battling with me.\n"
+	.string "Please come back again tomorrow.$"
+
+SecretBase_RedCave1_Text_1A2147:: @ 81A2147
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.$"
+
+SecretBase_RedCave1_Text_1A218F:: @ 81A218F
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.\p"
+	.string "So, how would you like a battle?$"
+
+SecretBase_RedCave1_Text_1A2220:: @ 81A2220
+	.string "That's the way!$"
+
+SecretBase_RedCave1_Text_1A2230:: @ 81A2230
+	.string "When you're ready, give me a shout!$"
+
+UnknownString_81A2254:: @ 81A2254
+	.string "Aww! Done in!\n"
+	.string "But it's still fun to battle!$"
+
+SecretBase_RedCave1_Text_1A2280:: @ 81A2280
+	.string "Well, anyway, I should go buy some\n"
+	.string "decorations and furniture.\p"
+	.string "I want my SECRET BASE to be a place\n"
+	.string "other people can enjoy.$"
+
+SecretBase_RedCave1_Text_1A22FA:: @ 81A22FA
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.$"
+
+SecretBase_RedCave1_Text_1A236A:: @ 81A236A
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.\p"
+	.string "If you would be so kind, will you battle\n"
+	.string "with my POKéMON?$"
+
+SecretBase_RedCave1_Text_1A2405:: @ 81A2405
+	.string "Thank you.\n"
+	.string "Shall we begin?$"
+
+SecretBase_RedCave1_Text_1A2420:: @ 81A2420
+	.string "Oh.\n"
+	.string "How disappointing...$"
+
+UnknownString_81A2439:: @ 81A2439
+	.string "I concede...$"
+
+SecretBase_RedCave1_Text_1A2446:: @ 81A2446
+	.string "That was all in good fun!\n"
+	.string "I should go enjoy shopping now.$"
+
+SecretBase_RedCave1_Text_1A2480:: @ 81A2480
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.$"
+
+SecretBase_RedCave1_Text_1A24E1:: @ 81A24E1
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?\p"
+	.string "But since you found me, how about we\n"
+	.string "have a battle?$"
+
+SecretBase_RedCave1_Text_1A256F:: @ 81A256F
+	.string "I'm not going down easily!$"
+
+SecretBase_RedCave1_Text_1A258A:: @ 81A258A
+	.string "Oh... Are you maybe tired from searching\n"
+	.string "for this place?$"
+
+UnknownString_81A25C3:: @ 81A25C3
+	.string "I went down...$"
+
+SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2
+	.string "Where's your SECRET BASE?\n"
+	.string "I should go visit you there.$"
+
+SecretBase_RedCave1_Text_1A2609:: @ 81A2609
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?$"
+
+SecretBase_RedCave1_Text_1A2663:: @ 81A2663
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!\p"
+	.string "In the meantime, want to battle?$"
+
+SecretBase_RedCave1_Text_1A2710:: @ 81A2710
+	.string "This is my SECRET BASE.\n"
+	.string "I can't lose!$"
+
+SecretBase_RedCave1_Text_1A2736:: @ 81A2736
+	.string "I'll battle with you anytime.$"
+
+UnknownString_81A2754:: @ 81A2754
+	.string "Huh?\n"
+	.string "Did I just lose?$"
+
+SecretBase_RedCave1_Text_1A276A:: @ 81A276A
+	.string "I won't lose at collecting decorations.\n"
+	.string "Come visit again!$"
+
+SecretBase_RedCave1_Text_1A27A4:: @ 81A27A4
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!$"
+
+SecretBase_RedCave1_Text_1A2830:: @ 81A2830
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "That's what I do.\n"
+	.string "Want to battle with me?$"
+
+SecretBase_RedCave1_Text_1A28D7:: @ 81A28D7
+	.string "Show me what you're made of!$"
+
+SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4
+	.string "I guess there are times when you're not\n"
+	.string "into it.$"
+
+UnknownString_81A2925:: @ 81A2925
+	.string "I know exactly what you're made of now.$"
+
+SecretBase_RedCave1_Text_1A294D:: @ 81A294D
+	.string "We can both become stronger.\n"
+	.string "Let's keep at it!$"
+
+SecretBase_RedCave1_Text_1A297C:: @ 81A297C
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "Every day is a great day.$"
+
+SecretBase_RedCave1_Text_1A2A13:: @ 81A2A13
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?\p"
+	.string "Want to see my taste in battling?$"
+
+SecretBase_RedCave1_Text_1A2AE2:: @ 81A2AE2
+	.string "There's no holding back!$"
+
+SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB
+	.string "I'll be happy to demonstrate my style\n"
+	.string "anytime.$"
+
+UnknownString_81A2B2A:: @ 81A2B2A
+	.string "You're supremely talented!\n"
+	.string "Your power seems to be limitless...$"
+
+SecretBase_RedCave1_Text_1A2B69:: @ 81A2B69
+	.string "What did you think of my style?\n"
+	.string "I'll keep on polishing it!$"
+
+SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?$"
diff --git a/data/text/surf.inc b/data/text/surf.inc
index e9e3e9026..d78c80a42 100644
--- a/data/text/surf.inc
+++ b/data/text/surf.inc
@@ -1,6 +1,6 @@
-UseSurfPromptText: @ 81A1344
+gText_WantToUseSurf: @ 81A1344
 	.string "The water is dyed a deep blue...\n"
 	.string "Would you like to SURF?$"
 
-UsedSurfText: @ 81A137D
+gText_PlayerUsedSurf: @ 81A137D
 	.string "{STR_VAR_1} used SURF!$"