update

161 files changed, 920 insertions, 920 deletions

diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 489e7c275..f7b6930fb 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -691,26 +691,26 @@
 	.2byte \trainer
 	.endm
 
-	.macro movespriteperm word1, word2, word3
+	.macro setobjectxyperm word1, word2, word3
 	.byte 0x63
 	.2byte \word1
 	.2byte \word2
 	.2byte \word3
 	.endm
 
-	.macro moveoffscreen word
+	.macro moveobjectoffscreen word
 	.byte 0x64
 	.2byte \word
 	.endm
 
-	.macro spritebehave word, byte
+	.macro setobjectmovementtype word, byte
 	.byte 0x65
 	.2byte \word
 	.byte \byte
 	.endm
 
 	@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the box and its text have been fully drawn.
-	.macro waittext
+	.macro waitmessage
 	.byte 0x66
 	.endm
 
@@ -721,7 +721,7 @@
 	.endm
 
 	@ Holds the current message box open until the player presses a key. The message box is then closed.
-	.macro closebutton
+	.macro closemessage
 	.byte 0x68
 	.endm
 
@@ -767,7 +767,7 @@
 	.endm
 
 	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. If B is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
-	.macro multichoicedef X, Y, list, default, B
+	.macro multichoicedefault X, Y, list, default, B
 	.byte 0x70
 	.byte \X
 	.byte \Y
@@ -777,7 +777,7 @@
 	.endm
 
 	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. Lists of options are predefined and the one to be used is specified with list. The per_row argument determines how many list items will be shown on a single row of the box.
-	.macro multichoicerow X, Y, list, per_row, B
+	.macro multichoicegrid X, Y, list, per_row, B
 	.byte 0x71
 	.byte \X
 	.byte \Y
@@ -786,7 +786,7 @@
 	.byte \B
 	.endm
 
-	.macro showbox byte1, byte2, byte3, byte4
+	.macro drawbox byte1, byte2, byte3, byte4
 	.byte 0x72
 	.byte \byte1
 	.byte \byte2
@@ -794,7 +794,7 @@
 	.byte \byte4
 	.endm
 
-	.macro hidebox byte1, byte2, byte3, byte4
+	.macro erasebox byte1, byte2, byte3, byte4
 	.byte 0x73
 	.byte \byte1
 	.byte \byte2
@@ -802,7 +802,7 @@
 	.byte \byte4
 	.endm
 
-	.macro clearbox byte1, byte2, byte3, byte4
+	.macro drawboxtext byte1, byte2, byte3, byte4
 	.byte 0x74
 	.byte \byte1
 	.byte \byte2
@@ -811,7 +811,7 @@
 	.endm
 
 	@ Displays a box containing the front sprite for the specified (species) Pokmon species.
-	.macro showpokepic species, X, Y
+	.macro drawpokepic species, X, Y
 	.byte 0x75
 	.2byte \species
 	.byte \X
@@ -819,12 +819,12 @@
 	.endm
 
 	@ Hides all boxes displayed with showpokepic.
-	.macro hidepokepic
+	.macro erasepokepic
 	.byte 0x76
 	.endm
 
 	@ In FireRed, this command is a nop. (The argument is discarded.)
-	.macro showcontestwinner a
+	.macro drawcontestwinner a
 	.byte 0x77
 	.byte \a
 	.endm
@@ -836,7 +836,7 @@
 	.endm
 
 	@ Gives the player one of the specified (species) Pokmon at level level holding item. The unknown arguments should all be zeroes.
-	.macro givepokemon species, level, item, unknown1, unknown2, unknown3
+	.macro givepoke species, level, item, unknown1, unknown2, unknown3
 	.byte 0x79
 	.2byte \species
 	.byte \level
@@ -859,7 +859,7 @@
 	.endm
 
 	@ Checks if at least one Pokmon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the Pokmon that knows the move. If not, LASTRESULT is set to 0x0006.
-	.macro checkattack index
+	.macro checkpokemove index
 	.byte 0x7c
 	.2byte \index
 	.endm
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 465fc1536..70daa8548 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -390,7 +390,7 @@ gUnknown_0815F36C:: @ 815F36C
 	message UnknownString_81A3A72
 	doanimation 61
 	waitstate
-	waittext
+	waitmessage
 	waitbutton
 	playse 5
 	goto EventScript_15F384
@@ -398,7 +398,7 @@ gUnknown_0815F36C:: @ 815F36C
 
 EventScript_15F384:
 	message UnknownString_81A3A87
-	waittext
+	waitmessage
 	checkflag 268
 	goto_if_eq EventScript_15F3A0
 	goto EventScript_15F3E2
@@ -432,7 +432,7 @@ EventScript_15F419:
 	msgbox UnknownString_81A38FB, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_15F384
-	closebutton
+	closemessage
 	special SecretBasePC_PackUp
 	releaseall
 	end
@@ -451,7 +451,7 @@ gUnknown_0815F43A:: @ 815F43A
 	playse 2
 	doanimation 61
 	waitstate
-	waittext
+	waitmessage
 	waitbutton
 	playse 5
 	goto EventScript_15F452
@@ -459,7 +459,7 @@ gUnknown_0815F43A:: @ 815F43A
 
 EventScript_15F452:
 	message UnknownString_81A3A87
-	waittext
+	waitmessage
 	multichoice 0, 0, 7, 0
 	switch RESULT
 	case 0, EventScript_15F4A1
@@ -503,19 +503,19 @@ EventScript_15F4E0:
 EventScript_15F503:
 	msgbox UnknownString_81A39C0, 3
 	special sub_80C683C
-	closebutton
+	closemessage
 	releaseall
 	end
 
 EventScript_15F511:
 	message UnknownString_81A3AA2
-	waittext
+	waitmessage
 	goto EventScript_15F452
 	end
 
 EventScript_15F51D:
 	special sub_80C683C
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -891,7 +891,7 @@ Std_2:
 	lock
 	faceplayer
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	release
 	return
@@ -899,20 +899,20 @@ Std_2:
 Std_3:
 	lockall
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	return
 
 Std_4:
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	return
 
 Std_5:
 	message 0x0
-	waittext
+	waitmessage
 	yesnobox 20, 8
 	return
 
@@ -967,7 +967,7 @@ gUnknown_0819F840:: @ 819F840
 
 EventScript_19F870:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -990,7 +990,7 @@ gUnknown_0819F887:: @ 819F887
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
@@ -1010,7 +1010,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
@@ -1022,7 +1022,7 @@ EventScript_19F8DD:
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -1038,7 +1038,7 @@ Movement_19F8F0::
 
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	battlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
@@ -1062,7 +1062,7 @@ EventScript_19F936:
 
 Std_6::
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	release
 	return
@@ -1448,7 +1448,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 	inccounter GAME_STAT_USED_POKECENTER
 	message gText_NurseJoy_OkayIllTakeYourPokemon
-	waittext
+	waitmessage
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmovement 0
 	doanimation 25
@@ -1463,16 +1463,16 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
 	message gText_NurseJoy_ThankYouForWaiting
-	waittext
+	waitmessage
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
 	waitmovement 0
 	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waittext
+	waitmessage
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDC7:: @ 819FDC7
 	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waittext
+	waitmessage
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
@@ -1485,7 +1485,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	message gText_NurseJoy_Pokerus
-	waittext
+	waitmessage
 	setflag 273
 	return
 
@@ -1552,7 +1552,7 @@ GetItem_HandlePocket_Berries:
 Std_ObtainItem_Success: @ 819FEB7
 	message Message_ObtainedItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	setvar RESULT, 1
 	return
@@ -1587,7 +1587,7 @@ Std_ObtainDecoration_Success: @ 819FF03
 	playfanfare 0x172
 	message Message_ObtainedDecoration
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_TransferredToPC
 	setvar RESULT, 1
 	return
@@ -1616,7 +1616,7 @@ Std_FindItem_Success: @ 819FF52
 	removeobject LAST_TALKED
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	return
 
@@ -1643,7 +1643,7 @@ HiddenItemScript:: @ 819FF7B
 HiddenItemScript_Success:
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	special SetFlagInVar
 	releaseall
@@ -1672,7 +1672,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
 	faceplayer
 UnusedMixRecordsScript_Done: @ 81A0000
 	message UnusedMixRecordsSeeYouAgainText
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -1688,7 +1688,7 @@ gUnknown_081A0009:: @ 81A0009
 
 EventScript_1A0023:
 	message gPCText_WhichPCShouldBeAccessed
-	waittext
+	waitmessage
 	special ScrSpecial_CreatePCMenu
 	waitstate
 	goto EventScript_1A0033
@@ -1816,7 +1816,7 @@ Route109_EventScript_1A010C:: @ 81A010C
 	return
 
 UseSurfScript:: @ 81A0117
-	checkattack MOVE_SURF
+	checkpokemove MOVE_SURF
 	compare RESULT, 6
 	goto_if_eq UseSurfScript_NoMon
 	bufferpartypoke 0, RESULT
@@ -2203,7 +2203,7 @@ Route101_EventScript_1A039B:: @ 81A039B
 Route101_EventScript_1A03A5:: @ 81A03A5
 	copyvar 0x8004, 0x8009
 	special ShowPokedexRatingMessage
-	waittext
+	waitmessage
 	waitbutton
 	return
 
@@ -2445,7 +2445,7 @@ Route119_EventScript_1A05AE:: @ 81A05AE
 
 Route119_EventScript_1A05C3:: @ 81A05C3
 	msgbox Route119_Text_171BF6, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route119_Movement_1A0839
 	waitmovement 0
 	applymovement LAST_TALKED, Route119_Movement_1A0662
@@ -2545,7 +2545,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitem 0, 0x8004
 	playfanfare 372
 	message FallarborTown_House1_Text_1A1498
-	waittext
+	waitmessage
 	waitfanfare
 	removeitem 0x8004, 1
 	return
@@ -3270,7 +3270,7 @@ gUnknown_081A14B8:: @ 81A14B8
 
 EventScript_1A14CA::
 	message UnknownString_81A1141
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8081924
 	waitstate
@@ -3620,7 +3620,7 @@ gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB63C
 	compare RESULT, 1
 	goto_if_eq EventScript_1A2E45
-	checkattack MOVE_SECRET_POWER
+	checkpokemove MOVE_SECRET_POWER
 	setanimation 0, RESULT
 	bufferattack 1, MOVE_SECRET_POWER
 	compare 0x8007, 1
@@ -3646,7 +3646,7 @@ EventScript_1A2CB0:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 11
 	waitstate
 	goto EventScript_1A2CFA
@@ -3677,7 +3677,7 @@ EventScript_1A2D08:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 26
 	waitstate
 	goto EventScript_1A2D52
@@ -3708,7 +3708,7 @@ EventScript_1A2D60:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 27
 	waitstate
 	goto EventScript_1A2DAA
@@ -3731,7 +3731,7 @@ EventScript_1A2DAA:
 	end
 
 EventScript_1A2DB8:
-	closebutton
+	closemessage
 	playse 9
 	setvar 0x4097, 0
 	setflag 173
@@ -3751,13 +3751,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 	msgbox SecretBase_RedCave1_Text_198F89, 5
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
-	closebutton
+	closemessage
 	playse 9
 	special sub_80BC440
 	end
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
-	closebutton
+	closemessage
 	setflag 96
 	special sub_80BBC78
 	waitstate
@@ -3789,7 +3789,7 @@ EventScript_1A2E38:
 	end
 
 EventScript_1A2E45:
-	checkattack MOVE_SECRET_POWER
+	checkpokemove MOVE_SECRET_POWER
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2EF7
 	setanimation 0, RESULT
@@ -3804,7 +3804,7 @@ EventScript_1A2E45:
 	goto_if_eq EventScript_1A2F3A
 	fadescreen 1
 	special sub_80BC50C
-	closebutton
+	closemessage
 	fadescreen 0
 	msgbox UnknownString_81A3CC9, 5
 	compare RESULT, 0
@@ -3812,8 +3812,8 @@ EventScript_1A2E45:
 	bufferpartypoke 0, 0x8004
 	bufferattack 1, MOVE_SECRET_POWER
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	closebutton
+	closemessage
+	closemessage
 	compare 0x8007, 1
 	goto_if_eq gUnknown_081A2CE6
 	compare 0x8007, 2
@@ -3845,7 +3845,7 @@ EventScript_1A2EF7::
 	end
 
 EventScript_1A2F3A::
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -3968,7 +3968,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B83, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -3980,7 +3980,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B97, 2
 	end
 
@@ -4003,7 +4003,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F04, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4015,7 +4015,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F2E, 2
 	end
 
@@ -4038,7 +4038,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2220, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4050,7 +4050,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
 SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2230, 2
 	end
 
@@ -4073,7 +4073,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A256F, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4085,7 +4085,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
 SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A258A, 2
 	end
 
@@ -4108,7 +4108,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28D7, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4120,7 +4120,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28F4, 2
 	end
 
@@ -4143,7 +4143,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D48, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4155,7 +4155,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D59, 2
 	end
 
@@ -4178,7 +4178,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2095, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4190,7 +4190,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
 SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A20AE, 2
 	end
 
@@ -4213,7 +4213,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2405, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4225,7 +4225,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
 SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2420, 2
 	end
 
@@ -4248,7 +4248,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2710, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4260,7 +4260,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2736, 2
 	end
 
@@ -4283,7 +4283,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AE2, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4295,7 +4295,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AFB, 2
 	end
 
@@ -4703,7 +4703,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 
 BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	message BattleTower_Lobby_Text_1A7823
-	waittext
+	waitmessage
 	multichoice 19, 8, 45, 1
 	copyvar 0x8008, RESULT
 	compare RESULT, 0
@@ -4951,7 +4951,7 @@ gUnknown_081C6C02:: @ 81C6C02
 	lockall
 	braillemsg Underwater_SealedChamber_Braille_1C533D
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc
index d218d834d..c2f933fe4 100644
--- a/data-de/field_move_scripts.inc
+++ b/data-de/field_move_scripts.inc
@@ -2,7 +2,7 @@ S_CuttableTree:: @ 81B0DCC
 	lockall
 	checkflag 2055
 	goto_if 0, CannotUseCut
-	checkattack MOVE_CUT
+	checkpokemove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
 	setanimation 0, RESULT
@@ -12,7 +12,7 @@ S_CuttableTree:: @ 81B0DCC
 	compare RESULT, 0
 	goto_if_eq Cut_ChoseNo
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 2
 	waitstate
 	goto DoTreeCutMovement
@@ -42,7 +42,7 @@ CannotUseCut: @ 81B0E32
 	end
 
 Cut_ChoseNo: @ 81B0E3C
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -63,7 +63,7 @@ S_BreakableRock:: @ 81B0EB7
 	lockall
 	checkflag 2057
 	goto_if 0, CannotUseRockSmash
-	checkattack MOVE_ROCK_SMASH
+	checkpokemove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
 	setanimation 0, RESULT
@@ -73,7 +73,7 @@ S_BreakableRock:: @ 81B0EB7
 	compare RESULT, 0
 	goto_if_eq RockSmash_ChoseNo
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 37
 	waitstate
 	goto DoRockSmashMovement
@@ -114,7 +114,7 @@ CannotUseRockSmash: @ 81B0F3E
 	end
 
 RockSmash_ChoseNo: @ 81B0F48
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -132,14 +132,14 @@ S_PushableBoulder:: @ 81B0FCB
 	goto_if 0, CannotUseStrength
 	checkflag 2089
 	goto_if_eq AlreadyUsedStrength
-	checkattack 70
+	checkpokemove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
 	setanimation 0, RESULT
 	msgbox UseStrengthPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Strength_ChoseNo
-	closebutton
+	closemessage
 	doanimation 40
 	waitstate
 	goto UsedStrength
@@ -169,7 +169,7 @@ AlreadyUsedStrength: @ 81B1030
 	end
 
 Strength_ChoseNo: @ 81B103A
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -193,7 +193,7 @@ AlreadyUsedStrengthText: @ 81B1127
 
 S_UseWaterfall:: @ 81B115A
 	lockall
-	checkattack MOVE_WATERFALL
+	checkpokemove MOVE_WATERFALL
 	compare RESULT, 6
 	goto_if_eq Waterfall_NoMonKnows
 	bufferpartypoke 0, RESULT
@@ -226,7 +226,7 @@ UsedWaterfallText: @ 81B120D
 
 UseDiveScript:: @ 81B1220
 	lockall
-	checkattack MOVE_DIVE
+	checkpokemove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq CannotUseDive
 	bufferpartypoke 0, RESULT
@@ -249,7 +249,7 @@ Dive_Done: @ 81B1267
 
 S_UseDiveUnderwater:: @ 81B1269
 	lockall
-	checkattack MOVE_DIVE
+	checkpokemove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq UnderwaterCannotUseDive
 	bufferpartypoke 0, RESULT
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1359199d3..01120b194 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -390,7 +390,7 @@ gUnknown_0815F36C:: @ 815F36C
 	message UnknownString_81A3A72
 	doanimation 61
 	waitstate
-	waittext
+	waitmessage
 	waitbutton
 	playse 5
 	goto EventScript_15F384
@@ -398,7 +398,7 @@ gUnknown_0815F36C:: @ 815F36C
 
 EventScript_15F384:
 	message UnknownString_81A3A87
-	waittext
+	waitmessage
 	checkflag 268
 	goto_if_eq EventScript_15F3A0
 	goto EventScript_15F3E2
@@ -432,7 +432,7 @@ EventScript_15F419:
 	msgbox UnknownString_81A38FB, 5
 	compare RESULT, 0
 	goto_if_eq EventScript_15F384
-	closebutton
+	closemessage
 	special SecretBasePC_PackUp
 	releaseall
 	end
@@ -451,7 +451,7 @@ gUnknown_0815F43A:: @ 815F43A
 	playse 2
 	doanimation 61
 	waitstate
-	waittext
+	waitmessage
 	waitbutton
 	playse 5
 	goto EventScript_15F452
@@ -459,7 +459,7 @@ gUnknown_0815F43A:: @ 815F43A
 
 EventScript_15F452:
 	message UnknownString_81A3A87
-	waittext
+	waitmessage
 	multichoice 0, 0, 7, 0
 	switch RESULT
 	case 0, EventScript_15F4A1
@@ -503,19 +503,19 @@ EventScript_15F4E0:
 EventScript_15F503:
 	msgbox UnknownString_81A39C0, 3
 	special sub_80C683C
-	closebutton
+	closemessage
 	releaseall
 	end
 
 EventScript_15F511:
 	message UnknownString_81A3AA2
-	waittext
+	waitmessage
 	goto EventScript_15F452
 	end
 
 EventScript_15F51D:
 	special sub_80C683C
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -890,7 +890,7 @@ Std_2:
 	lock
 	faceplayer
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	release
 	return
@@ -898,20 +898,20 @@ Std_2:
 Std_3:
 	lockall
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	return
 
 Std_4:
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	return
 
 Std_5:
 	message 0x0
-	waittext
+	waitmessage
 	yesnobox 20, 8
 	return
 
@@ -961,7 +961,7 @@ gUnknown_0819F840:: @ 819F840
 
 EventScript_19F870:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -984,7 +984,7 @@ gUnknown_0819F887:: @ 819F887
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
@@ -1004,7 +1004,7 @@ gUnknown_0819F8AE:: @ 819F8AE
 	special PlayTrainerEncounterMusic
 	special sub_8082524
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	special ScrSpecial_StartTrainerEyeRematch
 	waitstate
@@ -1016,7 +1016,7 @@ EventScript_19F8DD:
 
 EventScript_19F8DE:
 	special ScrSpecial_ShowTrainerNonBattlingSpeech
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -1032,7 +1032,7 @@ Movement_19F8F0::
 
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
-	waittext
+	waitmessage
 	waitbutton
 	battlebegin
 	specialvar RESULT, ScrSpecial_GetTrainerBattleMode
@@ -1056,7 +1056,7 @@ EventScript_19F936:
 
 Std_6::
 	message 0x0
-	waittext
+	waitmessage
 	waitbutton
 	release
 	return
@@ -1442,7 +1442,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B:: @ 819FD5B
 do_heal_party:: @ 819FD7C
 	inccounter GAME_STAT_USED_POKECENTER
 	message gText_NurseJoy_OkayIllTakeYourPokemon
-	waittext
+	waitmessage
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmovement 0
 	doanimation 25
@@ -1457,16 +1457,16 @@ do_heal_party:: @ 819FD7C
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDB0:: @ 819FDB0
 	message gText_NurseJoy_ThankYouForWaiting
-	waittext
+	waitmessage
 	applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_19FDF4
 	waitmovement 0
 	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waittext
+	waitmessage
 	return
 
 dont_heal_party:: @ 819FDC7
 	message gText_NurseJoy_WeHopeToSeeYouAgain
-	waittext
+	waitmessage
 	return
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
@@ -1479,7 +1479,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE
 
 OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	message gText_NurseJoy_Pokerus
-	waittext
+	waitmessage
 	setflag 273
 	return
 
@@ -1546,7 +1546,7 @@ GetItem_HandlePocket_Berries:
 Std_ObtainItem_Success: @ 819FEB7
 	message Message_ObtainedItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	setvar RESULT, 1
 	return
@@ -1581,7 +1581,7 @@ Std_ObtainDecoration_Success: @ 819FF03
 	playfanfare 0x172
 	message Message_ObtainedDecoration
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_TransferredToPC
 	setvar RESULT, 1
 	return
@@ -1610,7 +1610,7 @@ Std_FindItem_Success: @ 819FF52
 	removeobject LAST_TALKED
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	return
 
@@ -1637,7 +1637,7 @@ HiddenItemScript:: @ 819FF7B
 HiddenItemScript_Success:
 	message Message_FoundOneItem
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Message_PutAwayItem
 	special SetFlagInVar
 	releaseall
@@ -1666,7 +1666,7 @@ UnusedMixRecordsScript_Yes: @ 819FFFA
 	faceplayer
 UnusedMixRecordsScript_Done: @ 81A0000
 	message UnusedMixRecordsSeeYouAgainText
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -1682,7 +1682,7 @@ gUnknown_081A0009:: @ 81A0009
 
 EventScript_1A0023:
 	message gPCText_WhichPCShouldBeAccessed
-	waittext
+	waitmessage
 	special ScrSpecial_CreatePCMenu
 	waitstate
 	goto EventScript_1A0033
@@ -1810,7 +1810,7 @@ Route109_EventScript_1A010C:: @ 81A010C
 	return
 
 UseSurfScript:: @ 81A0117
-	checkattack MOVE_SURF
+	checkpokemove MOVE_SURF
 	compare RESULT, 6
 	goto_if_eq UseSurfScript_NoMon
 	bufferpartypoke 0, RESULT
@@ -2197,7 +2197,7 @@ Route101_EventScript_1A039B:: @ 81A039B
 Route101_EventScript_1A03A5:: @ 81A03A5
 	copyvar 0x8004, 0x8009
 	special ShowPokedexRatingMessage
-	waittext
+	waitmessage
 	waitbutton
 	return
 
@@ -2439,7 +2439,7 @@ Route119_EventScript_1A05AE:: @ 81A05AE
 
 Route119_EventScript_1A05C3:: @ 81A05C3
 	msgbox Route119_Text_171BF6, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route119_Movement_1A0839
 	waitmovement 0
 	applymovement LAST_TALKED, Route119_Movement_1A0662
@@ -2539,7 +2539,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitem 0, 0x8004
 	playfanfare 372
 	message FallarborTown_House1_Text_1A1498
-	waittext
+	waitmessage
 	waitfanfare
 	removeitem 0x8004, 1
 	return
@@ -3260,7 +3260,7 @@ gUnknown_081A14B8:: @ 81A14B8
 
 EventScript_1A14CA::
 	message UnknownString_81A1141
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8081924
 	waitstate
@@ -3599,7 +3599,7 @@ gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB63C
 	compare RESULT, 1
 	goto_if_eq EventScript_1A2E45
-	checkattack MOVE_SECRET_POWER
+	checkpokemove MOVE_SECRET_POWER
 	setanimation 0, RESULT
 	bufferattack 1, MOVE_SECRET_POWER
 	compare 0x8007, 1
@@ -3625,7 +3625,7 @@ EventScript_1A2CB0:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 11
 	waitstate
 	goto EventScript_1A2CFA
@@ -3656,7 +3656,7 @@ EventScript_1A2D08:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 26
 	waitstate
 	goto EventScript_1A2D52
@@ -3687,7 +3687,7 @@ EventScript_1A2D60:
 	compare RESULT, 0
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 27
 	waitstate
 	goto EventScript_1A2DAA
@@ -3710,7 +3710,7 @@ EventScript_1A2DAA:
 	end
 
 EventScript_1A2DB8:
-	closebutton
+	closemessage
 	playse 9
 	setvar 0x4097, 0
 	setflag 173
@@ -3730,13 +3730,13 @@ SecretBase_RedCave1_EventScript_1A2DDE:: @ 81A2DDE
 	msgbox SecretBase_RedCave1_Text_198F89, 5
 	compare RESULT, 1
 	goto_if_eq SecretBase_RedCave1_EventScript_1A2E08
-	closebutton
+	closemessage
 	playse 9
 	special sub_80BC440
 	end
 
 SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
-	closebutton
+	closemessage
 	setflag 96
 	special sub_80BBC78
 	waitstate
@@ -3768,7 +3768,7 @@ EventScript_1A2E38:
 	end
 
 EventScript_1A2E45:
-	checkattack MOVE_SECRET_POWER
+	checkpokemove MOVE_SECRET_POWER
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2EF7
 	setanimation 0, RESULT
@@ -3783,7 +3783,7 @@ EventScript_1A2E45:
 	goto_if_eq EventScript_1A2F3A
 	fadescreen 1
 	special sub_80BC50C
-	closebutton
+	closemessage
 	fadescreen 0
 	msgbox UnknownString_81A3CC9, 5
 	compare RESULT, 0
@@ -3791,8 +3791,8 @@ EventScript_1A2E45:
 	bufferpartypoke 0, 0x8004
 	bufferattack 1, MOVE_SECRET_POWER
 	msgbox UsedCutRockSmashText, 4
-	closebutton
-	closebutton
+	closemessage
+	closemessage
 	compare 0x8007, 1
 	goto_if_eq gUnknown_081A2CE6
 	compare 0x8007, 2
@@ -3824,7 +3824,7 @@ EventScript_1A2EF7::
 	end
 
 EventScript_1A2F3A::
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -3947,7 +3947,7 @@ SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A308F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B83, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -3959,7 +3959,7 @@ SecretBase_RedCave1_EventScript_1A3086:: @ 81A3086
 SecretBase_RedCave1_EventScript_1A308F:: @ 81A308F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1B97, 2
 	end
 
@@ -3982,7 +3982,7 @@ SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A310B
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F04, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -3994,7 +3994,7 @@ SecretBase_RedCave1_EventScript_1A3102:: @ 81A3102
 SecretBase_RedCave1_EventScript_1A310B:: @ 81A310B
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1F2E, 2
 	end
 
@@ -4017,7 +4017,7 @@ SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3187
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2220, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4029,7 +4029,7 @@ SecretBase_RedCave1_EventScript_1A317E:: @ 81A317E
 SecretBase_RedCave1_EventScript_1A3187:: @ 81A3187
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2230, 2
 	end
 
@@ -4052,7 +4052,7 @@ SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3203
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A256F, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4064,7 +4064,7 @@ SecretBase_RedCave1_EventScript_1A31FA:: @ 81A31FA
 SecretBase_RedCave1_EventScript_1A3203:: @ 81A3203
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A258A, 2
 	end
 
@@ -4087,7 +4087,7 @@ SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A327F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28D7, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4099,7 +4099,7 @@ SecretBase_RedCave1_EventScript_1A3276:: @ 81A3276
 SecretBase_RedCave1_EventScript_1A327F:: @ 81A327F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A28F4, 2
 	end
 
@@ -4122,7 +4122,7 @@ SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A32FB
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D48, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4134,7 +4134,7 @@ SecretBase_RedCave1_EventScript_1A32F2:: @ 81A32F2
 SecretBase_RedCave1_EventScript_1A32FB:: @ 81A32FB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A1D59, 2
 	end
 
@@ -4157,7 +4157,7 @@ SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A3377
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2095, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4169,7 +4169,7 @@ SecretBase_RedCave1_EventScript_1A336E:: @ 81A336E
 SecretBase_RedCave1_EventScript_1A3377:: @ 81A3377
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A20AE, 2
 	end
 
@@ -4192,7 +4192,7 @@ SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A33F3
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2405, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4204,7 +4204,7 @@ SecretBase_RedCave1_EventScript_1A33EA:: @ 81A33EA
 SecretBase_RedCave1_EventScript_1A33F3:: @ 81A33F3
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2420, 2
 	end
 
@@ -4227,7 +4227,7 @@ SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A346F
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2710, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4239,7 +4239,7 @@ SecretBase_RedCave1_EventScript_1A3466:: @ 81A3466
 SecretBase_RedCave1_EventScript_1A346F:: @ 81A346F
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2736, 2
 	end
 
@@ -4262,7 +4262,7 @@ SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq SecretBase_RedCave1_EventScript_1A34EB
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AE2, 4
 	goto SecretBase_RedCave1_EventScript_1A350A
 	end
@@ -4274,7 +4274,7 @@ SecretBase_RedCave1_EventScript_1A34E2:: @ 81A34E2
 SecretBase_RedCave1_EventScript_1A34EB:: @ 81A34EB
 	setvar RESULT, 0
 	special sub_80BCE4C
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	msgbox SecretBase_RedCave1_Text_1A2AFB, 2
 	end
 
@@ -4671,7 +4671,7 @@ BattleTower_Lobby_EventScript_1AE1FF:: @ 81AE1FF
 
 BattleTower_Lobby_EventScript_1AE241:: @ 81AE241
 	message BattleTower_Lobby_Text_1A7823
-	waittext
+	waitmessage
 	multichoice 19, 8, 45, 1
 	copyvar 0x8008, RESULT
 	compare RESULT, 0
@@ -4919,7 +4919,7 @@ gUnknown_081C6C02:: @ 81C6C02
 	lockall
 	braillemsg Underwater_SealedChamber_Braille_1C533D
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index 592dd7003..94f6b356c 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -2,7 +2,7 @@ S_CuttableTree:: @ 81B0DCC
 	lockall
 	checkflag 2055
 	goto_if 0, CannotUseCut
-	checkattack MOVE_CUT
+	checkpokemove MOVE_CUT
 	compare RESULT, 6
 	goto_if_eq CannotUseCut
 	setanimation 0, RESULT
@@ -12,7 +12,7 @@ S_CuttableTree:: @ 81B0DCC
 	compare RESULT, 0
 	goto_if_eq Cut_ChoseNo
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 2
 	waitstate
 	goto DoTreeCutMovement
@@ -42,7 +42,7 @@ CannotUseCut: @ 81B0E32
 	end
 
 Cut_ChoseNo: @ 81B0E3C
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -60,7 +60,7 @@ S_BreakableRock:: @ 81B0EB7
 	lockall
 	checkflag 2057
 	goto_if 0, CannotUseRockSmash
-	checkattack MOVE_ROCK_SMASH
+	checkpokemove MOVE_ROCK_SMASH
 	compare RESULT, 6
 	goto_if_eq CannotUseRockSmash
 	setanimation 0, RESULT
@@ -70,7 +70,7 @@ S_BreakableRock:: @ 81B0EB7
 	compare RESULT, 0
 	goto_if_eq RockSmash_ChoseNo
 	msgbox UsedCutRockSmashText, 4
-	closebutton
+	closemessage
 	doanimation 37
 	waitstate
 	goto DoRockSmashMovement
@@ -111,7 +111,7 @@ CannotUseRockSmash: @ 81B0F3E
 	end
 
 RockSmash_ChoseNo: @ 81B0F48
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -129,14 +129,14 @@ S_PushableBoulder:: @ 81B0FCB
 	goto_if 0, CannotUseStrength
 	checkflag 2089
 	goto_if_eq AlreadyUsedStrength
-	checkattack 70
+	checkpokemove 70
 	compare RESULT, 6
 	goto_if_eq CannotUseStrength
 	setanimation 0, RESULT
 	msgbox UseStrengthPromptText, 5
 	compare RESULT, 0
 	goto_if_eq Strength_ChoseNo
-	closebutton
+	closemessage
 	doanimation 40
 	waitstate
 	goto UsedStrength
@@ -166,7 +166,7 @@ AlreadyUsedStrength: @ 81B1030
 	end
 
 Strength_ChoseNo: @ 81B103A
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -190,7 +190,7 @@ AlreadyUsedStrengthText: @ 81B1127
 
 S_UseWaterfall:: @ 81B115A
 	lockall
-	checkattack MOVE_WATERFALL
+	checkpokemove MOVE_WATERFALL
 	compare RESULT, 6
 	goto_if_eq Waterfall_NoMonKnows
 	bufferpartypoke 0, RESULT
@@ -223,7 +223,7 @@ UsedWaterfallText: @ 81B120D
 
 UseDiveScript:: @ 81B1220
 	lockall
-	checkattack MOVE_DIVE
+	checkpokemove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq CannotUseDive
 	bufferpartypoke 0, RESULT
@@ -246,7 +246,7 @@ Dive_Done: @ 81B1267
 
 S_UseDiveUnderwater:: @ 81B1269
 	lockall
-	checkattack MOVE_DIVE
+	checkpokemove MOVE_DIVE
 	compare RESULT, 6
 	goto_if_eq UnderwaterCannotUseDive
 	bufferpartypoke 0, RESULT
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 4295c0b63..1262e259a 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -99,12 +99,12 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_checktrainerflag        @ 0x60
 	.4byte ScrCmd_settrainerflag        @ 0x61
 	.4byte ScrCmd_cleartrainerflag          @ 0x62
-	.4byte ScrCmd_movespriteperm          @ 0x63
-	.4byte ScrCmd_moveoffscreen           @ 0x64
-	.4byte ScrCmd_spritebehave            @ 0x65
-	.4byte ScrCmd_waittext                @ 0x66
+	.4byte ScrCmd_setobjectxyperm          @ 0x63
+	.4byte ScrCmd_moveobjectoffscreen           @ 0x64
+	.4byte ScrCmd_setobjectmovementtype            @ 0x65
+	.4byte ScrCmd_waitmessage                @ 0x66
 	.4byte ScrCmd_message                 @ 0x67
-	.4byte ScrCmd_closebutton             @ 0x68
+	.4byte ScrCmd_closemessage             @ 0x68
 	.4byte ScrCmd_lockall                 @ 0x69
 	.4byte ScrCmd_lock                    @ 0x6A
 	.4byte ScrCmd_releaseall              @ 0x6B
@@ -112,19 +112,19 @@ gScriptCmdTable:: @ 814AE30
 	.4byte ScrCmd_waitbutton              @ 0x6D
 	.4byte ScrCmd_yesnobox                @ 0x6E
 	.4byte ScrCmd_multichoice             @ 0x6F
-	.4byte ScrCmd_multichoicedef          @ 0x70
-	.4byte ScrCmd_multichoicerow          @ 0x71
-	.4byte ScrCmd_showbox                 @ 0x72
-	.4byte ScrCmd_hidebox                 @ 0x73
-	.4byte ScrCmd_clearbox                @ 0x74
-	.4byte ScrCmd_showpokepic             @ 0x75
-	.4byte ScrCmd_hidepokepic             @ 0x76
-	.4byte ScrCmd_showcontestwinner       @ 0x77
+	.4byte ScrCmd_multichoicedefault          @ 0x70
+	.4byte ScrCmd_multichoicegrid          @ 0x71
+	.4byte ScrCmd_drawbox                 @ 0x72
+	.4byte ScrCmd_erasebox                 @ 0x73
+	.4byte ScrCmd_drawboxtext                @ 0x74
+	.4byte ScrCmd_drawpokepic             @ 0x75
+	.4byte ScrCmd_erasepokepic             @ 0x76
+	.4byte ScrCmd_drawcontestwinner       @ 0x77
 	.4byte ScrCmd_braillemsg              @ 0x78
-	.4byte ScrCmd_givepokemon             @ 0x79
+	.4byte ScrCmd_givepoke             @ 0x79
 	.4byte ScrCmd_giveegg                 @ 0x7A
 	.4byte ScrCmd_setpokemove             @ 0x7B
-	.4byte ScrCmd_checkattack             @ 0x7C
+	.4byte ScrCmd_checkpokemove             @ 0x7C
 	.4byte ScrCmd_bufferpoke              @ 0x7D
 	.4byte ScrCmd_bufferfirstpoke         @ 0x7E
 	.4byte ScrCmd_bufferpartypoke         @ 0x7F
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 0ed7749bc..79e1de13b 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -13,7 +13,7 @@ S_BerryTree:: @ 81A14DD
 Route102_EventScript_1A1533:: @ 81A1533
 	lockall
 	message Route102_Text_1A1946
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
@@ -25,7 +25,7 @@ Route102_EventScript_1A153D:: @ 81A153D
 	compare RESULT, 1
 	goto_if_eq Route102_EventScript_1A1558
 	message Route102_Text_1A16B6
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -40,7 +40,7 @@ Route102_EventScript_1A1558:: @ 81A1558
 
 Route102_EventScript_1A1577:: @ 81A1577
 	fadescreen 1
-	closebutton
+	closemessage
 	special sub_80B4EE4
 	waitstate
 	compare ITEM_ID, 0
@@ -55,21 +55,21 @@ Route102_EventScript_1A1593:: @ 81A1593
 Route102_EventScript_1A1595:: @ 81A1595
 	lockall
 	message Route102_Text_1A172C
-	waittext
+	waitmessage
 	waitbutton
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15A2:: @ 81A15A2
 	lockall
 	message Route102_Text_1A174B
-	waittext
+	waitmessage
 	waitbutton
 	goto Route102_EventScript_1A165F
 
 Route102_EventScript_1A15AF:: @ 81A15AF
 	lockall
 	message Route102_Text_1A175C
-	waittext
+	waitmessage
 	waitbutton
 	goto Route102_EventScript_1A165F
 
@@ -77,7 +77,7 @@ Route102_EventScript_1A15BC:: @ 81A15BC
 	call Route102_EventScript_1A15CE
 	lockall
 	message Route102_Text_1A177D
-	waittext
+	waitmessage
 	waitbutton
 	goto Route102_EventScript_1A165F
 
@@ -114,25 +114,25 @@ Route102_EventScript_1A161D:: @ 81A161D
 	special FieldObjectInteractionRemoveBerryTree
 	message Route102_Text_1A17FD
 	playfanfare 387
-	waittext
+	waitmessage
 	waitfanfare
 	waitbutton
 	message Route102_Text_1A181A
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
 
 Route102_EventScript_1A1642:: @ 81A1642
 	message Route102_Text_1A1881
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
 
 Route102_EventScript_1A164B:: @ 81A164B
 	message Route102_Text_1A18C5
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -164,12 +164,12 @@ gUnknown_081A168F:: @ 81A168F
 
 Route102_EventScript_1A1693:: @ 81A1693
 	message Route102_Text_1A1912
-	waittext
+	waitmessage
 	special FieldObjectInteractionWaterBerryTree
 	special DoWateringBerryTreeAnim
 	waitstate
 	message Route102_Text_1A1925
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
@@ -178,6 +178,6 @@ Route102_EventScript_1A16A9:: @ 81A16A9
 	special FieldObjectInteractionPlantBerryTree
 	inccounter GAME_STAT_PLANTED_BERRIES
 	message Route102_Text_1A16FB
-	waittext
+	waitmessage
 	waitbutton
 	return
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 078d6444f..33df12c8c 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -121,7 +121,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E17:: @ 81A3E17
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3E30
 	setmaptile 8, 3, 605, 1
 	special DrawWholeMapView
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -135,10 +135,10 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E30:: @ 81A3E30
 	applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
 	message OldaleTown_PokemonCenter_2F_Text_1A4E50
-	waittext
+	waitmessage
 	playse 21
 	message OldaleTown_PokemonCenter_2F_Text_1A4E79
-	waittext
+	waitmessage
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A4358
 	waitmovement 0
 	applymovement 0x8007, OldaleTown_PokemonCenter_2F_Movement_1A4354
@@ -156,7 +156,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3E8D:: @ 81A3E8D
 	call OldaleTown_PokemonCenter_2F_EventScript_1A3DDA
 	setmaptile 5, 3, 605, 1
 	special DrawWholeMapView
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -180,7 +180,7 @@ VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6
 	lock
 	faceplayer
 	message OldaleTown_PokemonCenter_2F_Text_1A4510
-	waittext
+	waitmessage
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3EBC:: @ 81A3EBC
 	multichoice 17, 6, 17, 0
@@ -198,7 +198,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3EF2:: @ 81A3EF2
 	compare 0x8004, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
-	waittext
+	waitmessage
 	special sub_808347C
 	waitstate
 	compare RESULT, 1
@@ -220,13 +220,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3F5E:: @ 81A3F5E
 	special LoadPlayerBag
 	copyvar 0x4087, 0x8004
 	message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
-	waittext
+	waitmessage
 	setmaptile 5, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
-	closebutton
+	closemessage
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	setdooropened 5, 1
@@ -254,15 +254,15 @@ OldaleTown_PokemonCenter_2F_EventScript_1A3FCD:: @ 81A3FCD
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3FDD:: @ 81A3FDD
 	message OldaleTown_PokemonCenter_2F_Text_1A4696
-	waittext
+	waitmessage
 	waitbutton
 	message OldaleTown_PokemonCenter_2F_Text_1A4826
-	waittext
+	waitmessage
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A3EBC
 
 OldaleTown_PokemonCenter_2F_EventScript_1A3FEF:: @ 81A3FEF
 	message OldaleTown_PokemonCenter_2F_Text_1A4840
-	waittext
+	waitmessage
 	multichoice 0, 0, 18, 0
 	switch RESULT
 	case 0, OldaleTown_PokemonCenter_2F_EventScript_1A4062
@@ -288,7 +288,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4042:: @ 81A4042
 
 OldaleTown_PokemonCenter_2F_EventScript_1A4056:: @ 81A4056
 	message OldaleTown_PokemonCenter_2F_Text_1A486A
-	waittext
+	waitmessage
 	waitbutton
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A3FEF
 
@@ -306,28 +306,28 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4068:: @ 81A4068
 OldaleTown_PokemonCenter_2F_EventScript_1A4093:: @ 81A4093
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4C03
-	waittext
+	waitmessage
 	waitbutton
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40A2:: @ 81A40A2
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4BCC
-	waittext
+	waitmessage
 	waitbutton
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40B1:: @ 81A40B1
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B95
-	waittext
+	waitmessage
 	waitbutton
 	goto OldaleTown_PokemonCenter_2F_EventScript_1A40C0
 
 OldaleTown_PokemonCenter_2F_EventScript_1A40C0:: @ 81A40C0
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4C38
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -365,7 +365,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A40FA:: @ 81A40FA
 	compare RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
-	waittext
+	waitmessage
 	special sub_80834E4
 	waitstate
 	compare RESULT, 1
@@ -385,13 +385,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4166:: @ 81A4166
 	setvar 0x8004, 3
 	copyvar 0x4087, 0x8004
 	message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
-	waittext
+	waitmessage
 	setmaptile 8, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
-	closebutton
+	closemessage
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	setdooropened 8, 1
@@ -416,14 +416,14 @@ OldaleTown_PokemonCenter_2F_EventScript_1A41BB:: @ 81A41BB
 
 OldaleTown_PokemonCenter_2F_EventScript_1A41E1:: @ 81A41E1
 	message OldaleTown_PokemonCenter_2F_Text_1A48A3
-	waittext
+	waitmessage
 	waitbutton
 	setvar RESULT, 0
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_1A41EE:: @ 81A41EE
 	message OldaleTown_PokemonCenter_2F_Text_1A48DD
-	waittext
+	waitmessage
 	waitbutton
 	setvar RESULT, 0
 	return
@@ -459,7 +459,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4229:: @ 81A4229
 	compare RESULT, 0
 	goto_if_eq OldaleTown_PokemonCenter_2F_EventScript_1A4319
 	message OldaleTown_PokemonCenter_2F_Text_1A490C
-	waittext
+	waitmessage
 	special sub_808350C
 	waitstate
 	special sub_80835D8
@@ -483,13 +483,13 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
 	setvar 0x8004, 4
 	copyvar 0x4087, 0x8004
 	message2 OldaleTown_PokemonCenter_2F_Text_1A4A22
-	waittext
+	waitmessage
 	setmaptile 11, 3, 514, 0
 	special DrawWholeMapView
 	delay 60
 	applymovement LAST_TALKED, OldaleTown_PokemonCenter_2F_Movement_1A4356
 	waitmovement 0
-	closebutton
+	closemessage
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_1A435B
 	waitmovement 0
 	setdooropened 11, 1
@@ -505,7 +505,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4294:: @ 81A4294
 OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4AC8
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -513,7 +513,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42E9:: @ 81A42E9
 OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4A85
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -521,7 +521,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A42F5:: @ 81A42F5
 OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4A30
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -529,7 +529,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4301:: @ 81A4301
 OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B1D
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -537,7 +537,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A430D:: @ 81A430D
 OldaleTown_PokemonCenter_2F_EventScript_1A4319:: @ 81A4319
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B59
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -551,7 +551,7 @@ OldaleTown_PokemonCenter_2F_EventScript_1A4325:: @ 81A4325
 OldaleTown_PokemonCenter_2F_EventScript_1A432D:: @ 81A432D
 	special CloseLink
 	message OldaleTown_PokemonCenter_2F_Text_1A4B6C
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -599,7 +599,7 @@ gUnknown_081A4363:: @ 81A4363
 	lockall
 	special ShowLinkBattleRecords
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -721,14 +721,14 @@ RecordCorner_EventScript_1A4457:: @ 81A4457
 RecordCorner_EventScript_1A446C:: @ 81A446C
 	bufferitem 1, 0x4001
 	message RecordCorner_Text_1A4E3B
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
 
 TradeRoom_ReadTrainerCard1:: @ 81A4479
 	message CableClub_LookAtTrainerCard1
-	waittext
+	waitmessage
 	waitbutton
 	fadescreen 1
 	special sub_8083BDC
@@ -737,7 +737,7 @@ TradeRoom_ReadTrainerCard1:: @ 81A4479
 
 TradeRoom_ReadTrainerCard2:: @ 81A4487
 	message CableClub_LookAtTrainerCard2
-	waittext
+	waitmessage
 	waitbutton
 	fadescreen 1
 	special sub_8083BDC
@@ -746,27 +746,27 @@ TradeRoom_ReadTrainerCard2:: @ 81A4487
 
 TradeRoom_TooBusyToNotice:: @ 81A4495
 	message CableClub_TooBusyToNotice
-	waittext
+	waitmessage
 	waitbutton
-	closebutton
+	closemessage
 	end
 
 SingleBattleColosseum_EventScript_1A449E:: @ 81A449E
 	special sub_8064EAC
 	message SingleBattleColosseum_Text_1A4D7E
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8064ED4
-	closebutton
+	closemessage
 	end
 
 TradeCenter_EventScript_1A44AD:: @ 81A44AD
 	special sub_8064EAC
 	message TradeCenter_Text_1A4DAB
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8064ED4
-	closebutton
+	closemessage
 	end
 
 RecordCorner_EventScript_1A44BC:: @ 81A44BC
@@ -774,31 +774,31 @@ RecordCorner_EventScript_1A44BC:: @ 81A44BC
 	goto_if 5, RecordCorner_EventScript_1A44D6
 	special sub_8064EAC
 	message RecordCorner_Text_1A4DD7
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8064ED4
-	closebutton
+	closemessage
 	end
 
 RecordCorner_EventScript_1A44D6:: @ 81A44D6
 	special sub_8064EAC
 	message RecordCorner_Text_1A4DF7
-	waittext
+	waitmessage
 	waitbutton
 	special sub_8064ED4
-	closebutton
+	closemessage
 	end
 
 TradeRoom_PromptToCancelLink:: @ 81A44E5
 	msgbox TradeRoom_WillLinkBeTerminated, 5
 	compare RESULT, 1
 	goto_if_eq TradeRoom_TerminateLink
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	end
 
 TradeRoom_TerminateLink:: @ 81A44FE
 	message2 TradeRoom_TerminatingLink
-	waittext
+	waitmessage
 	special sub_80839D0
 	end
 
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 10314c462..16e5a6282 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -66,7 +66,7 @@ FallarborTown_ContestLobby_EventScript_1A4F67:: @ 81A4F67
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F86
 	setvar 0x408a, 0
-	closebutton
+	closemessage
 	release
 	end
 
@@ -76,7 +76,7 @@ FallarborTown_ContestLobby_EventScript_1A4F86:: @ 81A4F86
 
 FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F
 	message FallarborTown_ContestLobby_Text_1A5E46
-	waittext
+	waitmessage
 	multichoice 0, 0, 2, 0
 	switch RESULT
 	case 0, FallarborTown_ContestLobby_EventScript_1A5097
@@ -87,7 +87,7 @@ FallarborTown_ContestLobby_EventScript_1A4F8F:: @ 81A4F8F
 
 FallarborTown_ContestLobby_EventScript_1A4FCC:: @ 81A4FCC
 	message FallarborTown_ContestLobby_Text_1A5E7C
-	waittext
+	waitmessage
 	multichoice 0, 0, 3, 0
 	switch RESULT
 	case 0, FallarborTown_ContestLobby_EventScript_1A5014
@@ -137,7 +137,7 @@ FallarborTown_ContestLobby_EventScript_1A5048:: @ 81A5048
 
 FallarborTown_ContestLobby_EventScript_1A5097:: @ 81A5097
 	message FallarborTown_ContestLobby_Text_1A6623
-	waittext
+	waitmessage
 	multichoice 0, 0, 4, 0
 	switch RESULT
 	case 5, FallarborTown_ContestLobby_EventScript_1A503E
@@ -180,7 +180,7 @@ FallarborTown_ContestLobby_EventScript_1A512E:: @ 81A512E
 
 FallarborTown_ContestLobby_EventScript_1A513D:: @ 81A513D
 	msgbox FallarborTown_ContestLobby_Text_1A67C1, 4
-	closebutton
+	closemessage
 	releaseall
 	setvar 0x4086, 1
 	return
@@ -277,7 +277,7 @@ LinkContestRoom1_EventScript_1A525F:: @ 81A525F
 
 LinkContestRoom1_EventScript_1A5273:: @ 81A5273
 	message2 LinkContestRoom1_Text_1A6976
-	waittext
+	waitmessage
 	return
 
 LinkContestRoom1_EventScript_1A527A:: @ 81A527A
@@ -360,19 +360,19 @@ LinkContestRoom1_EventScript_1A535E:: @ 81A535E
 	compare 0x4088, 5
 	goto_if_eq LinkContestRoom1_EventScript_1A5370
 	message LinkContestRoom1_Text_1A6A04
-	waittext
+	waitmessage
 	return
 
 LinkContestRoom1_EventScript_1A5370:: @ 81A5370
 	message2 LinkContestRoom1_Text_1A6A04
-	waittext
+	waitmessage
 	return
 
 LinkContestRoom1_EventScript_1A5377:: @ 81A5377
 	call LinkContestRoom1_EventScript_1A53B3
 	call LinkContestRoom1_EventScript_1A53CE
 	playse 223
-	waittext
+	waitmessage
 	call LinkContestRoom1_EventScript_1A5A90
 	applymovement 1, LinkContestRoom1_Movement_1A5D9F
 	waitmovement 0
@@ -392,7 +392,7 @@ LinkContestRoom1_EventScript_1A53B3:: @ 81A53B3
 
 LinkContestRoom1_EventScript_1A53C7:: @ 81A53C7
 	message2 LinkContestRoom1_Text_1A6A1F
-	waittext
+	waitmessage
 	return
 
 LinkContestRoom1_EventScript_1A53CE:: @ 81A53CE
@@ -722,7 +722,7 @@ LinkContestRoom1_EventScript_1A587F:: @ 81A587F
 	return
 
 LinkContestRoom1_EventScript_1A5880:: @ 81A5880
-	closebutton
+	closemessage
 	release
 	removeobject 13
 	special sub_80C5164
@@ -766,7 +766,7 @@ LinkContestRoom1_EventScript_1A58EE:: @ 81A58EE
 	applymovement 1, LinkContestRoom1_Movement_1A5DA3
 	waitmovement 0
 	call LinkContestRoom1_EventScript_1A5930
-	waittext
+	waitmessage
 	applymovement 1, LinkContestRoom1_Movement_1A5D91
 	applymovement 2, LinkContestRoom1_Movement_1A5D95
 	waitmovement 0
@@ -800,7 +800,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
 	call LinkContestRoom1_EventScript_1A59DE
 	applymovement 1, LinkContestRoom1_Movement_1A5D8F
 	waitmovement 0
-	closebutton
+	closemessage
 	releaseall
 	setvar 0x4009, 1
 	showcontestresults
@@ -816,7 +816,7 @@ LinkContestRoom1_EventScript_1A5984:: @ 81A5984
 
 LinkContestRoom1_EventScript_1A5998:: @ 81A5998
 	message2 LinkContestRoom1_Text_1A6C06
-	waittext
+	waitmessage
 	delay 30
 	return
 
@@ -828,7 +828,7 @@ LinkContestRoom1_EventScript_1A59A2:: @ 81A59A2
 
 LinkContestRoom1_EventScript_1A59B6:: @ 81A59B6
 	message2 LinkContestRoom1_Text_1A6C21
-	waittext
+	waitmessage
 	delay 30
 	return
 
@@ -840,7 +840,7 @@ LinkContestRoom1_EventScript_1A59C0:: @ 81A59C0
 
 LinkContestRoom1_EventScript_1A59D4:: @ 81A59D4
 	message2 LinkContestRoom1_Text_1A6C9D
-	waittext
+	waitmessage
 	delay 30
 	return
 
@@ -852,7 +852,7 @@ LinkContestRoom1_EventScript_1A59DE:: @ 81A59DE
 
 LinkContestRoom1_EventScript_1A59F2:: @ 81A59F2
 	message2 LinkContestRoom1_Text_1A6D16
-	waittext
+	waitmessage
 	delay 30
 	return
 
@@ -902,7 +902,7 @@ LinkContestRoom1_EventScript_1A5A75:: @ 81A5A75
 
 LinkContestRoom1_EventScript_1A5A89:: @ 81A5A89
 	message2 LinkContestRoom1_Text_1A6D3C
-	waittext
+	waitmessage
 	return
 
 LinkContestRoom1_EventScript_1A5A90:: @ 81A5A90
@@ -999,7 +999,7 @@ LinkContestRoom1_EventScript_1A5BAB:: @ 81A5BAB
 	checkflag 2
 	goto_if_eq LinkContestRoom1_EventScript_1A5BF6
 	msgbox LinkContestRoom1_Text_1A6DC5, 3
-	waittext
+	waitmessage
 	call LinkContestRoom1_EventScript_1A5C7F
 	call LinkContestRoom1_EventScript_1A5CE5
 	playse 223
@@ -1055,7 +1055,7 @@ LinkContestRoom1_EventScript_1A5C4C:: @ 81A5C4C
 	special sub_80C4CF8
 	compare 0x8004, 1
 	goto_if_eq LinkContestRoom1_EventScript_1A5C64
-	closebutton
+	closemessage
 	return
 
 LinkContestRoom1_EventScript_1A5C64:: @ 81A5C64
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index 62a2d6224..23e61063c 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -38,7 +38,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2
 	message Route117_Text_1B27A2
 	playfanfare 367
 	waitfanfare
-	waittext
+	waitmessage
 	waitbutton
 	msgbox Route117_Text_1B27CD, 4
 	special sp0B8_daycare
@@ -69,7 +69,7 @@ Route117_EventScript_1B22FE:: @ 81B22FE
 	msgbox Route117_Text_1B2897, 4
 	special sp0B9_daycare_relationship_comment
 	special ShowFieldMessageStringVar4
-	waittext
+	waitmessage
 	waitbutton
 	setvar 0x8004, 0
 	call Route117_EventScript_1B22CD
diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc
index 998da7380..f13b319f4 100644
--- a/data/scripts/magma_chimney.inc
+++ b/data/scripts/magma_chimney.inc
@@ -5,7 +5,7 @@ MtChimney_EventScript_1B2C95:: @ 81B2C95
 	call_if 0, MtChimney_EventScript_1B2CB9
 	checkflag 219
 	call_if 1, MtChimney_EventScript_1B2CC2
-	closebutton
+	closemessage
 	applymovement 1, MtChimney_Movement_1A083D
 	waitmovement 0
 	setflag 219
@@ -57,7 +57,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	.else
 	msgbox MtChimney_Text_1B3A90, 4
 	.endif
-	closebutton
+	closemessage
 	delay 30
 	fadescreen 1
 	removeobject 2
@@ -65,7 +65,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	removeobject 22
 	setflag 926
 	fadescreen 0
-	movespriteperm 1, 10, 12
+	setobjectxyperm 1, 10, 12
 	addobject 1
 	compare FACING, 4
 	call_if 1, MtChimney_EventScript_1B2D7D
@@ -78,7 +78,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB
 	.else
 	msgbox MtChimney_Text_1B3FFE, 4
 	.endif
-	closebutton
+	closemessage
 	compare FACING, 4
 	call_if 1, MtChimney_EventScript_1B2D93
 	compare FACING, 2
diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc
index 5a0b4014a..0e9a82f4c 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/scripts/maps/AncientTomb.inc
@@ -37,7 +37,7 @@ AncientTomb_EventScript_15F021:: @ 815F021
 	goto_if_eq AncientTomb_EventScript_15F038
 	braillemsg AncientTomb_Braille_1C552E
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -50,7 +50,7 @@ AncientTomb_EventScript_15F042:: @ 815F042
 	lockall
 	braillemsg AncientTomb_Braille_1C552E
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
index 9fd81f121..230d0e2db 100644
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ b/data/scripts/maps/AquaHideout_B2F.inc
@@ -47,7 +47,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
 	applymovement 0x8008, AquaHideout_B2F_Movement_1A0839
 	waitmovement 0
 	msgbox AquaHideout_B2F_Text_197162, 4
-	closebutton
+	closemessage
 	.ifdef SAPPHIRE
 	applymovement 0x8008, Movement_1A083F
 	.else
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
index 3223deba4..3f1aad4a0 100644
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ b/data/scripts/maps/BattleTower_BattleRoom.inc
@@ -18,8 +18,8 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
 	waitmovement 0
 	special sub_8135474
 	msgbox 0x20234cc, 4
-	waittext
-	closebutton
+	waitmessage
+	closemessage
 	special ScrSpecial_HealPlayerParty
 	setvar 0x8004, 0
 	setvar 0x8005, 0
@@ -80,7 +80,7 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
 	case 127, BattleTower_BattleRoom_EventScript_1609B2
 
 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
-	closebutton
+	closemessage
 	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
 	waitmovement 0
 	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
@@ -109,7 +109,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
 	special sub_8135BA0
 	message BattleTower_BattleRoom_Text_1C6CE1
 	delay 60
-	waittext
+	waitmessage
 	playse 55
 	waitse
 	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
index 61ac04810..555e32d81 100644
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ b/data/scripts/maps/BattleTower_Lobby.inc
@@ -65,7 +65,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330
 	lock
 	faceplayer
 	msgbox BattleTower_Lobby_Text_19A3FD, 4
-	closebutton
+	closemessage
 	setvar 0x4000, 5
 	release
 	end
@@ -74,7 +74,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
 	lock
 	faceplayer
 	message BattleTower_Lobby_Text_19A487
-	waittext
+	waitmessage
 	setvar 0x8004, 0
 	special sub_81358A4
 	compare RESULT, 6
@@ -83,7 +83,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_16037D
 	message BattleTower_Lobby_Text_19A6BE
-	waittext
+	waitmessage
 	playfanfare 370
 	waitfanfare
 	msgbox BattleTower_Lobby_Text_19A719, 4
@@ -94,7 +94,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D
 	compare RESULT, 1
 	goto_if_eq BattleTower_Lobby_EventScript_1603AD
 	message BattleTower_Lobby_Text_19A589
-	waittext
+	waitmessage
 	setvar 0x8004, 13
 	special sub_8135668
 	special sub_8135D84
@@ -108,12 +108,12 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
 	setvar 0x8005, 3
 	special sub_8135668
 	message BattleTower_Lobby_Text_19A4BB
-	waittext
+	waitmessage
 	special sub_8135DEC
 	switch RESULT
 	case 0, BattleTower_Lobby_EventScript_160408
 	message BattleTower_Lobby_Text_19A506
-	waittext
+	waitmessage
 	playfanfare 370
 	waitfanfare
 	setvar 0x8004, 9
@@ -124,15 +124,15 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
 
 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
 	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closebutton
+	closemessage
 	setvar 0x4000, 5
 	release
 	end
 
 BattleTower_Lobby_EventScript_160408:: @ 8160408
 	msgbox BattleTower_Lobby_Text_19A520, 4
-	waittext
-	closebutton
+	waitmessage
+	closemessage
 	setvar 0x4000, 5
 	release
 	end
@@ -141,9 +141,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419
 	lock
 	faceplayer
 	message BattleTower_Lobby_Text_19A571
-	waittext
+	waitmessage
 	message BattleTower_Lobby_Text_19A589
-	waittext
+	waitmessage
 	setvar 0x8004, 13
 	special sub_8135668
 	setvar 0x8004, 0
@@ -151,7 +151,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419
 	playse 55
 	waitse
 	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closebutton
+	closemessage
 	setvar 0x4000, 5
 	release
 	end
@@ -161,9 +161,9 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B
 	faceplayer
 	setvar 0x40bc, 1
 	message BattleTower_Lobby_Text_19A5B1
-	waittext
+	waitmessage
 	message BattleTower_Lobby_Text_19A5CE
-	waittext
+	waitmessage
 	setvar 0x8004, 1
 	special sub_8135BA0
 	playse 55
@@ -175,7 +175,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B
 	special SavePlayerParty
 	special sub_8135A14
 	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closebutton
+	closemessage
 	call BattleTower_Lobby_EventScript_160664
 	warp BattleTower_Elevator, 255, 1, 6
 	setvar 0x4000, 0
@@ -193,7 +193,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E
 
 BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
 	message BattleTower_Lobby_Text_199F79
-	waittext
+	waitmessage
 	multichoice 15, 6, 23, 0
 	switch RESULT
 	case 0, BattleTower_Lobby_EventScript_1604FA
@@ -203,7 +203,7 @@ BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
 
 BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
 	message BattleTower_Lobby_Text_19A024
-	waittext
+	waitmessage
 	multichoice 18, 6, 24, 0
 	switch RESULT
 	case 2, BattleTower_Lobby_EventScript_160652
@@ -240,11 +240,11 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	setvar 0x8005, 0
 	special sub_8135668
 	special LoadPlayerParty
-	closebutton
+	closemessage
 	delay 2
 	call S_DoSaveDialog
 	setvar 0x4000, 5
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	compare RESULT, 0
 	goto_if_eq BattleTower_Lobby_EventScript_160642
 	inccounter GAME_STAT_ENTERED_BATTLE_TOWER
@@ -252,7 +252,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587
 	special sub_8135A14
 	setvar 0x40bc, 1
 	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closebutton
+	closemessage
 	call BattleTower_Lobby_EventScript_160664
 	warp BattleTower_Elevator, 255, 1, 6
 	setvar 0x4000, 0
@@ -380,7 +380,7 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727
 	lockall
 	special ShowBattleTowerRecords
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc
index 53e693f71..95c5a9d77 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/scripts/maps/BattleTower_Outside.inc
@@ -16,12 +16,12 @@ BattleTower_Outside_EventScript_160168:: @ 8160168
 	compare RESULT, 0
 	goto_if_eq BattleTower_Outside_EventScript_1601C6
 	message BattleTower_Outside_Text_199D9D
-	waittext
+	waitmessage
 	goto BattleTower_Outside_EventScript_16018E
 	end
 
 BattleTower_Outside_EventScript_16018E:: @ 816018E
-	multichoicedef 21, 6, 53, 2, 0
+	multichoicedefault 21, 6, 53, 2, 0
 	switch RESULT
 	case 0, BattleTower_Outside_EventScript_1601D0
 	case 1, BattleTower_Outside_EventScript_1601FB
@@ -58,12 +58,12 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB
 
 BattleTower_Outside_EventScript_160226:: @ 8160226
 	message BattleTower_Outside_Text_199E7A
-	waittext
+	waitmessage
 	goto BattleTower_Outside_EventScript_16018E
 	end
 
 BattleTower_Outside_EventScript_160232:: @ 8160232
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845
 	waitmovement 0
 	delay 30
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
index 3b2e7802d..503b9f1a8 100644
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ b/data/scripts/maps/CaveOfOrigin_B4F.inc
@@ -32,7 +32,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
 	.else
 	msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
 	.endif
-	closebutton
+	closemessage
 	setweather 0
 	doweather
 	special WaitWeather
@@ -87,7 +87,7 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
 	.else
 	msgbox CaveOfOrigin_B4F_Text_1B5009, 4
 	.endif
-	closebutton
+	closemessage
 	return
 
 CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D
diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc
index b549cf127..6b8bb5cdb 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/scripts/maps/DesertRuins.inc
@@ -37,7 +37,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56
 	goto_if_eq DesertRuins_EventScript_15CB6D
 	braillemsg DesertRuins_Braille_1C54C8
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -50,7 +50,7 @@ DesertRuins_EventScript_15CB77:: @ 815CB77
 	lockall
 	braillemsg DesertRuins_Braille_1C54C8
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
index c8f20f4ac..480a408e3 100644
--- a/data/scripts/maps/DewfordTown.inc
+++ b/data/scripts/maps/DewfordTown.inc
@@ -12,8 +12,8 @@ DewfordTown_EventScript_14E002:: @ 814E002
 	checkflag 189
 	goto_if 0, DewfordTown_EventScript_14E076
 	message DewfordTown_Text_16B522
-	waittext
-	multichoicedef 21, 6, 0, 2, 0
+	waitmessage
+	multichoicedefault 21, 6, 0, 2, 0
 	switch RESULT
 	case 0, DewfordTown_EventScript_14E04B
 	case 1, DewfordTown_EventScript_14E05B
@@ -23,21 +23,21 @@ DewfordTown_EventScript_14E002:: @ 814E002
 
 DewfordTown_EventScript_14E04B:: @ 814E04B
 	msgbox DewfordTown_Text_16B57D, 4
-	closebutton
+	closemessage
 	goto DewfordTown_EventScript_14E151
 	release
 	end
 
 DewfordTown_EventScript_14E05B:: @ 814E05B
 	msgbox DewfordTown_Text_16B5D2, 4
-	closebutton
+	closemessage
 	goto DewfordTown_EventScript_14E1D8
 	release
 	end
 
 DewfordTown_EventScript_14E06B:: @ 814E06B
 	msgbox DewfordTown_Text_16B627, 4
-	closebutton
+	closemessage
 	release
 	end
 
@@ -51,7 +51,7 @@ DewfordTown_EventScript_14E076:: @ 814E076
 
 DewfordTown_EventScript_14E093:: @ 814E093
 	msgbox DewfordTown_Text_16B417, 4
-	closebutton
+	closemessage
 	goto DewfordTown_EventScript_14E151
 	end
 
@@ -98,7 +98,7 @@ DewfordTown_EventScript_14E111:: @ 814E111
 
 DewfordTown_EventScript_14E11B:: @ 814E11B
 	message DewfordTown_Text_16B84E
-	waittext
+	waitmessage
 	multichoice 20, 8, 50, 1
 	compare RESULT, 0
 	goto_if_eq DewfordTown_EventScript_14E13D
@@ -166,7 +166,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	showobject 255, 0, 24
 	applymovement 255, DewfordTown_Movement_14E409
 	waitmovement 0
-	movespriteperm 2, 21, 26
+	setobjectxyperm 2, 21, 26
 	addobject 2
 	spritelevelup 2, 0, 24, 0
 	applymovement 2, DewfordTown_Movement_14E410
@@ -180,11 +180,11 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8
 	call_if 0, DewfordTown_EventScript_14E281
 	checkflag 149
 	call_if 1, DewfordTown_EventScript_14E28A
-	closebutton
+	closemessage
 	copyvar 0x4096, 0x8008
 	restorespritelevel 255, 0, 11
 	restorespritelevel 2, 0, 24
-	moveoffscreen 2
+	moveobjectoffscreen 2
 	release
 	end
 
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 034bca1bc..296d2ed2d 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -109,7 +109,7 @@ DewfordTown_Gym_EventScript_153152:: @ 8153152
 DewfordTown_Gym_EventScript_153177:: @ 8153177
 	call DewfordTown_Gym_EventScript_153117
 	message DewfordTown_Gym_Text_1752BB
-	waittext
+	waitmessage
 	call DewfordTown_Gym_EventScript_1A02C5
 	msgbox DewfordTown_Gym_Text_1752E6, 4
 	setflag 1204
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
index 78b5f5044..ea4016147 100644
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ b/data/scripts/maps/DewfordTown_Hall.inc
@@ -52,7 +52,7 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A
 	faceplayer
 	call DewfordTown_Hall_EventScript_1A0102
 	msgbox DewfordTown_Hall_Text_17570D, 4
-	closebutton
+	closemessage
 	applymovement 4, DewfordTown_Hall_Movement_1A0841
 	waitmovement 0
 	release
@@ -63,7 +63,7 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326
 	faceplayer
 	call DewfordTown_Hall_EventScript_1A0102
 	msgbox DewfordTown_Hall_Text_17574C, 4
-	closebutton
+	closemessage
 	applymovement 5, DewfordTown_Hall_Movement_1A0841
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
index 96c198ae5..70e75492e 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A
 DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023
 	setvar 0x800b, 1
 	call DewfordTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
index adfbca1bf..febd6a521 100644
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
@@ -50,7 +50,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
 	setmaptile 6, 2, 839, 0
 	special DrawWholeMapView
 	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
-	closebutton
+	closemessage
 	playse 8
 	checkgender
 	compare RESULT, 0
@@ -101,7 +101,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
 	end
 
 EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
-	closebutton
+	closemessage
 	addobject 3
 	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
 	waitmovement 0
@@ -116,7 +116,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
 	waitmovement 0
 	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
-	closebutton
+	closemessage
 	delay 30
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
@@ -132,7 +132,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
 	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB
 	compare RESULT, 1
 	call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4
-	closebutton
+	closemessage
 	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
 	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
 	waitmovement 0
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
index 523a337cc..b53319abe 100644
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
@@ -24,7 +24,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_191841, 4
-	closebutton
+	closemessage
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60
 	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60
 	waitmovement 0
@@ -33,7 +33,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
 	waitmovement 0
 	msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4
-	closebutton
+	closemessage
 	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841
 	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841
 	waitmovement 0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
index 7c0b8b0a4..57262b211 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
 	setvar 0x800b, 1
 	call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
index f15f05904..acbdac899 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
@@ -10,14 +10,14 @@ EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
 	end
 
 EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
-	movespriteperm 3, 9, 2
-	movespriteperm 4, 10, 2
+	setobjectxyperm 3, 9, 2
+	setobjectxyperm 4, 10, 2
 	return
 
 EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
 	setvar 0x800b, 1
 	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -26,7 +26,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
 	lock
 	faceplayer
 	message EverGrandeCity_PokemonLeague_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart EverGrandeCity_PokemonLeague_Items
 	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
 	release
@@ -55,22 +55,22 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
 	compare 0x4000, 8
 	call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F
 	message EverGrandeCity_PokemonLeague_Text_1916FD
-	waittext
+	waitmessage
 	delay 75
 	checkflag 2060
 	goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A
-	closebutton
+	closemessage
 	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
 	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
 	waitmovement 0
 	delay 10
 	playfanfare 369
 	message EverGrandeCity_PokemonLeague_Text_191804
-	waittext
+	waitmessage
 	waitfanfare
-	closebutton
-	moveoffscreen 3
-	moveoffscreen 4
+	closemessage
+	moveobjectoffscreen 3
+	moveobjectoffscreen 4
 	setflag 263
 	releaseall
 	end
@@ -95,7 +95,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
 	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
 	waitmovement 0
 	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
 	waitmovement 0
 	releaseall
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
index a629acaf9..c4c590b53 100644
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ b/data/scripts/maps/FallarborTown_ContestLobby.inc
@@ -38,7 +38,7 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
 	applymovement 255, FallarborTown_ContestLobby_Movement_153A7A
 	waitmovement 0
 	msgbox FallarborTown_ContestLobby_Text_1A6832, 4
-	closebutton
+	closemessage
 	applymovement 1, FallarborTown_ContestLobby_Movement_153A83
 	applymovement 255, FallarborTown_ContestLobby_Movement_153A70
 	waitmovement 0
@@ -108,7 +108,7 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2
 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
 	lockall
 	fadescreen 1
-	showcontestwinner 2
+	drawcontestwinner 2
 	releaseall
 	end
 
@@ -116,6 +116,6 @@ FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc
index 05a3704fe..0cf842ddf 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/scripts/maps/FallarborTown_Mart.inc
@@ -5,7 +5,7 @@ FallarborTown_Mart_EventScript_153967:: @ 8153967
 	lock
 	faceplayer
 	message FallarborTown_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart FallarborTown_Mart_Items
 	msgbox FallarborTown_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
index 3b33c5a41..5b1f1c948 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
 FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
 	setvar 0x800b, 1
 	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
@@ -27,7 +27,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22
 	lock
 	faceplayer
 	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4
-	closebutton
+	closemessage
 	switch FACING
 	case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49
 	case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
index a7c548b1f..3cddff4f9 100644
--- a/data/scripts/maps/FortreeCity.inc
+++ b/data/scripts/maps/FortreeCity.inc
@@ -72,7 +72,7 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF
 
 FortreeCity_EventScript_14C9E4:: @ 814C9E4
 	msgbox FortreeCity_Text_1678CB, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, FortreeCity_Movement_1A0662
 	waitmovement 0
 	waitse
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc
index c9d9fdd4e..fca20b866 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/scripts/maps/FortreeCity_DecorationShop.inc
@@ -13,7 +13,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A
 	lock
 	faceplayer
 	message FortreeCity_DecorationShop_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor FortreeCity_DecorationShop_Decorations1
 	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
 	release
@@ -37,7 +37,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298
 	lock
 	faceplayer
 	message FortreeCity_DecorationShop_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor FortreeCity_DecorationShop_Decorations2
 	msgbox FortreeCity_DecorationShop_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc
index 8744141cb..7309be0bb 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/scripts/maps/FortreeCity_Gym.inc
@@ -25,7 +25,7 @@ FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0
 
 FortreeCity_Gym_EventScript_157F15:: @ 8157F15
 	message FortreeCity_Gym_Text_185E48
-	waittext
+	waitmessage
 	call FortreeCity_Gym_EventScript_1A02C5
 	msgbox FortreeCity_Gym_Text_185E73, 4
 	setflag 1225
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
index f90c080f8..fdd30022f 100644
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ b/data/scripts/maps/FortreeCity_House4.inc
@@ -14,7 +14,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188
 	checkflag 222
 	goto_if_eq FortreeCity_House4_EventScript_1581C2
 	msgbox FortreeCity_House4_Text_186835, 4
-	closebutton
+	closemessage
 	setflag 222
 	clearflag 934
 	applymovement 3, FortreeCity_House4_Movement_158218
diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/scripts/maps/FortreeCity_Mart.inc
index 9e5f34ff9..076f702af 100644
--- a/data/scripts/maps/FortreeCity_Mart.inc
+++ b/data/scripts/maps/FortreeCity_Mart.inc
@@ -5,7 +5,7 @@ FortreeCity_Mart_EventScript_158067:: @ 8158067
 	lock
 	faceplayer
 	message FortreeCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart FortreeCity_Mart_Items
 	msgbox FortreeCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
index 148324abf..5268cbeed 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017
 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B
 	setvar 0x800b, 1
 	call FortreeCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
index 9afe54091..070276e58 100644
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ b/data/scripts/maps/GraniteCave_StevensRoom.inc
@@ -13,7 +13,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
 	compare RESULT, 0
 	call_if 1, GraniteCave_StevensRoom_EventScript_15CC83
 	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D
 	compare FACING, 1
diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc
index b59500625..ed230477c 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/scripts/maps/IslandCave.inc
@@ -70,7 +70,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C
 
 IslandCave_EventScript_15EF95:: @ 815EF95
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
index afad309a9..e0d54d0e7 100644
--- a/data/scripts/maps/LavaridgeTown.inc
+++ b/data/scripts/maps/LavaridgeTown.inc
@@ -14,8 +14,8 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
 	end
 
 LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
-	movespriteperm 8, 11, 9
-	movespriteperm 7, 11, 9
+	setobjectxyperm 8, 11, 9
+	setobjectxyperm 7, 11, 9
 	return
 
 LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
@@ -98,7 +98,7 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
 	end
 
 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
-	closebutton
+	closemessage
 	compare 0x8008, 1
 	call_if 1, LavaridgeTown_EventScript_14E646
 	compare 0x8008, 0
@@ -124,7 +124,7 @@ LavaridgeTown_EventScript_14E644:: @ 814E644
 	end
 
 LavaridgeTown_EventScript_14E646:: @ 814E646
-	movespriteperm 7, 6, 16
+	setobjectxyperm 7, 6, 16
 	return
 
 LavaridgeTown_EventScript_14E64E:: @ 814E64E
@@ -139,19 +139,19 @@ LavaridgeTown_EventScript_14E64E:: @ 814E64E
 	return
 
 LavaridgeTown_EventScript_14E67B:: @ 814E67B
-	spritebehave 7, 8
+	setobjectmovementtype 7, 8
 	return
 
 LavaridgeTown_EventScript_14E680:: @ 814E680
-	spritebehave 7, 7
+	setobjectmovementtype 7, 7
 	return
 
 LavaridgeTown_EventScript_14E685:: @ 814E685
-	spritebehave 7, 10
+	setobjectmovementtype 7, 10
 	return
 
 LavaridgeTown_EventScript_14E68A:: @ 814E68A
-	spritebehave 7, 9
+	setobjectmovementtype 7, 9
 	return
 
 LavaridgeTown_EventScript_14E68F:: @ 814E68F
@@ -285,7 +285,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A
 	playfanfare 370
 	message LavaridgeTown_Text_16C2EA
 	waitfanfare
-	waittext
+	waitmessage
 	giveegg 360
 	release
 	end
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
index e22d4471f..2edffe9f0 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc
@@ -43,27 +43,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE
 LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF
 	checktrainerflag OPPONENT_COLE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C
-	spritebehave 2, 63
+	setobjectmovementtype 2, 63
 
 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C
 	checktrainerflag OPPONENT_ZANE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719
-	spritebehave 3, 63
+	setobjectmovementtype 3, 63
 
 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719
 	checktrainerflag OPPONENT_AXLE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726
-	spritebehave 4, 63
+	setobjectmovementtype 4, 63
 
 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726
 	checktrainerflag OPPONENT_SADIE
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733
-	spritebehave 5, 63
+	setobjectmovementtype 5, 63
 
 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733
 	checktrainerflag OPPONENT_ANDY
 	goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740
-	spritebehave 7, 63
+	setobjectmovementtype 7, 63
 
 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740
 	return
@@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741
 
 LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766
 	message LavaridgeTown_Gym_1F_Text_176A62
-	waittext
+	waitmessage
 	call LavaridgeTown_Gym_1F_EventScript_1A02C5
 	msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4
 	setflag 1213
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc
index c924684bc..5ec6731d4 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc
@@ -5,7 +5,7 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629
 	lock
 	faceplayer
 	message LavaridgeTown_HerbShop_Text_17615C
-	waittext
+	waitmessage
 	pokemart LavaridgeTown_HerbShop_Items
 	msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/scripts/maps/LavaridgeTown_Mart.inc
index 4f28e16b0..99b567e06 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.inc
+++ b/data/scripts/maps/LavaridgeTown_Mart.inc
@@ -5,7 +5,7 @@ LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB
 	lock
 	faceplayer
 	message LavaridgeTown_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LavaridgeTown_Mart_Items
 	msgbox LavaridgeTown_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
index c0762bcc3..9d0f31059 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912
 LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B
 	setvar 0x800b, 1
 	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
index af353e824..76976543c 100644
--- a/data/scripts/maps/LilycoveCity.inc
+++ b/data/scripts/maps/LilycoveCity.inc
@@ -411,7 +411,7 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62
 	return
 
 LilycoveCity_EventScript_14CF6B:: @ 814CF6B
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
 	waitmovement 0
 	delay 50
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
index 7746eac01..09f2e88ea 100644
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc
@@ -28,7 +28,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
 	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
 	lockall
 	fadescreen 1
-	showcontestwinner 0
+	drawcontestwinner 0
 	lockall
 	msgbox LilycoveCity_ContestLobby_Text_1889FD, 5
 	compare RESULT, 1
@@ -40,7 +40,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
 
 LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
 	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closebutton
+	closemessage
 	special sub_80C4CEC
 	setvar 0x4099, 0
 	specialvar RESULT, GiveMonArtistRibbon
@@ -59,7 +59,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
 	compare RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
 	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closebutton
+	closemessage
 	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
 	waitmovement 0
 	setvar 0x4099, 0
@@ -83,7 +83,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
 	waitfanfare
 	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
 	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closebutton
+	closemessage
 	return
 
 LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
@@ -203,7 +203,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
 	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
 	lockall
 	fadescreen 1
-	showcontestwinner 0
+	drawcontestwinner 0
 	msgbox LilycoveCity_ContestLobby_Text_1889FD, 5
 	compare RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
@@ -213,7 +213,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
 
 LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
 	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closebutton
+	closemessage
 	special sub_80C4CEC
 	setvar 0x4099, 0
 	specialvar RESULT, GiveMonArtistRibbon
@@ -232,7 +232,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
 	compare RESULT, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
 	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closebutton
+	closemessage
 	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
 	waitmovement 0
 	setvar 0x4099, 0
@@ -256,7 +256,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
 	waitfanfare
 	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
 	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closebutton
+	closemessage
 	return
 
 LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
@@ -310,14 +310,14 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
 	checkflag 2
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE
 	message LilycoveCity_ContestLobby_Text_18848C
-	waittext
+	waitmessage
 	setflag 2
 	goto LilycoveCity_ContestLobby_EventScript_158BF0
 	end
 
 LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
 	message LilycoveCity_ContestLobby_Text_188584
-	waittext
+	waitmessage
 	goto LilycoveCity_ContestLobby_EventScript_158BF0
 	end
 
@@ -331,7 +331,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
 	call S_DoSaveDialog
-	hidebox 0, 0, 15, 9
+	erasebox 0, 0, 15, 9
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
 	setflag 3
@@ -394,7 +394,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
 LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
 	copyvar 0x8008, 0x8004
 	message LilycoveCity_ContestLobby_Text_1A67A3
-	waittext
+	waitmessage
 	yesnobox 20, 8
 	switch RESULT
 	case 0, LilycoveCity_ContestLobby_EventScript_158C42
@@ -405,7 +405,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
 	checkflag 3
 	call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4
 	message LilycoveCity_ContestLobby_Text_1886DC
-	waittext
+	waitmessage
 	multichoice 0, 0, 4, 0
 	switch RESULT
 	case 5, LilycoveCity_ContestLobby_EventScript_158C35
@@ -416,7 +416,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
 
 LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
 	message LilycoveCity_ContestLobby_Text_1887C7
-	waittext
+	waitmessage
 	copyvar 0x8004, RESULT
 	special sub_808363C
 	waitstate
@@ -427,7 +427,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
 	compare RESULT, 6
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2
 	message2 LilycoveCity_ContestLobby_Text_18872A
-	waittext
+	waitmessage
 	contestlinktransfer
 	switch 0x8004
 	case 0, LilycoveCity_ContestLobby_EventScript_158DD1
@@ -443,7 +443,7 @@ LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
 LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
-	closebutton
+	closemessage
 	releaseall
 	clearflag 3
 	end
@@ -451,7 +451,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
-	closebutton
+	closemessage
 	releaseall
 	clearflag 3
 	end
@@ -459,7 +459,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
 	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
-	closebutton
+	closemessage
 	releaseall
 	clearflag 3
 	end
@@ -474,7 +474,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
 	addvar 0x8004, 1
 	buffernum 1, 32772
 	message2 LilycoveCity_ContestLobby_Text_188845
-	waittext
+	waitmessage
 	addvar 0x8004, 65535
 	goto LilycoveCity_ContestLobby_EventScript_158DEE
 	end
@@ -491,9 +491,9 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
 LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
 	lockall
 	message2 LilycoveCity_ContestLobby_Text_1888C6
-	waittext
+	waitmessage
 	delay 20
-	closebutton
+	closemessage
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
 	waitmovement 0
 	playse 71
@@ -512,9 +512,9 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
 	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
 	waitmovement 0
 	message2 LilycoveCity_ContestLobby_Text_1A6832
-	waittext
+	waitmessage
 	delay 20
-	closebutton
+	closemessage
 	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
 	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
 	waitmovement 0
@@ -651,7 +651,7 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
 	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
 	waitmovement 0
 	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
-	closebutton
+	closemessage
 	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
 	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
 	waitmovement 0
@@ -735,21 +735,21 @@ LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
 LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
 	lockall
 	fadescreen 1
-	showcontestwinner 6
+	drawcontestwinner 6
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
 	lockall
 	fadescreen 1
-	showcontestwinner 7
+	drawcontestwinner 7
 	releaseall
 	end
 
 LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
 	lockall
 	fadescreen 1
-	showcontestwinner 8
+	drawcontestwinner 8
 	releaseall
 	end
 
@@ -766,6 +766,6 @@ SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
index f6fb499a3..7b602b2c7 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
@@ -11,7 +11,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4
-	closebutton
+	closemessage
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
 	waitmovement 0
 	releaseall
@@ -22,7 +22,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4
-	closebutton
+	closemessage
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
 	waitmovement 0
 	releaseall
@@ -33,7 +33,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4
-	closebutton
+	closemessage
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
 	waitmovement 0
 	releaseall
@@ -49,7 +49,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D
 	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845
 	waitmovement 0
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4
-	closebutton
+	closemessage
 	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395
 	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A
 	waitmovement 0
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
index 0a51aff26..fd9ea8a58 100644
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
@@ -27,7 +27,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
 
 LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
 	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
-	waittext
+	waitmessage
 	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
 	special ScrSpecial_ShowDiploma
 	waitstate
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
index 43f110577..9d04d2e33 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
@@ -9,7 +9,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C
 	copyvar 0x8005, 0x4043
 	special sub_810E944
 	message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6
-	waittext
+	waitmessage
 	multichoice 0, 0, 57, 0
 	switch RESULT
 	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402
@@ -66,12 +66,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	release
 	end
 
 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845
 	waitmovement 0
 	special sub_810EBEC
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index b01d74129..02f5ca3ca 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
@@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4
 	release
@@ -70,7 +70,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD
 	lockall
 	message LilycoveCity_DepartmentStoreRooftop_Text_18C72B
-	waittext
+	waitmessage
 	showmoney 0, 0
 	nop
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE
@@ -182,7 +182,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
 
 LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E
 	message LilycoveCity_DepartmentStoreRooftop_Text_18C72B
-	waittext
+	waitmessage
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE
 	end
 
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
index 311dac1ab..2b39ea557 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
@@ -18,7 +18,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E
 	goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56
 	setflag 2250
 	message LilycoveCity_DepartmentStore_1F_Text_1C4CC6
-	waittext
+	waitmessage
 	special RetrieveLotteryNumber
 	copyvar 0x8008, RESULT
 	special sub_810F9AC
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
index e54883714..25e981628 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
@@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_2F_Items1
 	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
 	release
@@ -44,7 +44,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_2F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_2F_Items2
 	msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
index e669cef7f..1f55f5018 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
@@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_3F_Items1
 	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
 	release
@@ -27,7 +27,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_3F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_3F_Items2
 	msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
index 994b3b63f..d922d9181 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
@@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_4F_Items1
 	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
 	release
@@ -37,7 +37,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_4F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart LilycoveCity_DepartmentStore_4F_Items2
 	msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
index 0bef8866a..835a0f48d 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
@@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartbp LilycoveCity_DepartmentStore_5F_Items1
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
@@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartbp LilycoveCity_DepartmentStore_5F_Items2
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
@@ -58,7 +58,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartbp LilycoveCity_DepartmentStore_5F_Items3
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
@@ -83,7 +83,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2
 	lock
 	faceplayer
 	message LilycoveCity_DepartmentStore_5F_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartbp LilycoveCity_DepartmentStore_5F_Items4
 	msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
index cbcac6f6e..1fc172d8c 100644
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ b/data/scripts/maps/LilycoveCity_Harbor.inc
@@ -28,12 +28,12 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_159929
 	message LilycoveCity_Harbor_Text_18B406
-	waittext
+	waitmessage
 	goto LilycoveCity_Harbor_EventScript_1598F1
 	end
 
 LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1
-	multichoicedef 18, 6, 56, 2, 0
+	multichoicedefault 18, 6, 56, 2, 0
 	switch RESULT
 	case 0, LilycoveCity_Harbor_EventScript_159933
 	case 1, LilycoveCity_Harbor_EventScript_15995B
@@ -69,13 +69,13 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B
 
 LilycoveCity_Harbor_EventScript_15997E:: @ 815997E
 	message LilycoveCity_Harbor_Text_18B4E2
-	waittext
+	waitmessage
 	goto LilycoveCity_Harbor_EventScript_1598F1
 	end
 
 LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
 	msgbox LilycoveCity_Harbor_Text_18B4B3, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
@@ -113,7 +113,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	checkflag 2131
 	goto_if 0, LilycoveCity_Harbor_EventScript_1598BA
 	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
@@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
 	applymovement 4, LilycoveCity_Harbor_Movement_1A0839
 	waitmovement 0
 	msgbox LilycoveCity_Harbor_Text_1C5120, 4
-	closebutton
+	closemessage
 	applymovement 4, LilycoveCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc
index fa5a30862..f700eed9d 100644
--- a/data/scripts/maps/LilycoveCity_House3.inc
+++ b/data/scripts/maps/LilycoveCity_House3.inc
@@ -14,7 +14,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_House3_EventScript_159C1D
 	msgbox LilycoveCity_House3_Text_18BA2B, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D
 	waitmovement 0
 	release
@@ -22,7 +22,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3
 
 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D
 	msgbox LilycoveCity_House3_Text_18B9DC, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D
 	waitmovement 0
 	release
@@ -32,7 +32,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32
 	lock
 	faceplayer
 	msgbox LilycoveCity_House3_Text_18BD64, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
index 548c80a96..06e82d5f8 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
@@ -9,7 +9,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425
 	lockall
 	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839
 	message LilycoveCity_LilycoveMuseum_1F_Text_1873B9
-	waittext
+	waitmessage
 	multichoice 20, 8, 16, 1
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
index f63068d74..a4599f14a 100644
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
@@ -128,14 +128,14 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
 	compare RESULT, 0
 	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
 	setflag 236
-	closebutton
+	closemessage
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783
 	call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4
-	closebutton
+	closemessage
 	releaseall
 	end
 
@@ -198,34 +198,34 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817
 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
 	fadescreen 1
-	showcontestwinner 9
+	drawcontestwinner 9
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
 	fadescreen 1
-	showcontestwinner 10
+	drawcontestwinner 10
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
 	fadescreen 1
-	showcontestwinner 11
+	drawcontestwinner 11
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
 	fadescreen 1
-	showcontestwinner 12
+	drawcontestwinner 12
 	releaseall
 	end
 
 LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
 	fadescreen 1
-	showcontestwinner 13
+	drawcontestwinner 13
 	releaseall
 	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
index b398076fa..20b5c5f13 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D
 LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331
 	setvar 0x800b, 1
 	call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
index 4d6401502..13217b340 100644
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
@@ -104,35 +104,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
 	end
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5
-	movespriteperm 1, 7, 5
+	setobjectxyperm 1, 7, 5
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD
-	movespriteperm 3, 3, 4
+	setobjectxyperm 3, 3, 4
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5
-	movespriteperm 4, 7, 2
+	setobjectxyperm 4, 7, 2
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED
-	movespriteperm 5, 5, 5
+	setobjectxyperm 5, 5, 5
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5
-	movespriteperm 6, 5, 2
+	setobjectxyperm 6, 5, 2
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD
-	movespriteperm 2, 8, 4
+	setobjectxyperm 2, 8, 4
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505
-	movespriteperm 7, 3, 3
+	setobjectxyperm 7, 3, 3
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D
-	movespriteperm 8, 8, 3
+	setobjectxyperm 8, 8, 3
 	return
 
 LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
index 06508fd02..095862fd6 100644
--- a/data/scripts/maps/LittlerootTown.inc
+++ b/data/scripts/maps/LittlerootTown.inc
@@ -36,24 +36,24 @@ LittlerootTown_EventScript_14D570:: @ 814D570
 	return
 
 LittlerootTown_EventScript_14D57B:: @ 814D57B
-	movespriteperm 4, 14, 8
+	setobjectxyperm 4, 14, 8
 	return
 
 LittlerootTown_EventScript_14D583:: @ 814D583
 	compare 0x4050, 0
 	goto_if_eq LittlerootTown_EventScript_14D59A
-	movespriteperm 1, 10, 1
-	spritebehave 1, 7
+	setobjectxyperm 1, 10, 1
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_EventScript_14D59A:: @ 814D59A
-	movespriteperm 1, 7, 2
-	spritebehave 1, 8
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 8
 	return
 
 LittlerootTown_EventScript_14D5A6:: @ 814D5A6
 	clearflag 752
-	spritebehave 4, 8
+	setobjectmovementtype 4, 8
 	checkgender
 	compare RESULT, 0
 	call_if 1, LittlerootTown_EventScript_14D5C5
@@ -62,11 +62,11 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6
 	return
 
 LittlerootTown_EventScript_14D5C5:: @ 814D5C5
-	movespriteperm 4, 5, 9
+	setobjectxyperm 4, 5, 9
 	return
 
 LittlerootTown_EventScript_14D5CD:: @ 814D5CD
-	movespriteperm 4, 14, 9
+	setobjectxyperm 4, 14, 9
 	return
 
 LittlerootTown_MapScript2_14D5D5:: @ 814D5D5
@@ -113,7 +113,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B
 	applymovement 4, LittlerootTown_Movement_14D6AE
 	waitmovement 0
 	msgbox LittlerootTown_Text_16A7C9, 4
-	closebutton
+	closemessage
 	applymovement 4, LittlerootTown_Movement_14D6B1
 	applymovement 255, LittlerootTown_Movement_14D6B8
 	waitmovement 0
@@ -199,7 +199,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF
 
 LittlerootTown_EventScript_14D708:: @ 814D708
 	msgbox LittlerootTown_Text_16AD82, 4
-	closebutton
+	closemessage
 	applymovement 1, LittlerootTown_Movement_1A083D
 	waitmovement 0
 	setvar 0x4050, 2
@@ -229,12 +229,12 @@ LittlerootTown_EventScript_14D739:: @ 814D739
 
 LittlerootTown_EventScript_14D755:: @ 814D755
 	msgbox LittlerootTown_Text_16ACEB, 4
-	closebutton
+	closemessage
 	applymovement 1, LittlerootTown_Movement_14D787
 	applymovement 255, LittlerootTown_Movement_14D793
 	waitmovement 0
 	msgbox LittlerootTown_Text_16AD3C, 4
-	closebutton
+	closemessage
 	return
 
 LittlerootTown_Movement_14D779:: @ 814D779
@@ -316,7 +316,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7
 	applymovement 255, LittlerootTown_Movement_1A083F
 	waitmovement 0
 	msgbox LittlerootTown_Text_16AD82, 4
-	closebutton
+	closemessage
 	applymovement 1, LittlerootTown_Movement_1A083D
 	waitmovement 0
 	setvar 0x4050, 2
@@ -417,7 +417,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6
 	compare RESULT, 1
 	call_if 1, LittlerootTown_EventScript_14D931
 	msgbox LittlerootTown_Text_16A8EE, 4
-	closebutton
+	closemessage
 	checkgender
 	compare RESULT, 0
 	call_if 1, LittlerootTown_EventScript_14D952
@@ -871,10 +871,10 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38
 	playfanfare 370
 	message LittlerootTown_Text_16AA32
 	waitfanfare
-	waittext
+	waitmessage
 	setflag 274
 	msgbox LittlerootTown_Text_16AA5C, 4
 	msgbox LittlerootTown_Text_16AB10, 4
-	closebutton
+	closemessage
 	delay 30
 	return
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
index e878d7e2e..30b2d6eef 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
@@ -36,18 +36,18 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC
-	movespriteperm 1, 8, 4
-	spritebehave 1, 7
+	setobjectxyperm 1, 8, 4
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8
-	movespriteperm 1, 4, 5
-	spritebehave 1, 7
+	setobjectxyperm 1, 4, 5
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4
-	movespriteperm 1, 9, 8
-	spritebehave 1, 7
+	setobjectxyperm 1, 9, 8
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0
@@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0
 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
 	lockall
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4
-	closebutton
+	closemessage
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720
 	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720
 	waitmovement 0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
index 3b39fe2ed..1f4b301c0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
@@ -13,8 +13,8 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF
 	end
 
 LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE
-	movespriteperm 1, 1, 2
-	spritebehave 1, 7
+	setobjectxyperm 1, 1, 2
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
index 9b5a372fa..45eb481e4 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
@@ -36,18 +36,18 @@ LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8
 	end
 
 LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA
-	movespriteperm 1, 2, 4
-	spritebehave 1, 7
+	setobjectxyperm 1, 2, 4
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6
-	movespriteperm 1, 6, 5
-	spritebehave 1, 7
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902
-	movespriteperm 1, 1, 8
-	spritebehave 1, 7
+	setobjectxyperm 1, 1, 8
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E
@@ -61,7 +61,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E
 LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
 	lockall
 	msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4
-	closebutton
+	closemessage
 	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E
 	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E
 	waitmovement 0
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
index 84fb4e69b..b35ee81a9 100644
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
@@ -13,8 +13,8 @@ LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
 	end
 
 LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
-	movespriteperm 1, 7, 2
-	spritebehave 1, 7
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 7
 	return
 
 LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
@@ -56,7 +56,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
 	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
-	closebutton
+	closemessage
 	compare FACING, 4
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29
 	compare FACING, 2
@@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
 	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
-	closebutton
+	closemessage
 	compare FACING, 4
 	call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F
 	compare FACING, 2
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
index 7e3386d7a..7c6886209 100644
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
@@ -26,7 +26,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
 	lockall
 	bufferfirstpoke 0
 	message LittlerootTown_ProfessorBirchsLab_Text_173D94
-	waittext
+	waitmessage
 	playfanfare 370
 	waitfanfare
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5
@@ -158,7 +158,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
 	playfanfare 370
 	message LittlerootTown_ProfessorBirchsLab_Text_17422F
 	waitfanfare
-	waittext
+	waitmessage
 	setflag 2049
 	return
 
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
index da406e2f7..5c93aa252 100644
--- a/data/scripts/maps/MauvilleCity.inc
+++ b/data/scripts/maps/MauvilleCity.inc
@@ -70,7 +70,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 	checkflag 284
 	goto_if_eq MauvilleCity_EventScript_14C0E4
 	msgbox MauvilleCity_Text_165B76, 4
-	closebutton
+	closemessage
 	applymovement 7, MauvilleCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -78,7 +78,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4
 
 MauvilleCity_EventScript_14C0E4:: @ 814C0E4
 	msgbox MauvilleCity_Text_165E45, 4
-	closebutton
+	closemessage
 	applymovement 7, MauvilleCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -109,7 +109,7 @@ MauvilleCity_EventScript_14C154:: @ 814C154
 	call_if 1, MauvilleCity_EventScript_14C23C
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_EventScript_14C285
-	closebutton
+	closemessage
 	switch FACING
 	case 2, MauvilleCity_EventScript_14C187
 	case 4, MauvilleCity_EventScript_14C1D9
@@ -127,7 +127,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187
 	applymovement 255, MauvilleCity_Movement_1A0845
 	waitmovement 0
 	msgbox MauvilleCity_Text_1660FA, 4
-	closebutton
+	closemessage
 	applymovement 6, MauvilleCity_Movement_14C2B6
 	applymovement 7, MauvilleCity_Movement_14C2DF
 	waitmovement 0
@@ -146,7 +146,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9
 	applymovement 255, MauvilleCity_Movement_1A0845
 	waitmovement 0
 	msgbox MauvilleCity_Text_1660FA, 4
-	closebutton
+	closemessage
 	applymovement 6, MauvilleCity_Movement_14C2C1
 	applymovement 7, MauvilleCity_Movement_14C2E8
 	waitmovement 0
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc
index 0b577885e..8c0ce9590 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/scripts/maps/MauvilleCity_BikeShop.inc
@@ -26,7 +26,7 @@ MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1
 
 MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0
 	message MauvilleCity_BikeShop_Text_1810B1
-	waittext
+	waitmessage
 	multichoice 21, 8, 12, 1
 	switch RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_15682D
@@ -109,7 +109,7 @@ MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B
 
 MauvilleCity_BikeShop_EventScript_156914:: @ 8156914
 	message MauvilleCity_BikeShop_Text_1815EA
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156920
 	end
 
@@ -125,19 +125,19 @@ MauvilleCity_BikeShop_EventScript_156920:: @ 8156920
 
 MauvilleCity_BikeShop_EventScript_156962:: @ 8156962
 	message MauvilleCity_BikeShop_Text_18162C
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156920
 	end
 
 MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E
 	message MauvilleCity_BikeShop_Text_1816F5
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156920
 	end
 
 MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A
 	message MauvilleCity_BikeShop_Text_1817BF
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156920
 	end
 
@@ -147,7 +147,7 @@ MauvilleCity_BikeShop_EventScript_156986:: @ 8156986
 
 MauvilleCity_BikeShop_EventScript_156988:: @ 8156988
 	message MauvilleCity_BikeShop_Text_181892
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156994
 	end
 
@@ -163,19 +163,19 @@ MauvilleCity_BikeShop_EventScript_156994:: @ 8156994
 
 MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6
 	message MauvilleCity_BikeShop_Text_1818D4
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156994
 	end
 
 MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2
 	message MauvilleCity_BikeShop_Text_18199A
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156994
 	end
 
 MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE
 	message MauvilleCity_BikeShop_Text_181A3D
-	waittext
+	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_156994
 	end
 
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index 6e9b11947..6952ca4e1 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -9,14 +9,14 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34
 	compare RESULT, 0
 	goto_if_eq MauvilleCity_GameCorner_EventScript_156B32
 	message MauvilleCity_GameCorner_Text_181CB4
-	waittext
+	waitmessage
 	showmoney 0, 0
 	nop
 	showcoins 0, 5
 	goto MauvilleCity_GameCorner_EventScript_156A60
 
 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60
-	multichoicedef 15, 0, 49, 0, 0
+	multichoicedefault 15, 0, 49, 0, 0
 	switch RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_156AAE
 	case 1, MauvilleCity_GameCorner_EventScript_156AF0
@@ -24,7 +24,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60
 	end
 
 @ 8156A87
-	multichoicedef 15, 0, 49, 1, 0
+	multichoicedefault 15, 0, 49, 1, 0
 	switch RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_156AAE
 	case 1, MauvilleCity_GameCorner_EventScript_156AF0
@@ -107,14 +107,14 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C
 
 MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88
 	message MauvilleCity_GameCorner_Text_181E17
-	waittext
+	waitmessage
 	showcoins 0, 0
 	setvar 0x4001, 0
 	goto MauvilleCity_GameCorner_EventScript_156BA6
 
 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B
 	message MauvilleCity_GameCorner_Text_181E17
-	waittext
+	waitmessage
 	goto MauvilleCity_GameCorner_EventScript_156BA6
 
 MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6
@@ -228,14 +228,14 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A
 
 MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36
 	message MauvilleCity_GameCorner_Text_181E17
-	waittext
+	waitmessage
 	showcoins 0, 0
 	setvar 0x4001, 0
 	goto MauvilleCity_GameCorner_EventScript_156D54
 
 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49
 	message MauvilleCity_GameCorner_Text_181E17
-	waittext
+	waitmessage
 	goto MauvilleCity_GameCorner_EventScript_156D54
 
 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54
@@ -499,7 +499,7 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8
 	end
 
 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc
index e5791d521..5221add7a 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/scripts/maps/MauvilleCity_Gym.inc
@@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB
 
 MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB
 	message MauvilleCity_Gym_Text_180DAF
-	waittext
+	waitmessage
 	call MauvilleCity_Gym_EventScript_1A02C5
 	msgbox MauvilleCity_Gym_Text_180DDA, 4
 	setflag 1208
diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/scripts/maps/MauvilleCity_Mart.inc
index fac5906ad..0dd66eddf 100644
--- a/data/scripts/maps/MauvilleCity_Mart.inc
+++ b/data/scripts/maps/MauvilleCity_Mart.inc
@@ -5,7 +5,7 @@ MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE
 	lock
 	faceplayer
 	message MauvilleCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart MauvilleCity_Mart_Items
 	msgbox MauvilleCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
index 0e9ba15ef..7122b8c3c 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
@@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365
 MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369
 	setvar 0x800b, 1
 	call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
index c7aa8fb10..06abbc8f6 100644
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ b/data/scripts/maps/MeteorFalls_1F_1R.inc
@@ -14,7 +14,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 5, MeteorFalls_1F_1R_Movement_1A0845
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_193237, 4
-	closebutton
+	closemessage
 	applymovement 5, MeteorFalls_1F_1R_Movement_1A0841
 	applymovement 6, MeteorFalls_1F_1R_Movement_1A0841
 	waitmovement 0
@@ -24,11 +24,11 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 5, MeteorFalls_1F_1R_Movement_1A0835
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_193268, 4
-	closebutton
+	closemessage
 	applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_1932C5, 4
-	closebutton
+	closemessage
 	applymovement 255, MeteorFalls_1F_1R_Movement_1A083F
 	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
 	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
@@ -44,7 +44,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_193320, 4
-	closebutton
+	closemessage
 	applymovement 255, MeteorFalls_1F_1R_Movement_15C64F
 	applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1
 	applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC
@@ -58,7 +58,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	.else
 	msgbox MeteorFalls_1F_1R_Text_193584, 4
 	.endif
-	closebutton
+	closemessage
 	applymovement 8, MeteorFalls_1F_1R_Movement_15C639
 	applymovement 9, MeteorFalls_1F_1R_Movement_15C64A
 	waitmovement 0
@@ -69,7 +69,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
 	applymovement 7, MeteorFalls_1F_1R_Movement_1A083F
 	waitmovement 0
 	msgbox MeteorFalls_1F_1R_Text_1937AA, 4
-	closebutton
+	closemessage
 	applymovement 7, MeteorFalls_1F_1R_Movement_15C61F
 	applymovement 8, MeteorFalls_1F_1R_Movement_15C62E
 	applymovement 9, MeteorFalls_1F_1R_Movement_15C63E
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
index 7861d0c4d..66ad747f9 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
@@ -25,13 +25,13 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
 
 MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E
 	setvar 0x4001, 1
-	movespriteperm 1, 3, 2
-	spritebehave 1, 8
+	setobjectxyperm 1, 3, 2
+	setobjectmovementtype 1, 8
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF
-	movespriteperm 1, 2, 2
-	spritebehave 1, 10
+	setobjectxyperm 1, 2, 2
+	setobjectmovementtype 1, 10
 	return
 
 MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB
@@ -46,7 +46,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
 	waitmovement 0
 	applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F
 	waitmovement 0
-	moveoffscreen 1
+	moveobjectoffscreen 1
 	applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841
 	waitmovement 0
 	compare 0x40c0, 1
@@ -106,11 +106,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
 	call S_DoSaveDialog
 	compare RESULT, 0
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
-	hidebox 0, 0, 15, 10
+	erasebox 0, 0, 15, 10
 	special SavePlayerParty
 	special ReducePlayerPartyToThree
 	msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04
 	compare FACING, 4
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
index 46b9dcfea..886c64d29 100644
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
@@ -17,7 +17,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	waitmovement 0
 	special sub_81360C0
 	msgbox 0x20234cc, 4
-	closebutton
+	closemessage
 	setvar 0x8004, 2
 	setvar 0x8005, 0
 	special sub_813556C
@@ -28,7 +28,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
 	call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3
 	compare RESULT, 2
 	call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE
-	closebutton
+	closemessage
 	special ScrSpecial_HealPlayerParty
 	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
 	waitmovement 0
@@ -47,14 +47,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5
 MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
 	setvar 0x40c0, 1
 	special ShowFieldMessageStringVar4
-	waittext
+	waitmessage
 	waitbutton
 	return
 
 MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
 	setvar 0x40c0, 2
 	special ShowFieldMessageStringVar4
-	waittext
+	waitmessage
 	waitbutton
 	return
 
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
index 4365ba74a..944860f2d 100644
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ b/data/scripts/maps/MossdeepCity_Gym.inc
@@ -58,7 +58,7 @@ MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
 
 MossdeepCity_Gym_EventScript_15A594:: @ 815A594
 	message MossdeepCity_Gym_Text_18D0F9
-	waittext
+	waitmessage
 	call MossdeepCity_Gym_EventScript_1A02C5
 	msgbox MossdeepCity_Gym_Text_18D128, 4
 	setflag 1229
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
index c34eb9391..b1954a6cf 100644
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ b/data/scripts/maps/MossdeepCity_House2.inc
@@ -16,7 +16,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
 	pokecry SPECIES_WINGULL, 0
 	msgbox MossdeepCity_House2_Text_18D61E, 4
 	waitpokecry
-	closebutton
+	closemessage
 	setflag 224
 	clearflag 933
 	compare FACING, 2
diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/scripts/maps/MossdeepCity_Mart.inc
index d1e861b99..ce5845c81 100644
--- a/data/scripts/maps/MossdeepCity_Mart.inc
+++ b/data/scripts/maps/MossdeepCity_Mart.inc
@@ -5,7 +5,7 @@ MossdeepCity_Mart_EventScript_15A926:: @ 815A926
 	lock
 	faceplayer
 	message MossdeepCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart MossdeepCity_Mart_Items
 	msgbox MossdeepCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
index 988608ffd..4ed3ea57e 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6
 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA
 	setvar 0x800b, 1
 	call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
index a407bd5b9..acd499966 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
@@ -11,7 +11,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B
 	call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA
 	compare RESULT, 1
 	call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D
 	waitmovement 0
 	release
@@ -56,7 +56,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
index 8648487c9..6905b31b3 100644
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc
@@ -19,8 +19,8 @@ MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
 	end
 
 MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
-	movespriteperm 1, 6, 5
-	spritebehave 1, 7
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
 	return
 
 MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
@@ -43,7 +43,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
 	setflag 123
 	setflag 302
 	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
-	closebutton
+	closemessage
 	delay 20
 	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
 	waitmovement 0
@@ -82,8 +82,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
 	playfanfare 370
 	message MossdeepCity_StevensHouse_Text_18DD61
 	waitfanfare
-	waittext
-	givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	waitmessage
+	givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
 	bufferpoke 1, SPECIES_BELDUM
 	msgbox MossdeepCity_StevensHouse_Text_1A1102, 5
 	compare RESULT, 1
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
index 8a66f75ee..2b4de8344 100644
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ b/data/scripts/maps/MtChimney_CableCarStation.inc
@@ -9,8 +9,8 @@ MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105
 	end
 
 MtChimney_CableCarStation_EventScript_15C111:: @ 815C111
-	movespriteperm 1, 5, 4
-	spritebehave 1, 10
+	setobjectxyperm 1, 5, 4
+	setobjectmovementtype 1, 10
 	return
 
 MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D
@@ -23,8 +23,8 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127
 	applymovement 1, MtChimney_CableCarStation_Movement_15C1AA
 	waitmovement 0
 	setvar 0x40a3, 0
-	movespriteperm 1, 6, 7
-	spritebehave 1, 8
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
 	releaseall
 	end
 
@@ -40,7 +40,7 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B
 
 MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
 	msgbox MtChimney_CableCarStation_Text_1925A9, 4
-	closebutton
+	closemessage
 	applymovement 1, MtChimney_CableCarStation_Movement_15C1A5
 	applymovement 255, MtChimney_CableCarStation_Movement_15C1AF
 	waitmovement 0
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
index 8720375ae..533fb6e90 100644
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ b/data/scripts/maps/MtPyre_Summit.inc
@@ -41,7 +41,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
 	.else
 	msgbox MtPyre_Summit_Text_1B5EEC, 4
 	.endif
-	closebutton
+	closemessage
 	fadescreen 1
 	removeobject 2
 	removeobject 4
@@ -198,7 +198,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A
 MtPyre_Summit_EventScript_15D669:: @ 815D669
 	setvar 0x8004, ITEM_RED_OR_BLUE_ORB
 	call MtPyre_Summit_EventScript_1A067F
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841
 	waitmovement 0
 	delay 40
@@ -279,7 +279,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
 	.else
 	msgbox MtPyre_Summit_Text_1B6848, 4
 	.endif
-	closebutton
+	closemessage
 	compare 0x8008, 0
 	call_if 1, MtPyre_Summit_EventScript_15D77F
 	compare 0x8008, 1
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
index 412261ce1..2d84a6f92 100644
--- a/data/scripts/maps/OldaleTown.inc
+++ b/data/scripts/maps/OldaleTown.inc
@@ -18,13 +18,13 @@ OldaleTown_EventScript_14DD8C:: @ 814DD8C
 	return
 
 OldaleTown_EventScript_14DD92:: @ 814DD92
-	movespriteperm 3, 1, 11
-	spritebehave 3, 9
+	setobjectxyperm 3, 1, 11
+	setobjectmovementtype 3, 9
 	return
 
 OldaleTown_EventScript_14DD9E:: @ 814DD9E
-	movespriteperm 2, 13, 14
-	spritebehave 2, 8
+	setobjectxyperm 2, 13, 14
+	setobjectmovementtype 2, 8
 	return
 
 OldaleTown_EventScript_14DDAA:: @ 814DDAA
@@ -45,7 +45,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC
 	setflag 1
 	playbgm 420, 0
 	msgbox OldaleTown_Text_16AEF2, 4
-	closebutton
+	closemessage
 	switch FACING
 	case 1, OldaleTown_EventScript_14DE07
 	case 2, OldaleTown_EventScript_14DE1E
@@ -198,7 +198,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF
 	checkflag 116
 	goto_if_eq OldaleTown_EventScript_14DF26
 	msgbox OldaleTown_Text_16B0CC, 4
-	closebutton
+	closemessage
 	applymovement 3, OldaleTown_Movement_1A083D
 	waitmovement 0
 	release
@@ -210,7 +210,7 @@ OldaleTown_EventScript_14DEFF:: @ 814DEFF
 	applymovement 3, OldaleTown_Movement_14DFEF
 	waitmovement 0
 	msgbox OldaleTown_Text_16B045, 4
-	closebutton
+	closemessage
 	applymovement 3, OldaleTown_Movement_14DFF5
 	waitmovement 0
 	releaseall
@@ -274,7 +274,7 @@ OldaleTown_EventScript_14DFB8:: @ 814DFB8
 	end
 
 OldaleTown_EventScript_14DFC6:: @ 814DFC6
-	closebutton
+	closemessage
 	applymovement 4, OldaleTown_Movement_14DFE5
 	waitmovement 0
 	removeobject 4
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc
index 77d7eee4d..b9698b58f 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/scripts/maps/OldaleTown_Mart.inc
@@ -5,7 +5,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79
 	lock
 	faceplayer
 	message OldaleTown_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	checkflag 116
 	goto_if_eq OldaleTown_Mart_EventScript_152FA8
 	pokemart OldaleTown_Mart_Items1
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
index 6d2fe54f0..494f109fe 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E
 OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17
 	setvar 0x800b, 1
 	call OldaleTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
index 973f80a55..64dd5008c 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
 @ 8154109
 	setvar 0x800b, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
index 8b7d4f313..1c2711b83 100644
--- a/data/scripts/maps/PetalburgCity.inc
+++ b/data/scripts/maps/PetalburgCity.inc
@@ -12,7 +12,7 @@ PetalburgCity_MapScript1_14B717:: @ 814B717
 	end
 
 PetalburgCity_EventScript_14B731:: @ 814B731
-	movespriteperm 9, 5, 11
+	setobjectxyperm 9, 5, 11
 	return
 
 PetalburgCity_EventScript_14B739:: @ 814B739
@@ -38,7 +38,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747
 	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
 	waitmovement 0, 0, 2
 	msgbox PetalburgCity_Text_16D408, 4
-	closebutton
+	closemessage
 	clearflag 0x4000
 	setvar 0x4057, 3
 	fadedefaultbgm
@@ -54,7 +54,7 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC
 	lock
 	faceplayer
 	msgbox PetalburgCity_Text_164490, 4
-	closebutton
+	closemessage
 	applymovement 3, PetalburgCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -196,7 +196,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 	compare 0x8008, 3
 	call_if 1, PetalburgCity_EventScript_14B950
 	msgbox PetalburgCity_Text_16438A, 4
-	closebutton
+	closemessage
 	compare 0x8008, 0
 	call_if 1, PetalburgCity_EventScript_14B965
 	compare 0x8008, 1
@@ -210,7 +210,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866
 	applymovement 255, PetalburgCity_Movement_1A0843
 	waitmovement 0
 	msgbox PetalburgCity_Text_164449, 4
-	closebutton
+	closemessage
 	applymovement 9, PetalburgCity_Movement_14B9F4
 	waitmovement 0
 	fadedefaultbgm
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
index 3ac7b85fc..b2d104894 100644
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ b/data/scripts/maps/PetalburgCity_Gym.inc
@@ -53,15 +53,15 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
 	end
 
 PetalburgCity_Gym_EventScript_15453B:: @ 815453B
-	movespriteperm 10, 5, 108
+	setobjectxyperm 10, 5, 108
 	return
 
 PetalburgCity_Gym_EventScript_154543:: @ 8154543
-	movespriteperm 1, 4, 107
+	setobjectxyperm 1, 4, 107
 	return
 
 PetalburgCity_Gym_EventScript_15454B:: @ 815454B
-	movespriteperm 1, 4, 107
+	setobjectxyperm 1, 4, 107
 	return
 
 PetalburgCity_Gym_MapScript2_154553:: @ 8154553
@@ -80,7 +80,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C
 	lockall
 	msgbox PetalburgCity_Gym_Text_17A196, 4
 	msgbox PetalburgCity_Gym_Text_17A1B0, 4
-	closebutton
+	closemessage
 	applymovement 255, PetalburgCity_Gym_Movement_1A0845
 	applymovement 10, PetalburgCity_Gym_Movement_1545B4
 	waitmovement 0
@@ -113,7 +113,7 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
 	case 6, PetalburgCity_Gym_EventScript_1549D6
 	case 7, PetalburgCity_Gym_EventScript_15493D
 	msgbox PetalburgCity_Gym_Text_179DF6, 4
-	closebutton
+	closemessage
 	switch FACING
 	case 1, PetalburgCity_Gym_EventScript_15463D
 	case 2, PetalburgCity_Gym_EventScript_154648
@@ -193,7 +193,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669
 	compare 0x8008, 3
 	call_if 1, PetalburgCity_Gym_EventScript_1548F1
 	msgbox PetalburgCity_Gym_Text_17A171, 4
-	closebutton
+	closemessage
 	setflag 0x4001
 	playbgm 420, 0
 	compare 0x8008, 0
@@ -394,7 +394,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
 	msgbox PetalburgCity_Gym_Text_17A653, 4
 	trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
 	message PetalburgCity_Gym_Text_17A7DD
-	waittext
+	waitmessage
 	call PetalburgCity_Gym_EventScript_1A02C5
 	msgbox PetalburgCity_Gym_Text_17A805, 4
 	setflag 1217
@@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
 	setflag 169
 	msgbox PetalburgCity_Gym_Text_17A8CF, 4
 	msgbox PetalburgCity_Gym_Text_17A976, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	call_if 1, PetalburgCity_Gym_EventScript_154ABC
 	compare FACING, 1
@@ -604,7 +604,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
 	end
 
 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8
-	closebutton
+	closemessage
 	delay 30
 	warpdoor PetalburgCity_Gym, 255, 32776, 32777
 	waitstate
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc
index ab7bb822a..e4186eaae 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/scripts/maps/PetalburgCity_Mart.inc
@@ -5,7 +5,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0
 	lock
 	faceplayer
 	message PetalburgCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	checkflag 296
 	goto_if_eq PetalburgCity_Mart_EventScript_1552EA
 	pokemart PetalburgCity_Mart_Items1
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
index a70035fef..e2013a1d6 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A
 PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213
 	setvar 0x800b, 1
 	call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
index 4dececafa..0b0c72f70 100644
--- a/data/scripts/maps/PetalburgWoods.inc
+++ b/data/scripts/maps/PetalburgWoods.inc
@@ -12,18 +12,18 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
 	applymovement 4, PetalburgWoods_Movement_15CE89
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194D92, 4
-	closebutton
+	closemessage
 	playbgm BGM_EVIL_TEAM, 0
 	applymovement 3, PetalburgWoods_Movement_15CEC3
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194DED, 4
-	closebutton
+	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEB0
 	waitmovement 0
 	applymovement 4, PetalburgWoods_Movement_1A0841
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194E6B, 4
-	closebutton
+	closemessage
 	applymovement 4, PetalburgWoods_Movement_15CE9E
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194E9A, 4
@@ -47,18 +47,18 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42
 	applymovement 255, PetalburgWoods_Movement_1A083F
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194D92, 4
-	closebutton
+	closemessage
 	playbgm BGM_EVIL_TEAM, 0
 	applymovement 3, PetalburgWoods_Movement_15CEC3
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194DED, 4
-	closebutton
+	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEBF
 	waitmovement 0
 	applymovement 4, PetalburgWoods_Movement_1A0841
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194E6B, 4
-	closebutton
+	closemessage
 	applymovement 4, PetalburgWoods_Movement_15CEA4
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194E9A, 4
@@ -78,12 +78,12 @@ PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
 	applymovement 4, PetalburgWoods_Movement_15CE73
 	waitmovement 0
 	msgbox PetalburgWoods_Text_194D71, 4
-	closebutton
+	closemessage
 	return
 
 PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
 	msgbox PetalburgWoods_Text_194FA4, 4
-	closebutton
+	closemessage
 	applymovement 3, PetalburgWoods_Movement_15CEB7
 	waitmovement 0
 	removeobject 3
@@ -106,7 +106,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
 	applymovement 4, PetalburgWoods_Movement_15CEA8
 	waitmovement 0
 	msgbox PetalburgWoods_Text_195153, 4
-	closebutton
+	closemessage
 	return
 
 PetalburgWoods_EventScript_15CE69:: @ 815CE69
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
index 35c2d4117..2fe80e098 100644
--- a/data/scripts/maps/Route101.inc
+++ b/data/scripts/maps/Route101.inc
@@ -20,7 +20,7 @@ Route101_EventScript_14E948:: @ 814E948
 	lockall
 	playbgm 410, 1
 	msgbox Route101_Text_16D10E, 4
-	closebutton
+	closemessage
 	setobjectxy 2, 0, 15
 	setobjectxy 4, 0, 16
 	applymovement 255, Route101_Movement_14EA2C
@@ -36,7 +36,7 @@ Route101_EventScript_14E948:: @ 814E948
 	applymovement 2, Route101_Movement_14EA58
 	waitmovement 0
 	msgbox Route101_Text_16D119, 4
-	closebutton
+	closemessage
 	setvar 0x4060, 2
 	releaseall
 	end
@@ -44,7 +44,7 @@ Route101_EventScript_14E948:: @ 814E948
 Route101_EventScript_14E9B8:: @ 814E9B8
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
+	closemessage
 	applymovement 255, Route101_Movement_14E9FA
 	waitmovement 0
 	releaseall
@@ -53,7 +53,7 @@ Route101_EventScript_14E9B8:: @ 814E9B8
 Route101_EventScript_14E9CE:: @ 814E9CE
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
+	closemessage
 	applymovement 255, Route101_Movement_14E9FC
 	waitmovement 0
 	releaseall
@@ -62,7 +62,7 @@ Route101_EventScript_14E9CE:: @ 814E9CE
 Route101_EventScript_14E9E4:: @ 814E9E4
 	lockall
 	msgbox Route101_Text_16D15E, 4
-	closebutton
+	closemessage
 	applymovement 255, Route101_Movement_14E9FE
 	waitmovement 0
 	releaseall
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
index e5cf156a1..c9ebf9511 100644
--- a/data/scripts/maps/Route103.inc
+++ b/data/scripts/maps/Route103.inc
@@ -89,7 +89,7 @@ Route103_EventScript_14ECCB:: @ 814ECCB
 	end
 
 Route103_EventScript_14ECD9:: @ 814ECD9
-	closebutton
+	closemessage
 	switch FACING
 	case 1, Route103_EventScript_14ED29
 	case 2, Route103_EventScript_14ED0C
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
index 8abb7354a..b1e3d94ac 100644
--- a/data/scripts/maps/Route104.inc
+++ b/data/scripts/maps/Route104.inc
@@ -142,7 +142,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	showobject 255, 0, 11
 	applymovement 255, Route104_Movement_14F168
 	waitmovement 0
-	movespriteperm 2, 12, 8
+	setobjectxyperm 2, 12, 8
 	addobject 2
 	spritelevelup 2, 0, 11, 0
 	clearflag 740
@@ -156,7 +156,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5
 	copyvar 0x4096, 0x8008
 	restorespritelevel 255, 0, 19
 	restorespritelevel 2, 0, 11
-	moveoffscreen 2
+	moveobjectoffscreen 2
 	setvar 0x408e, 0
 	checkflag 189
 	goto_if 0, Route104_EventScript_14F08B
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc
index cc3dad35a..d388d1c7a 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/scripts/maps/Route104_MrBrineysHouse.inc
@@ -15,10 +15,10 @@ Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0
 	return
 
 Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4
-	movespriteperm 1, 9, 3
-	spritebehave 1, 50
-	movespriteperm 2, 9, 6
-	spritebehave 2, 51
+	setobjectxyperm 1, 9, 3
+	setobjectmovementtype 1, 50
+	setobjectxyperm 2, 9, 6
+	setobjectmovementtype 2, 51
 	return
 
 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB
@@ -44,8 +44,8 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E
 
 Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32
 	message Route104_MrBrineysHouse_Text_191E80
-	waittext
-	multichoicedef 21, 8, 14, 1, 0
+	waitmessage
+	multichoicedefault 21, 8, 14, 1, 0
 	switch RESULT
 	case 0, Route104_MrBrineysHouse_EventScript_15BDAB
 	case 1, Route104_MrBrineysHouse_EventScript_15BDA1
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
index 876af8650..4c5becf88 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
@@ -12,7 +12,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03
-	movespriteperm 1, 4, 6
+	setobjectxyperm 1, 4, 6
 	end
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B
@@ -51,7 +51,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73
 
 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C
 	message Route104_PrettyPetalFlowerShop_Text_1A0C42
-	waittext
+	waitmessage
 	pokemartbp Route104_PrettyPetalFlowerShop_Items
 	msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc
index 6103d19ac..3c218747a 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/scripts/maps/Route104_Prototype.inc
@@ -56,7 +56,7 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1
 	end
 
 Route104_Prototype_EventScript_160CFB:: @ 8160CFB
-	closebutton
+	closemessage
 	delay 60
 	fadescreen 1
 	delay 60
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
index 7b13fef72..be296d403 100644
--- a/data/scripts/maps/Route109.inc
+++ b/data/scripts/maps/Route109.inc
@@ -44,7 +44,7 @@ Route109_EventScript_14F548:: @ 814F548
 	waitmovement 0
 	addobject 4
 	clearflag 743
-	movespriteperm 2, 12, 8
+	setobjectxyperm 2, 12, 8
 	addobject 2
 	spritelevelup 2, 0, 11, 0
 	applymovement 2, Route109_Movement_14F67D
@@ -53,11 +53,11 @@ Route109_EventScript_14F548:: @ 814F548
 	setflag 744
 	hideobject 1, 0, 24
 	msgbox Route109_Text_16B4B5, 4
-	closebutton
+	closemessage
 	copyvar 0x4096, 0x8008
 	restorespritelevel 255, 0, 24
 	restorespritelevel 2, 0, 11
-	moveoffscreen 2
+	moveobjectoffscreen 2
 	release
 	end
 
@@ -286,8 +286,8 @@ Route109_EventScript_14F691:: @ 814F691
 
 Route109_EventScript_14F6AF:: @ 814F6AF
 	message Route109_Text_16E26A
-	waittext
-	multichoicedef 21, 8, 14, 1, 0
+	waitmessage
+	multichoicedefault 21, 8, 14, 1, 0
 	switch RESULT
 	case 0, Route109_EventScript_14F6E2
 	case 1, Route109_EventScript_14F6FB
@@ -296,7 +296,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF
 
 Route109_EventScript_14F6E2:: @ 814F6E2
 	msgbox Route109_Text_16E159, 4
-	closebutton
+	closemessage
 	goto Route109_EventScript_14F4D3
 	end
 
@@ -318,7 +318,7 @@ Route109_EventScript_14F70E:: @ 814F70E
 	lock
 	faceplayer
 	msgbox Route109_Text_16E405, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route109_Movement_1A083D
 	waitmovement 0
 	release
@@ -334,7 +334,7 @@ Route109_EventScript_14F725:: @ 814F725
 	giveitem ITEM_SOFT_SAND
 	compare RESULT, 0
 	goto_if_eq Route109_EventScript_1A029B
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route109_Movement_1A083D
 	waitmovement 0
 	setflag 280
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
index 194816c36..afbfebcc2 100644
--- a/data/scripts/maps/Route110.inc
+++ b/data/scripts/maps/Route110.inc
@@ -424,15 +424,15 @@ Route110_EventScript_14FEA5:: @ 814FEA5
 	return
 
 Route110_EventScript_14FEB2:: @ 814FEB2
-	closebutton
+	closemessage
 	compare 0x8008, 1
 	call_if 1, Route110_EventScript_14FF56
 	compare 0x8008, 2
 	call_if 1, Route110_EventScript_14FF5E
 	compare 0x8008, 3
 	call_if 1, Route110_EventScript_14FF66
-	spritebehave 28, 10
-	spritebehave 29, 10
+	setobjectmovementtype 28, 10
+	setobjectmovementtype 29, 10
 	removeobject 28
 	addobject 29
 	delay 45
@@ -480,15 +480,15 @@ Route110_EventScript_14FF4B:: @ 814FF4B
 	return
 
 Route110_EventScript_14FF56:: @ 814FF56
-	movespriteperm 29, 33, 55
+	setobjectxyperm 29, 33, 55
 	return
 
 Route110_EventScript_14FF5E:: @ 814FF5E
-	movespriteperm 29, 34, 55
+	setobjectxyperm 29, 34, 55
 	return
 
 Route110_EventScript_14FF66:: @ 814FF66
-	movespriteperm 29, 35, 55
+	setobjectxyperm 29, 35, 55
 	return
 
 Route110_Movement_14FF6E:: @ 814FF6E
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
index a7db7e0ee..c60bc366e 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
@@ -41,7 +41,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D
 Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
 @ You don't have a bike!
 	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4
-	closebutton
+	closemessage
 	applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
 	waitmovement 0
 	releaseall
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
index 1cb046a99..cf18a8e36 100644
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
@@ -20,7 +20,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
 
 Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6
 	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4
-	closebutton
+	closemessage
 	applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB
 	waitmovement 0
 	releaseall
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
index 0445496d2..12309207c 100644
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ b/data/scripts/maps/Route110_TrickHouseEnd.inc
@@ -64,7 +64,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -77,7 +77,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -90,7 +90,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -103,7 +103,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -116,7 +116,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -129,7 +129,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
@@ -142,14 +142,14 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
 	compare RESULT, 0
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C4E
 	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closebutton
+	closemessage
 	call Route110_TrickHouseEnd_EventScript_161C2E
 	release
 	end
 
 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	msgbox Route110_TrickHouseEnd_Text_19C5AF, 4
-	closebutton
+	closemessage
 	compare FACING, 1
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C74
 	compare FACING, 2
@@ -160,7 +160,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
 	call_if 1, Route110_TrickHouseEnd_EventScript_161C95
 	delay 30
 	msgbox Route110_TrickHouseEnd_Text_19C602, 4
-	closebutton
+	closemessage
 	applymovement 1, Route110_TrickHouseEnd_Movement_1A0839
 	waitmovement 0
 	delay 30
@@ -234,7 +234,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
 	applymovement 255, Route110_TrickHouseEnd_Movement_1A0845
 	waitmovement 0
 	msgbox Route110_TrickHouseEnd_Text_19CA8B, 4
-	closebutton
+	closemessage
 	applymovement 255, Route110_TrickHouseEnd_Movement_161CE8
 	waitmovement 0
 	delay 4
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
index 677ce93fa..cf192345c 100644
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc
@@ -106,8 +106,8 @@ Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088
 	return
 
 Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E
-	movespriteperm 1, 5, 2
-	spritebehave 1, 4
+	setobjectxyperm 1, 5, 2
+	setobjectmovementtype 1, 4
 	end
 
 Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A
@@ -216,7 +216,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
 	compare 0x4044, 0
 	call_if 1, Route110_TrickHouseEntrance_EventScript_161327
 	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
-	closebutton
+	closemessage
 	delay 20
 	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
 	waitmovement 0
@@ -264,7 +264,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
 	call_if 1, Route110_TrickHouseEntrance_EventScript_161303
 	compare 0x4044, 7
 	call_if 1, Route110_TrickHouseEntrance_EventScript_16130C
-	closebutton
+	closemessage
 	setvar 0x40a6, 1
 	warp Route110_TrickHouseEntrance, 255, 6, 2
 	waitstate
@@ -333,7 +333,7 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
 
 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
 	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
-	closebutton
+	closemessage
 	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
 	waitmovement 0
 	playse 21
@@ -464,7 +464,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
 
 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
 	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
-	closebutton
+	closemessage
 	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
 	waitmovement 0
 	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
@@ -494,7 +494,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
 
 Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
 	msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5
-	closebutton
+	closemessage
 	compare RESULT, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD
 	releaseall
@@ -717,7 +717,7 @@ Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
 	playfanfare 370
 	message Route110_TrickHousePuzzle1_Text_19C1B8
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
 	releaseall
 	end
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
index dc3f9f725..222a71138 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
@@ -398,9 +398,9 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90
 	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F
 	msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4
 	waitmovement 0
-	closebutton
+	closemessage
 	msgbox Route110_TrickHousePuzzle5_Text_19D615, 4
-	closebutton
+	closemessage
 	warp Route110_TrickHousePuzzle5, 255, 0, 21
 	waitstate
 	releaseall
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
index de37c68fc..ec13ca3a3 100644
--- a/data/scripts/maps/Route111.inc
+++ b/data/scripts/maps/Route111.inc
@@ -55,7 +55,7 @@ Route111_EventScript_150023:: @ 8150023
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_15005F
 	giveitem ITEM_ROOT_FOSSIL
-	closebutton
+	closemessage
 	setflag 963
 	setflag 964
 	removeobject 34
@@ -77,7 +77,7 @@ Route111_EventScript_150069:: @ 8150069
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1500A5
 	giveitem ITEM_CLAW_FOSSIL
-	closebutton
+	closemessage
 	setflag 964
 	setflag 963
 	removeobject 35
@@ -172,7 +172,7 @@ Route111_EventScript_15013A:: @ 815013A
 
 Route111_EventScript_150151:: @ 8150151
 	msgbox Route111_Text_1A0F93, 4
-	closebutton
+	closemessage
 	compare 0x8004, 0
 	call_if 1, Route111_EventScript_150188
 	compare 0x8004, 1
@@ -251,7 +251,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_150348
 	msgbox Route111_Text_16F7FF, 4
-	closebutton
+	closemessage
 	applymovement 1, Route111_Movement_150356
 	waitmovement 0
 	removeobject 1
@@ -269,7 +269,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_150348
 	msgbox Route111_Text_16F8D5, 4
-	closebutton
+	closemessage
 	applymovement 2, Route111_Movement_150356
 	waitmovement 0
 	removeobject 2
@@ -287,7 +287,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	waitmovement 0
 	call Route111_EventScript_150348
 	msgbox Route111_Text_16F96C, 4
-	closebutton
+	closemessage
 	applymovement 3, Route111_Movement_150356
 	waitmovement 0
 	removeobject 3
@@ -302,7 +302,7 @@ Route111_EventScript_1501F3:: @ 81501F3
 	msgbox Route111_Text_16F991, 4
 	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
 	msgbox Route111_Text_16FA22, 4
-	closebutton
+	closemessage
 	applymovement 4, Route111_Movement_1A0841
 	waitmovement 0
 	call Route111_EventScript_150348
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc
index a33b436dc..5576a44ff 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/scripts/maps/Route111_OldLadysRestStop.inc
@@ -18,7 +18,7 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB
 
 Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC
 	msgbox Route111_OldLadysRestStop_Text_192423, 4
-	closebutton
+	closemessage
 	call Route111_OldLadysRestStop_EventScript_1A02CA
 	msgbox Route111_OldLadysRestStop_Text_19244D, 5
 	compare RESULT, 1
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
index ea70af41f..d9a94ce75 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
@@ -53,7 +53,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6
 	end
 
 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4
-	closebutton
+	closemessage
 	applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
index 5254b7beb..f8e91eb09 100644
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ b/data/scripts/maps/Route112_CableCarStation.inc
@@ -10,8 +10,8 @@ Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E
 	end
 
 Route112_CableCarStation_EventScript_15C052:: @ 815C052
-	movespriteperm 1, 7, 4
-	spritebehave 1, 9
+	setobjectxyperm 1, 7, 4
+	setobjectmovementtype 1, 9
 	return
 
 Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E
@@ -24,8 +24,8 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068
 	applymovement 1, Route112_CableCarStation_Movement_15C0EB
 	waitmovement 0
 	setvar 0x40a3, 0
-	movespriteperm 1, 6, 7
-	spritebehave 1, 8
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
 	releaseall
 	end
 
@@ -41,7 +41,7 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C
 
 Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
 	msgbox Route112_CableCarStation_Text_1925A9, 4
-	closebutton
+	closemessage
 	applymovement 1, Route112_CableCarStation_Movement_15C0E6
 	applymovement 255, Route112_CableCarStation_Movement_15C0F0
 	waitmovement 0
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc
index 48c2965fd..39b484c8a 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/scripts/maps/Route113_GlassWorkshop.inc
@@ -41,7 +41,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5
 	compare 0x4048, 250
 	goto_if 0, Route113_GlassWorkshop_EventScript_163818
 	message Route113_GlassWorkshop_Text_19E757
-	waittext
+	waitmessage
 	goto Route113_GlassWorkshop_EventScript_1635EE
 	end
 
@@ -183,19 +183,19 @@ Route113_GlassWorkshop_EventScript_163830:: @ 8163830
 	subvar 0x800a, 16456
 	buffernum 1, 32778
 	message Route113_GlassWorkshop_Text_19E890
-	waittext
+	waitmessage
 	goto Route113_GlassWorkshop_EventScript_1635EE
 	end
 
 Route113_GlassWorkshop_EventScript_163845:: @ 8163845
 	message Route113_GlassWorkshop_Text_19E802
-	waittext
+	waitmessage
 	goto Route113_GlassWorkshop_EventScript_1635EE
 	end
 
 Route113_GlassWorkshop_EventScript_163851:: @ 8163851
 	msgbox Route113_GlassWorkshop_Text_19E827, 4
-	closebutton
+	closemessage
 	fadescreen 1
 	playse 5
 	delay 30
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
index ca3895e1a..beb01e083 100644
--- a/data/scripts/maps/Route116.inc
+++ b/data/scripts/maps/Route116.inc
@@ -8,7 +8,7 @@ Route116_MapScript1_150A37:: @ 8150A37
 	end
 
 Route116_EventScript_150A41:: @ 8150A41
-	movespriteperm 21, 41, 10
+	setobjectxyperm 21, 41, 10
 	return
 
 Route116_EventScript_150A49:: @ 8150A49
@@ -47,7 +47,7 @@ Route116_EventScript_150A94:: @ 8150A94
 	compare RESULT, 0
 	goto_if_eq Route116_EventScript_150B12
 	msgbox Route116_Text_1707B8, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	call_if 1, Route116_EventScript_150AEE
 	compare FACING, 1
@@ -159,7 +159,7 @@ Route116_EventScript_150B8F:: @ 8150B8F
 
 Route116_EventScript_150BBB:: @ 8150BBB
 	msgbox Route116_Text_1709B7, 4
-	closebutton
+	closemessage
 	goto Route116_EventScript_150C03
 	end
 
@@ -175,7 +175,7 @@ Route116_EventScript_150BCA:: @ 8150BCA
 
 Route116_EventScript_150BF4:: @ 8150BF4
 	msgbox Route116_Text_17094D, 4
-	closebutton
+	closemessage
 	goto Route116_EventScript_150C03
 	end
 
diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc
index 6ba9519eb..40affd3fd 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/scripts/maps/Route117.inc
@@ -9,7 +9,7 @@ Route117_MapScript1_150D40:: @ 8150D40
 Route117_EventScript_150D46:: @ 8150D46
 	checkflag 134
 	goto_if 0, Route117_EventScript_150D56
-	movespriteperm 3, 47, 6
+	setobjectxyperm 3, 47, 6
 
 Route117_EventScript_150D56:: @ 8150D56
 	return
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
index 8427395a6..b96346f15 100644
--- a/data/scripts/maps/Route118.inc
+++ b/data/scripts/maps/Route118.inc
@@ -82,7 +82,7 @@ Route118_EventScript_151004:: @ 8151004
 	waitmovement 0
 	delay 30
 	msgbox Route118_Text_170D66, 4
-	closebutton
+	closemessage
 	compare 0x8008, 0
 	call_if 1, Route118_EventScript_151048
 	compare 0x8008, 1
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
index d825cb96e..7d5acea77 100644
--- a/data/scripts/maps/Route119.inc
+++ b/data/scripts/maps/Route119.inc
@@ -153,7 +153,7 @@ Route119_EventScript_151352:: @ 8151352
 	return
 
 Route119_EventScript_151362:: @ 8151362
-	closebutton
+	closemessage
 	compare 0x4001, 1
 	call_if 1, Route119_EventScript_1513D2
 	compare 0x4001, 2
@@ -193,13 +193,13 @@ Route119_EventScript_1513C7:: @ 81513C7
 	return
 
 Route119_EventScript_1513D2:: @ 81513D2
-	movespriteperm 16, 25, 32
-	movespriteperm 25, 25, 32
+	setobjectxyperm 16, 25, 32
+	setobjectxyperm 25, 25, 32
 	return
 
 Route119_EventScript_1513E1:: @ 81513E1
-	movespriteperm 16, 26, 32
-	movespriteperm 25, 26, 32
+	setobjectxyperm 16, 26, 32
+	setobjectxyperm 25, 26, 32
 	return
 
 Route119_Movement_1513F0:: @ 81513F0
@@ -354,7 +354,7 @@ Route119_EventScript_1515C5:: @ 81515C5
 	lock
 	faceplayer
 	msgbox Route119_Text_171520, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route119_Movement_1A083D
 	waitmovement 0
 	release
@@ -364,7 +364,7 @@ Route119_EventScript_1515DC:: @ 81515DC
 	lock
 	faceplayer
 	msgbox Route119_Text_17157C, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, Route119_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
index 762a6c299..3dc9672e3 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc
@@ -9,8 +9,8 @@ Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30
 	end
 
 Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41
-	movespriteperm 5, 0, 5
-	spritebehave 5, 10
+	setobjectxyperm 5, 0, 5
+	setobjectmovementtype 5, 10
 	return
 
 Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D
@@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A
 Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83
 	lockall
 	msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4
-	closebutton
+	closemessage
 	call Route119_WeatherInstitute_1F_EventScript_1A02CA
 	releaseall
 	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
index 37b6d07a9..ac64904a2 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
@@ -11,13 +11,13 @@ Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
 	end
 
 Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
-	movespriteperm 5, 1, 6
-	spritebehave 5, 10
+	setobjectxyperm 5, 1, 6
+	setobjectmovementtype 5, 10
 	return
 
 Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
-	movespriteperm 5, 4, 6
-	spritebehave 5, 10
+	setobjectxyperm 5, 4, 6
+	setobjectmovementtype 5, 10
 	return
 
 Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
@@ -37,7 +37,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
 
 Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
-	closebutton
+	closemessage
 	setvar 0x40b3, 1
 	clearflag 893
 	fadedefaultbgm
@@ -49,7 +49,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
 	fadescreen 0
 	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
 	waitmovement 0
-	moveoffscreen 5
+	moveobjectoffscreen 5
 	goto Route119_WeatherInstitute_2F_EventScript_163D7A
 	end
 
@@ -61,8 +61,8 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
 	playfanfare 370
 	message Route119_WeatherInstitute_2F_Text_19F267
 	waitfanfare
-	waittext
-	givepokemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	waitmessage
+	givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
 	setflag 151
 	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
 	release
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
index b6bb60ddd..d5807ae94 100644
--- a/data/scripts/maps/Route120.inc
+++ b/data/scripts/maps/Route120.inc
@@ -71,7 +71,7 @@ Route120_EventScript_1516B5:: @ 81516B5
 	return
 
 Route120_EventScript_1516DA:: @ 81516DA
-	spritebehave 36, 10
+	setobjectmovementtype 36, 10
 	return
 
 Route120_MapScript1_1516DF:: @ 81516DF
@@ -207,7 +207,7 @@ Route120_EventScript_151884:: @ 8151884
 
 Route120_EventScript_15189D:: @ 815189D
 	msgbox Route120_Text_1719A0, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	call_if 1, Route120_EventScript_15197F
 	compare FACING, 3
@@ -216,7 +216,7 @@ Route120_EventScript_15189D:: @ 815189D
 	waitmovement 0
 	delay 20
 	msgbox Route120_Text_1719D4, 4
-	closebutton
+	closemessage
 	applymovement 30, Route120_Movement_1A0843
 	waitmovement 0
 	applymovement 30, Route120_Movement_1A0662
@@ -241,7 +241,7 @@ Route120_EventScript_151908:: @ 8151908
 	giveitem ITEM_DEVON_SCOPE
 	setflag 285
 	msgbox Route120_Text_171B0E, 4
-	closebutton
+	closemessage
 	applymovement 31, Route120_Movement_1A0845
 	waitmovement 0
 	delay 50
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
index 43be91266..39443d2f9 100644
--- a/data/scripts/maps/Route121.inc
+++ b/data/scripts/maps/Route121.inc
@@ -21,7 +21,7 @@ Route121_EventScript_151B1C:: @ 8151B1C
 Route121_EventScript_151B25:: @ 8151B25
 	lockall
 	msgbox Route121_Text_171C8F, 4
-	closebutton
+	closemessage
 	applymovement 12, Route121_Movement_151B57
 	applymovement 13, Route121_Movement_151B60
 	applymovement 14, Route121_Movement_151B69
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index 5fdb749f3..c9439ee5f 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -74,9 +74,9 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
 	playfanfare 370
 	message Route121_SafariZoneEntrance_Text_1C3910
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
-	closebutton
+	closemessage
 	hidemoney 0, 0
 	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
 	waitmovement 0
@@ -111,7 +111,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
 	end
 
 Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
-	closebutton
+	closemessage
 	hidemoney 0, 0
 	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
 	waitmovement 0
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
index b3e91e43c..543736e80 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
@@ -67,7 +67,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2
 
 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0
 	message Route124_DivingTreasureHuntersHouse_Text_19F5C5
-	waittext
+	waitmessage
 	switch 0x4001
 	case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61
 	case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
index f19dc6662..3b2c99591 100644
--- a/data/scripts/maps/Route128.inc
+++ b/data/scripts/maps/Route128.inc
@@ -26,25 +26,25 @@ Route128_EventScript_15213F:: @ 815213F
 	applymovement 4, Route128_Movement_152279
 	waitmovement 0
 	msgbox Route128_Text_171F35, 4
-	closebutton
+	closemessage
 	applymovement 5, Route128_Movement_152293
 	waitmovement 0
 	applymovement 4, Route128_Movement_1A0841
 	waitmovement 0
 	msgbox Route128_Text_171F4B, 4
-	closebutton
+	closemessage
 	applymovement 5, Route128_Movement_1522A1
 	waitmovement 0
 	applymovement 255, Route128_Movement_1A0841
 	waitmovement 0
 	msgbox Route128_Text_172008, 4
-	closebutton
+	closemessage
 	applymovement 4, Route128_Movement_15227E
 	applymovement 255, Route128_Movement_1A083F
 	applymovement 5, Route128_Movement_152290
 	waitmovement 0
 	msgbox Route128_Text_17210B, 4
-	closebutton
+	closemessage
 	delay 40
 	applymovement 5, Route128_Movement_152296
 	applymovement 4, Route128_Movement_152283
@@ -61,7 +61,7 @@ Route128_EventScript_15213F:: @ 815213F
 	applymovement 255, Route128_Movement_1A0843
 	waitmovement 0
 	msgbox Route128_Text_172181, 4
-	closebutton
+	closemessage
 	applymovement 3, Route128_Movement_15226D
 	applymovement 255, Route128_Movement_1A0841
 	waitmovement 0
@@ -73,7 +73,7 @@ Route128_EventScript_15213F:: @ 815213F
 	applymovement 3, Route128_Movement_1A0845
 	waitmovement 0
 	msgbox Route128_Text_1723BE, 4
-	closebutton
+	closemessage
 	applymovement 3, Route128_Movement_1A0845
 	waitmovement 0
 	delay 50
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
index d2469dca7..955726d89 100644
--- a/data/scripts/maps/RustboroCity.inc
+++ b/data/scripts/maps/RustboroCity.inc
@@ -124,47 +124,47 @@ RustboroCity_EventScript_14C475:: @ 814C475
 
 RustboroCity_EventScript_14C481:: @ 814C481
 	lockall
-	movespriteperm 9, 14, 21
-	spritebehave 9, 10
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
 	setvar 0x8004, 0
 	goto RustboroCity_EventScript_14C4F4
 	end
 
 RustboroCity_EventScript_14C498:: @ 814C498
 	lockall
-	movespriteperm 9, 14, 21
-	spritebehave 9, 10
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
 	setvar 0x8004, 1
 	goto RustboroCity_EventScript_14C4F4
 	end
 
 RustboroCity_EventScript_14C4AF:: @ 814C4AF
 	lockall
-	movespriteperm 9, 14, 21
-	spritebehave 9, 10
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
 	setvar 0x8004, 2
 	goto RustboroCity_EventScript_14C4F4
 	end
 
 RustboroCity_EventScript_14C4C6:: @ 814C4C6
 	lockall
-	movespriteperm 9, 14, 21
-	spritebehave 9, 10
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
 	setvar 0x8004, 3
 	goto RustboroCity_EventScript_14C4F4
 	end
 
 RustboroCity_EventScript_14C4DD:: @ 814C4DD
 	lockall
-	movespriteperm 9, 14, 21
-	spritebehave 9, 10
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
 	setvar 0x8004, 4
 	goto RustboroCity_EventScript_14C4F4
 	end
 
 RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	msgbox RustboroCity_Text_166E65, 4
-	closebutton
+	closemessage
 	addobject 10
 	addobject 9
 	applymovement 10, RustboroCity_Movement_14C5C2
@@ -173,11 +173,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4
 	applymovement 9, RustboroCity_Movement_14C5D3
 	waitmovement 0
 	msgbox RustboroCity_Text_166E7E, 4
-	closebutton
+	closemessage
 	applymovement 9, RustboroCity_Movement_14C5DB
 	waitmovement 0
 	removeobject 9
-	movespriteperm 9, 30, 10
+	setobjectxyperm 9, 30, 10
 	clearflag 732
 	setflag 142
 	setvar 0x405a, 2
@@ -373,7 +373,7 @@ RustboroCity_EventScript_14C650:: @ 814C650
 	call_if 1, RustboroCity_EventScript_14C715
 	setflag 159
 	setvar 0x405a, 3
-	moveoffscreen 9
+	moveobjectoffscreen 9
 	msgbox RustboroCity_Text_166EA5, 4
 	releaseall
 	end
@@ -472,7 +472,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D
 	compare RESULT, 0
 	call_if 1, RustboroCity_EventScript_14C7F5
 	msgbox RustboroCity_Text_16707F, 4
-	closebutton
+	closemessage
 	setflag 144
 	setflag 732
 	setvar 0x405a, 5
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
index f5fb02c93..48d8aaf9f 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
@@ -8,8 +8,8 @@ RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C
 	end
 
 RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416
-	movespriteperm 2, 14, 2
-	spritebehave 2, 8
+	setobjectxyperm 2, 14, 2
+	setobjectmovementtype 2, 8
 	return
 
 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
index e7c966c08..784ef8087 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
@@ -79,7 +79,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
-	closebutton
+	closemessage
 	playse 21
 	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
 	waitmovement 0
@@ -97,7 +97,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
 	end
 
 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
-	closebutton
+	closemessage
 	playse 21
 	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
 	waitmovement 0
@@ -143,8 +143,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
-	waittext
-	givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	waitmessage
+	givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
@@ -163,8 +163,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
 	playfanfare 370
 	message RustboroCity_DevonCorp_2F_Text_18319E
 	waitfanfare
-	waittext
-	givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	waitmessage
+	givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
 	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5
 	compare RESULT, 1
 	call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
index 6458ec5ca..6f0152e60 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
@@ -10,8 +10,8 @@ RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
 	end
 
 RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
-	movespriteperm 2, 3, 2
-	spritebehave 2, 9
+	setobjectxyperm 2, 3, 2
+	setobjectmovementtype 2, 9
 	return
 
 RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
@@ -29,20 +29,20 @@ RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	lockall
 	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
-	closebutton
+	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
-	closebutton
+	closemessage
 	playbgm 420, 0
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
 	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
 	waitmovement 0
 	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
-	closebutton
+	closemessage
 	fadedefaultbgm
 	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
 	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
@@ -53,7 +53,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
 	playfanfare 370
 	message RustboroCity_DevonCorp_3F_Text_183422
 	waitfanfare
-	waittext
+	waitmessage
 	setflag 2050
 	setflag 188
 	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
@@ -151,7 +151,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
 	checkflag 189
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864
 	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
 	waitmovement 0
 	release
@@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
 	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
 	setflag 272
 	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
 	waitmovement 0
 	release
@@ -172,7 +172,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
 
 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
 	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc
index 6bb33b4dc..b1bbfb8d8 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/scripts/maps/RustboroCity_Gym.inc
@@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_1578D9:: @ 81578D9
 
 RustboroCity_Gym_EventScript_1578FE:: @ 81578FE
 	message RustboroCity_Gym_Text_1840AB
-	waittext
+	waitmessage
 	call RustboroCity_Gym_EventScript_1A02C5
 	msgbox RustboroCity_Gym_Text_1840D5, 4
 	setflag 1201
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc
index 7ee528ade..cb722a6af 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/scripts/maps/RustboroCity_Mart.inc
@@ -5,7 +5,7 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4
 	lock
 	faceplayer
 	message RustboroCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	checkflag 287
 	goto_if 0, RustboroCity_Mart_EventScript_157BEF
 	checkflag 287
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
index 896e8e220..53b481832 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F
 RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88
 	setvar 0x800b, 1
 	call RustboroCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
index 156b437a0..73b364f5e 100644
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc
@@ -9,8 +9,8 @@ RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2
 
 RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1
 	message RustboroCity_PokemonSchool_Text_184368
-	waittext
-	multichoicerow 8, 1, 13, 3, 0
+	waitmessage
+	multichoicegrid 8, 1, 13, 3, 0
 	switch RESULT
 	case 0, RustboroCity_PokemonSchool_EventScript_157A50
 	case 1, RustboroCity_PokemonSchool_EventScript_157A5E
@@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
 	giveitem ITEM_QUICK_CLAW
 	compare RESULT, 0
 	goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
 	waitmovement 0
 	setflag 275
@@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29
 
 RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34
 	msgbox RustboroCity_PokemonSchool_Text_184737, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
index 0cfb66351..b11304607 100644
--- a/data/scripts/maps/RusturfTunnel.inc
+++ b/data/scripts/maps/RusturfTunnel.inc
@@ -15,15 +15,15 @@ RusturfTunnel_MapScript1_15C762:: @ 815C762
 	end
 
 RusturfTunnel_EventScript_15C773:: @ 815C773
-	movespriteperm 7, 13, 4
-	movespriteperm 6, 13, 5
+	setobjectxyperm 7, 13, 4
+	setobjectxyperm 6, 13, 5
 	return
 
 RusturfTunnel_EventScript_15C782:: @ 815C782
 	lock
 	faceplayer
 	msgbox RusturfTunnel_Text_194766, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
 	waitmovement 0
 	release
@@ -36,7 +36,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799
 	goto_if_eq RusturfTunnel_EventScript_15C7BC
 	setflag 1
 	msgbox RusturfTunnel_Text_1944C5, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
 	waitmovement 0
 	release
@@ -44,7 +44,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799
 
 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
 	msgbox RusturfTunnel_Text_1945B2, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
 	waitmovement 0
 	release
@@ -67,7 +67,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	giveitem ITEM_HM04
 	setflag 106
 	msgbox RusturfTunnel_Text_194693, 4
-	closebutton
+	closemessage
 	compare 0x4001, 1
 	call_if 1, RusturfTunnel_EventScript_15C880
 	compare 0x4001, 2
@@ -75,7 +75,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
 	compare 0x4001, 3
 	call_if 1, RusturfTunnel_EventScript_15C8AE
 	msgbox RusturfTunnel_Text_194706, 4
-	closebutton
+	closemessage
 	compare 0x4001, 1
 	call_if 1, RusturfTunnel_EventScript_15C8F7
 	compare 0x4001, 2
@@ -124,7 +124,7 @@ RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
 	return
 
 RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
-	closebutton
+	closemessage
 	applymovement 1, RusturfTunnel_Movement_15C98D
 	waitmovement 0
 	return
@@ -280,12 +280,12 @@ RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
 	lockall
 	msgbox RusturfTunnel_Text_194159, 4
-	closebutton
+	closemessage
 	applymovement 6, RusturfTunnel_Movement_15C9D3
 	applymovement 7, RusturfTunnel_Movement_15C9D3
 	waitmovement 0
-	moveoffscreen 6
-	moveoffscreen 7
+	moveobjectoffscreen 6
+	moveobjectoffscreen 7
 	setvar 0x409a, 3
 	releaseall
 	end
@@ -314,7 +314,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
 	msgbox RusturfTunnel_Text_194274, 4
 	giveitem ITEM_DEVON_GOODS
-	closebutton
+	closemessage
 	applymovement 255, RusturfTunnel_Movement_15CA99
 	applymovement 6, RusturfTunnel_Movement_15CAA2
 	waitmovement 0
@@ -330,12 +330,12 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
 	applymovement 5, RusturfTunnel_Movement_1A0839
 	waitmovement 0
 	message RusturfTunnel_Text_19434F
-	waittext
+	waitmessage
 	waitse
 	pokecry SPECIES_WINGULL, 0
 	waitbutton
 	waitpokecry
-	closebutton
+	closemessage
 	applymovement 5, RusturfTunnel_Movement_15CAB4
 	applymovement 7, RusturfTunnel_Movement_15CAC3
 	waitmovement 0
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc
index aa84b6b48..c7cd4447d 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/scripts/maps/SSTidalRooms.inc
@@ -23,7 +23,7 @@ SSTidalRooms_EventScript_15FF3D:: @ 815FF3D
 SSTidalRooms_EventScript_15FF47:: @ 815FF47
 	lockall
 	msgbox SSTidalRooms_Text_19956B, 4
-	closebutton
+	closemessage
 	call SSTidalRooms_EventScript_1A02CA
 	call SSTidalRooms_EventScript_15FD64
 	releaseall
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc
index 0632a2dda..06a400810 100644
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ b/data/scripts/maps/SafariZone_Southeast.inc
@@ -14,7 +14,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B
 	waitmovement 0
 	applymovement 1, SafariZone_Southeast_Movement_160089
 	waitmovement 0
-	movespriteperm 1, 32, 34
+	setobjectxyperm 1, 32, 34
 	setvar 0x40a4, 0
 	releaseall
 	end
@@ -25,7 +25,7 @@ SafariZone_Southeast_MapScript1_160073:: @ 8160073
 	end
 
 SafariZone_Southeast_EventScript_16007F:: @ 816007F
-	movespriteperm 1, 31, 34
+	setobjectxyperm 1, 31, 34
 	return
 
 SafariZone_Southeast_Movement_160087:: @ 8160087
@@ -69,7 +69,7 @@ SafariZone_Southeast_EventScript_1600D1:: @ 81600D1
 
 SafariZone_Southeast_EventScript_1600E0:: @ 81600E0
 	msgbox SafariZone_Southeast_Text_1C3ACA, 4
-	closebutton
+	closemessage
 	switch FACING
 	case 2, SafariZone_Southeast_EventScript_160105
 	case 4, SafariZone_Southeast_EventScript_16011F
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
index e600611be..ee404404e 100644
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ b/data/scripts/maps/SeafloorCavern_Room9.inc
@@ -27,7 +27,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	.else
 	msgbox SeafloorCavern_Room9_Text_1B4850, 4
 	.endif
-	closebutton
+	closemessage
 	addobject 0x8004
 	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
 	waitmovement 0
@@ -134,7 +134,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	.else
 	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
 	.endif
-	closebutton
+	closemessage
 	applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41
 	waitmovement 0
 	.ifdef SAPPHIRE
@@ -142,7 +142,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	.else
 	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
 	.endif
-	closebutton
+	closemessage
 	playse 3
 	delay 20
 	applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845
@@ -152,7 +152,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	.else
 	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
 	.endif
-	closebutton
+	closemessage
 	addobject 0x8005
 	addobject 0x8006
 	addobject 0x8007
@@ -182,7 +182,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
 	.else
 	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
 	.endif
-	closebutton
+	closemessage
 	applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60
 	applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46
 	waitmovement 0
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc
index 70821d183..027c1c363 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/scripts/maps/SealedChamber_InnerRoom.inc
@@ -5,7 +5,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C53C1
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	checkflag 228
 	goto_if_eq SealedChamber_InnerRoom_EventScript_15F247
 	specialvar RESULT, CheckRelicanthWailord
@@ -29,7 +29,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8
 	playse 8
 	delay 40
 	msgbox SealedChamber_InnerRoom_Text_1A138B, 4
-	closebutton
+	closemessage
 	fadeinbgm 0
 	setflag 228
 	releaseall
@@ -43,7 +43,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C53F2
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -51,7 +51,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C5414
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -59,7 +59,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C5435
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -67,7 +67,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C545C
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -75,7 +75,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C5470
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -83,6 +83,6 @@ SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F
 	lockall
 	braillemsg SealedChamber_InnerRoom_Braille_1C549B
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc
index 091c0e8a4..638fc2a85 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/scripts/maps/SealedChamber_OuterRoom.inc
@@ -31,7 +31,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C534F
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -39,7 +39,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C5359
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -47,7 +47,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C5363
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -55,7 +55,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C536D
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -63,7 +63,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C5377
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -71,7 +71,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C5381
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -79,7 +79,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C538B
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -87,7 +87,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C5396
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -95,7 +95,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C539E
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -103,7 +103,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C53A9
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -113,7 +113,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8
 	goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF
 	braillemsg SealedChamber_OuterRoom_Braille_1C53B1
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
 
@@ -126,6 +126,6 @@ SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9
 	lockall
 	braillemsg SealedChamber_OuterRoom_Braille_1C53B1
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
index 1c9fc342f..dcd550549 100644
--- a/data/scripts/maps/SlateportCity.inc
+++ b/data/scripts/maps/SlateportCity.inc
@@ -23,27 +23,27 @@ SlateportCity_EventScript_14BA5C:: @ 814BA5C
 	return
 
 SlateportCity_EventScript_14BA68:: @ 814BA68
-	movespriteperm 11, 28, 13
-	movespriteperm 7, 25, 13
-	movespriteperm 3, 25, 14
-	movespriteperm 6, 27, 16
-	movespriteperm 8, 28, 16
-	movespriteperm 1, 29, 16
-	movespriteperm 2, 31, 14
-	spritebehave 11, 8
-	spritebehave 7, 18
-	spritebehave 3, 16
-	spritebehave 6, 7
-	spritebehave 8, 7
-	spritebehave 1, 7
-	spritebehave 2, 9
+	setobjectxyperm 11, 28, 13
+	setobjectxyperm 7, 25, 13
+	setobjectxyperm 3, 25, 14
+	setobjectxyperm 6, 27, 16
+	setobjectxyperm 8, 28, 16
+	setobjectxyperm 1, 29, 16
+	setobjectxyperm 2, 31, 14
+	setobjectmovementtype 11, 8
+	setobjectmovementtype 7, 18
+	setobjectmovementtype 3, 16
+	setobjectmovementtype 6, 7
+	setobjectmovementtype 8, 7
+	setobjectmovementtype 1, 7
+	setobjectmovementtype 2, 9
 	return
 
 SlateportCity_EventScript_14BAB6:: @ 814BAB6
 	lock
 	faceplayer
 	message SlateportCity_Text_164642
-	waittext
+	waitmessage
 	pokemart SlateportCity_Items1
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
@@ -76,7 +76,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0
 	playfanfare 370
 	message SlateportCity_Text_1646DD
 	waitfanfare
-	waittext
+	waitmessage
 	msgbox SlateportCity_Text_1646FC, 4
 	special GivLeadMonEffortRibbon
 	release
@@ -307,7 +307,7 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164C64, 4
-	closebutton
+	closemessage
 	applymovement 5, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -317,7 +317,7 @@ SlateportCity_EventScript_14BD51:: @ 814BD51
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164C9F, 4
-	closebutton
+	closemessage
 	applymovement 19, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -327,7 +327,7 @@ SlateportCity_EventScript_14BD68:: @ 814BD68
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164CE8, 4
-	closebutton
+	closemessage
 	applymovement 20, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -337,7 +337,7 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164D2B, 4
-	closebutton
+	closemessage
 	applymovement 27, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -347,7 +347,7 @@ SlateportCity_EventScript_14BD96:: @ 814BD96
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164D92, 4
-	closebutton
+	closemessage
 	applymovement 28, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -357,7 +357,7 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164DD5, 4
-	closebutton
+	closemessage
 	applymovement 29, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -367,7 +367,7 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164DF4, 4
-	closebutton
+	closemessage
 	applymovement 30, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -377,7 +377,7 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_164E46, 4
-	closebutton
+	closemessage
 	applymovement 31, SlateportCity_Movement_1A083D
 	waitmovement 0
 	release
@@ -387,7 +387,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2
 	lock
 	faceplayer
 	message SlateportCity_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor SlateportCity_Decorations1
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
@@ -413,7 +413,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20
 	checkflag 96
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor SlateportCity_Decorations2
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
@@ -445,7 +445,7 @@ SlateportCity_Decorations2:: @ 814BE40
 	checkflag 96
 	goto_if 0, SlateportCity_EventScript_14BE16
 	message SlateportCity_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemartdecor SlateportCity_Decorations3
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
@@ -472,7 +472,7 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A
 	lock
 	faceplayer
 	message SlateportCity_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart SlateportCity_Items2
 	msgbox SlateportCity_Text_1A0C02, 4
 	release
@@ -490,7 +490,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	lockall
 	msgbox SlateportCity_Text_165498, 4
 	msgbox SlateportCity_Text_1654E0, 4
-	closebutton
+	closemessage
 	applymovement 10, SlateportCity_Movement_1A0843
 	waitmovement 0
 	delay 10
@@ -528,7 +528,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC
 	applymovement 11, SlateportCity_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_Text_16583A, 4
-	closebutton
+	closemessage
 	applymovement 11, SlateportCity_Movement_14BFFB
 	applymovement 255, SlateportCity_Movement_14C008
 	waitmovement 0
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
index c43b64288..cb4632d77 100644
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ b/data/scripts/maps/SlateportCity_ContestLobby.inc
@@ -38,7 +38,7 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
 	applymovement 255, SlateportCity_ContestLobby_Movement_1554CA
 	waitmovement 0
 	msgbox SlateportCity_ContestLobby_Text_1A6832, 4
-	closebutton
+	closemessage
 	applymovement 1, SlateportCity_ContestLobby_Movement_1554D3
 	applymovement 255, SlateportCity_ContestLobby_Movement_1554C0
 	waitmovement 0
@@ -118,7 +118,7 @@ SlateportCity_ContestLobby_EventScript_155526:: @ 8155526
 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F
 	lockall
 	fadescreen 1
-	showcontestwinner 3
+	drawcontestwinner 3
 	releaseall
 	end
 
@@ -130,6 +130,6 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
index 50f4926e4..6d2471d99 100644
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ b/data/scripts/maps/SlateportCity_Harbor.inc
@@ -17,8 +17,8 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
 
 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
 	savebgm BGM_EVIL_TEAM
-	movespriteperm 4, 12, 13
-	spritebehave 4, 9
+	setobjectxyperm 4, 12, 13
+	setobjectmovementtype 4, 9
 	setflag 905
 	return
 
@@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	applymovement 255, SlateportCity_Harbor_Movement_1A0841
 	waitmovement 0
 	msgbox SlateportCity_Harbor_Text_17FD7D, 4
-	closebutton
+	closemessage
 	applymovement 6, SlateportCity_Harbor_Movement_15609B
 	applymovement 7, SlateportCity_Harbor_Movement_15609B
 	applymovement 8, SlateportCity_Harbor_Movement_1560A5
@@ -72,11 +72,11 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
 	compare 0x8008, 3
 	call_if 1, SlateportCity_Harbor_EventScript_156086
 	msgbox SlateportCity_Harbor_Text_17FE60, 4
-	closebutton
+	closemessage
 	setflag 821
 	setflag 822
-	moveoffscreen 4
-	spritebehave 4, 10
+	moveobjectoffscreen 4
+	setobjectmovementtype 4, 10
 	releaseall
 	end
 
@@ -171,12 +171,12 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
 	compare RESULT, 0
 	goto_if_eq SlateportCity_Harbor_EventScript_156135
 	message SlateportCity_Harbor_Text_17FB0A
-	waittext
+	waitmessage
 	goto SlateportCity_Harbor_EventScript_1560FD
 	end
 
 SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
-	multichoicedef 18, 6, 52, 2, 0
+	multichoicedefault 18, 6, 52, 2, 0
 	switch RESULT
 	case 0, SlateportCity_Harbor_EventScript_15613F
 	case 1, SlateportCity_Harbor_EventScript_156167
@@ -212,13 +212,13 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167
 
 SlateportCity_Harbor_EventScript_15618A:: @ 815618A
 	message SlateportCity_Harbor_Text_17FBE5
-	waittext
+	waitmessage
 	goto SlateportCity_Harbor_EventScript_1560FD
 	end
 
 SlateportCity_Harbor_EventScript_156196:: @ 8156196
 	msgbox SlateportCity_Harbor_Text_17FBB6, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
 	waitmovement 0
 	delay 30
@@ -277,7 +277,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211
 	compare 0x40a0, 2
 	goto_if_eq SlateportCity_Harbor_EventScript_15624E
 	msgbox SlateportCity_Harbor_Text_17FD1C, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
 	waitmovement 0
 	release
@@ -318,7 +318,7 @@ SlateportCity_Harbor_EventScript_15629D:: @ 815629D
 
 SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7
 	message SlateportCity_Harbor_Text_18028B
-	waittext
+	waitmessage
 	goto SlateportCity_Harbor_EventScript_1562B3
 	end
 
@@ -364,7 +364,7 @@ SlateportCity_Harbor_EventScript_15636A:: @ 815636A
 
 SlateportCity_Harbor_EventScript_156374:: @ 8156374
 	message SlateportCity_Harbor_Text_180447
-	waittext
+	waitmessage
 	goto SlateportCity_Harbor_EventScript_1562B3
 	end
 
diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/scripts/maps/SlateportCity_Mart.inc
index 730afe6d4..39a1d5ba2 100644
--- a/data/scripts/maps/SlateportCity_Mart.inc
+++ b/data/scripts/maps/SlateportCity_Mart.inc
@@ -5,7 +5,7 @@ SlateportCity_Mart_EventScript_156411:: @ 8156411
 	lock
 	faceplayer
 	message SlateportCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart SlateportCity_Mart_Items
 	msgbox SlateportCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index 32a5c2013..f1da0c5a3 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5
 	compare RESULT, 1
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D
-	closebutton
+	closemessage
 	hidemoney 0, 0
 	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
 	waitmovement 0
@@ -60,7 +60,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
 	checkflag 149
 	goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
-	closebutton
+	closemessage
 	hidemoney 0, 0
 	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
 	waitmovement 0
@@ -169,7 +169,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
 	setflag 269
 	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
-	closebutton
+	closemessage
 	compare FACING, 2
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98
 	compare FACING, 2
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
index 5f64b3941..e379c633d 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
@@ -10,7 +10,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	lock
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
-	closebutton
+	closemessage
 	playbgm BGM_EVIL_TEAM, 1
 	addobject 3
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
@@ -30,7 +30,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
-	closebutton
+	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
 	waitmovement 0
 	compare FACING, 1
@@ -39,7 +39,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83
 	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
-	closebutton
+	closemessage
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
 	waitmovement 0
 	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
@@ -53,7 +53,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
 	waitmovement 0
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
-	closebutton
+	closemessage
 	delay 35
 	addobject 2
 	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
@@ -67,7 +67,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	.else
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
 	.endif
-	closebutton
+	closemessage
 	fadescreen 1
 	removeobject 2
 	removeobject 3
@@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
 	setvar 0x8004, 269
 	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
-	closebutton
+	closemessage
 	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
 	waitmovement 0
 	playse 9
@@ -265,7 +265,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
 	lock
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
 	waitmovement 0
 	release
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
index c550a6850..9aa326f70 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
@@ -10,7 +10,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5
 SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE
 	setvar 0x800b, 1
 	call SlateportCity_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
index 3c988d084..9fe7f1f1a 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
@@ -15,7 +15,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4
-	closebutton
+	closemessage
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
 	waitmovement 0
 	setflag 148
@@ -41,7 +41,7 @@ SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4
-	closebutton
+	closemessage
 	applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D
 	waitmovement 0
 	releaseall
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
index 90d2bcc5e..a1ecffbd2 100644
--- a/data/scripts/maps/SootopolisCity.inc
+++ b/data/scripts/maps/SootopolisCity.inc
@@ -12,7 +12,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D
 	end
 
 SootopolisCity_EventScript_14D0A0:: @ 814D0A0
-	movespriteperm 3, 31, 18
+	setobjectxyperm 3, 31, 18
 	setmaptile 31, 32, 592, 1
 	return
 
@@ -43,22 +43,22 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D
 
 SootopolisCity_EventScript_14D123:: @ 814D123
 	call SootopolisCity_EventScript_1A02C1
-	movespriteperm 1, 29, 19
-	movespriteperm 2, 33, 19
+	setobjectxyperm 1, 29, 19
+	setobjectxyperm 2, 33, 19
 	compare 0x405e, 1
 	call_if 1, SootopolisCity_EventScript_14D142
 	return
 
 SootopolisCity_EventScript_14D142:: @ 814D142
-	movespriteperm 10, 29, 6
-	spritebehave 10, 10
-	movespriteperm 5, 30, 6
-	spritebehave 5, 9
+	setobjectxyperm 10, 29, 6
+	setobjectmovementtype 10, 10
+	setobjectxyperm 5, 30, 6
+	setobjectmovementtype 5, 9
 	return
 
 SootopolisCity_EventScript_14D159:: @ 814D159
-	movespriteperm 10, 31, 33
-	spritebehave 10, 8
+	setobjectxyperm 10, 31, 33
+	setobjectmovementtype 10, 8
 	return
 
 SootopolisCity_MapScript1_14D165:: @ 814D165
@@ -228,7 +228,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	.else
 	msgbox SootopolisCity_Text_169E0F, 4
 	.endif
-	closebutton
+	closemessage
 	applymovement 10, SootopolisCity_Movement_14D417
 	applymovement 255, SootopolisCity_Movement_14D440
 	waitmovement 10
@@ -247,7 +247,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	.else
 	msgbox SootopolisCity_Text_169F3C, 4
 	.endif
-	closebutton
+	closemessage
 	delay 30
 	applymovement 5, SootopolisCity_Movement_14D46A
 	applymovement 10, SootopolisCity_Movement_14D41D
@@ -264,7 +264,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	.else
 	msgbox SootopolisCity_Text_169F6B, 4
 	.endif
-	closebutton
+	closemessage
 	delay 30
 	applymovement 5, SootopolisCity_Movement_14D47C
 	applymovement 255, SootopolisCity_Movement_14D457
@@ -284,10 +284,10 @@ SootopolisCity_EventScript_14D308:: @ 814D308
 	.else
 	msgbox SootopolisCity_Text_16A13E, 4
 	.endif
-	moveoffscreen 5
-	spritebehave 5, 9
-	moveoffscreen 10
-	spritebehave 10, 10
+	moveobjectoffscreen 5
+	setobjectmovementtype 5, 9
+	moveobjectoffscreen 10
+	setobjectmovementtype 10, 10
 	setvar 0x405e, 2
 	releaseall
 	end
@@ -457,7 +457,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498
 
 SootopolisCity_EventScript_14D4AD:: @ 814D4AD
 	msgbox SootopolisCity_Text_16A33E, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, SootopolisCity_Movement_1A0845
 	waitmovement 0
 	delay 50
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
index bd0af12be..51b67ee4b 100644
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc
@@ -97,7 +97,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
 
 SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
 	message SootopolisCity_Gym_1F_Text_18F342
-	waittext
+	waitmessage
 	call SootopolisCity_Gym_1F_EventScript_1A02C5
 	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
 	setflag 1236
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc
index 662117741..df536004e 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/scripts/maps/SootopolisCity_House8.inc
@@ -41,7 +41,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466
 	giveitem ITEM_ELIXIR
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B488
-	closebutton
+	closemessage
 	release
 	end
 
@@ -90,7 +90,7 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7
 	giveitem ITEM_ELIXIR
 	compare RESULT, 0
 	goto_if_eq SootopolisCity_House8_EventScript_15B519
-	closebutton
+	closemessage
 	release
 	end
 
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc
index 6cfb2ff79..b88347002 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/scripts/maps/SootopolisCity_Mart.inc
@@ -5,7 +5,7 @@ SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B
 	lock
 	faceplayer
 	message SootopolisCity_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart SootopolisCity_Mart_Items
 	msgbox SootopolisCity_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
index 00c9d3310..cb09d8856 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
@@ -9,7 +9,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
 @ 815B19A
 	setvar 0x800B, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
index 77c163c47..3c6426024 100644
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ b/data/scripts/maps/SouthernIsland_Exterior.inc
@@ -13,7 +13,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
 	compare RESULT, 0
 	goto_if_eq SouthernIsland_Exterior_EventScript_160B25
 	msgbox SouthernIsland_Exterior_Text_1C5281, 4
-	closebutton
+	closemessage
 	applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845
 	waitmovement 0
 	delay 30
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc
index 5bbe8e3b6..edc8229a7 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/scripts/maps/Underwater_SealedChamber.inc
@@ -22,6 +22,6 @@ Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8
 	lockall
 	braillemsg Underwater_SealedChamber_Braille_1C533D
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
index 5d7c6de18..8462892e6 100644
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
@@ -38,7 +38,7 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
 	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23
 	waitmovement 0
 	msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4
-	closebutton
+	closemessage
 	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C
 	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19
 	waitmovement 0
@@ -90,7 +90,7 @@ VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35
 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37
 	lockall
 	fadescreen 1
-	showcontestwinner 1
+	drawcontestwinner 1
 	releaseall
 	end
 
@@ -124,6 +124,6 @@ VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbutton
-	hidebox 0, 0, 29, 19
+	erasebox 0, 0, 29, 19
 	releaseall
 	end
diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/scripts/maps/VerdanturfTown_Mart.inc
index 4227dc8b1..db72de227 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.inc
+++ b/data/scripts/maps/VerdanturfTown_Mart.inc
@@ -5,7 +5,7 @@ VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC
 	lock
 	faceplayer
 	message VerdanturfTown_Mart_Text_1A0BE4
-	waittext
+	waitmessage
 	pokemart VerdanturfTown_Mart_Items
 	msgbox VerdanturfTown_Mart_Text_1A0C02, 4
 	release
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
index e0fee3fb8..a0b1f87de 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
@@ -11,7 +11,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18
 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18
 	setvar 0x800b, 1
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B
-	waittext
+	waitmessage
 	waitbutton
 	release
 	end
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
index 2ed660a5f..fe775d793 100644
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ b/data/scripts/maps/VictoryRoad_1F.inc
@@ -42,7 +42,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
 	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943
 	msgbox VictoryRoad_1F_Text_197967, 4
 	clearflag 858
-	moveoffscreen 4
+	moveobjectoffscreen 4
 	setflag 126
 	setvar 0x40c3, 1
 	releaseall
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 215fb3948..402afae23 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -131,7 +131,7 @@ SpeakToTrader:
 	compare RESULT, TRUE
 	goto_if_eq already_traded
 	message gTextTrader_MenuPrompt
-	waittext
+	waitmessage
 	goto do_trader_menu_get
 	end
 
@@ -165,13 +165,13 @@ cancelled_get_menu:
 
 rare_item_cant_trade_away:
 	message gTextTrader_ICantTradeThatOneAway
-	waittext
+	waitmessage
 	goto do_trader_menu_get
 	end
 
 dont_want_item:
 	message gTextTrader_MenuPrompt
-	waittext
+	waitmessage
 	goto do_trader_menu_get
 	end
 
@@ -232,14 +232,14 @@ SpeakToStoryteller:
 	goto_if_eq no_stories_recorded
 choose_story:
 	message gTextStoryteller_WhichTale
-	waittext
+	waitmessage
 	special ScrSpecial_StorytellerStoryListMenu
 	waitstate
 	compare RESULT, FALSE
 	goto_if_eq cancel_story_menu
 	setvar 0x8008, 1
 	special ScrSpecial_StorytellerDisplayStory
-	waittext
+	waitmessage
 	waitbutton
 	specialvar RESULT, ScrSpecial_StorytellerUpdateStat
 	compare RESULT, FALSE
@@ -272,25 +272,25 @@ prompt_record_story:
 	compare RESULT, TRUE
 	goto_if_eq stat_update
 	msgbox gTextStoryteller_ImNotSatisfied, 4
-	closebutton
+	closemessage
 	release
 	end
 
 stat_update:
 	msgbox gTextStoryteller_BirthOfANewLegend, 4
-	closebutton
+	closemessage
 	release
 	end
 
 dont_hear_story:
 	msgbox gTextStoryteller_OhIFeelStifled, 4
-	closebutton
+	closemessage
 	release
 	end
 
 cant_record_story:
 	msgbox gTextStoryteller_WishMorePeopleWould, 4
-	closebutton
+	closemessage
 	release
 	end
 
@@ -335,7 +335,7 @@ also_i_was_thinking:
 tell_giddy_tale:
 	special ScrSpecial_GenerateGiddyLine
 	special ShowFieldMessageStringVar4
-	waittext
+	waitmessage
 	yesnobox 20, 8
 	compare RESULT, 1
 	goto_if_eq tell_another_giddy_tale
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 7f29be0d8..df097fc19 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -24,7 +24,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B6C:: @ 81B1B6C
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1B7A:: @ 81B1B7A
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B1F7B, 4
-	closebutton
+	closemessage
 	setvar 0x8004, 0
 	call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
 	lock
@@ -45,7 +45,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1BB1:: @ 81B1BB1
 PetalburgCity_PokemonCenter_1F_EventScript_1B1BBB:: @ 81B1BBB
 	setvar 0x8004, 0
 	special sub_80EB7C4
-	waittext
+	waitmessage
 	delay 80
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B2137, 4
 	release
@@ -78,7 +78,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C28:: @ 81B1C28
 
 PetalburgCity_PokemonCenter_1F_EventScript_1B1C36:: @ 81B1C36
 	msgbox PetalburgCity_PokemonCenter_1F_Text_1B207F, 4
-	closebutton
+	closemessage
 	setvar 0x8004, 0
 	call PetalburgCity_PokemonCenter_1F_EventScript_1A00F3
 	lock
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index a821fd62d..01fc63f20 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -13,7 +13,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6956:: @ 81B6956
 	compare 0x8005, 1
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B69AA
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172453, 4
-	closebutton
+	closemessage
 	setvar 0x4092, 4
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B69B5
 	applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841
@@ -38,7 +38,7 @@ LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172531, 4
-	closebutton
+	closemessage
 	applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A0841
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CDC
 	waitmovement 0
@@ -86,7 +86,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A31:: @ 81B6A31
 	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A0843
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4
-	closebutton
+	closemessage
 	applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AA9
 	waitmovement 0
 	return
@@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A61:: @ 81B6A61
 	applymovement 255, LittlerootTown_BrendansHouse_2F_Movement_1A083F
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_2F_Text_172E4C, 4
-	closebutton
+	closemessage
 	applymovement 0x8008, LittlerootTown_BrendansHouse_2F_Movement_1B6AB4
 	waitmovement 0
 	return
@@ -162,7 +162,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
 	waitmovement 0
 	playbgm 453, 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4
-	closebutton
+	closemessage
 	applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
 	waitmovement 0
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CD2
@@ -172,7 +172,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1725FE, 4
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172644, 4
-	closebutton
+	closemessage
 	setvar 0x4001, 1
 	applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1B6BE1
 	waitmovement 0
@@ -187,7 +187,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
 	waitmovement 0
 	playbgm 453, 0
 	msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4
-	closebutton
+	closemessage
 	applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
 	waitmovement 0
 	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CDA
@@ -197,7 +197,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
 	waitmovement 0
 	msgbox LittlerootTown_MaysHouse_1F_Text_1725FE, 4
 	msgbox LittlerootTown_MaysHouse_1F_Text_172644, 4
-	closebutton
+	closemessage
 	setvar 0x4001, 1
 	applymovement 0x8005, LittlerootTown_MaysHouse_1F_Movement_1B6BE5
 	waitmovement 0
@@ -212,7 +212,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B9D:: @ 81B6B9D
 	applymovement 0x8005, LittlerootTown_BrendansHouse_1F_Movement_1A0835
 	waitmovement 0
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1725A3, 4
-	closebutton
+	closemessage
 	return
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
@@ -296,7 +296,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C80:: @ 81B6C80
 	end
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6C8A:: @ 81B6C8A
-	closebutton
+	closemessage
 	call LittlerootTown_BrendansHouse_1F_EventScript_1A02CA
 	inccounter GAME_STAT_RESTED_AT_HOME
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17276B, 4
@@ -385,13 +385,13 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_17298B, 4
 	giveitem ITEM_SS_TICKET
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172A7D, 4
-	closebutton
+	closemessage
 	compare 0x8008, 0
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DE3
 	compare 0x8008, 1
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DEE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_172B5E, 4
-	closebutton
+	closemessage
 	compare 0x8008, 0
 	call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1B6DF9
 	compare 0x8008, 1
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 9f9b21807..6fe754097 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -239,7 +239,7 @@ FallarborTown_ContestLobby_EventScript_1B78A1:: @ 81B78A1
 	compare RESULT, 0
 	goto_if_eq FallarborTown_ContestLobby_EventScript_1B7936
 	message FallarborTown_ContestLobby_Text_1B7304
-	waittext
+	waitmessage
 	special sub_8083614
 	waitstate
 	compare RESULT, 1
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index b7c4d1a43..d0283f072 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -26,7 +26,7 @@ gUnknown_081C3448:: @ 81C3448
 	lockall
 	playse 73
 	message UnknownString_81C34E4
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	goto EventScript_1C341B
@@ -35,7 +35,7 @@ gUnknown_081C3459:: @ 81C3459
 	lockall
 	playse 73
 	message UnknownString_81C3514
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	goto EventScript_1C341B
@@ -61,14 +61,14 @@ EventScript_1C348E:
 
 EventScript_1C34A0:
 	message UnknownString_81C35A9
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
 
 EventScript_1C34A9:
 	message UnknownString_81C3583
-	waittext
+	waitmessage
 	waitbutton
 	releaseall
 	end
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index d9ebe56a3..f3c03a853 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -13,7 +13,7 @@ Route111_EventScript_1A3877:: @ 81A3877
 	compare RESULT, 0
 	goto_if_eq Route111_EventScript_1A38D9
 	msgbox Route111_Text_1A35C5, 4
-	closebutton
+	closemessage
 	setflag 96
 	clearflag 948
 	compare FACING, 3
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 41e55929d..621d5d4f0 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -57,7 +57,7 @@ EventScript_1A6F0B:
 
 EventScript_1A6F21:
 	special DoTVShow
-	waittext
+	waitmessage
 	waitbutton
 	compare RESULT, 1
 	goto_if 5, EventScript_1A6F21
@@ -80,14 +80,14 @@ EventScript_1A6F50:
 	special sub_80BECE8
 	compare RESULT, 0
 	goto_if_eq EventScript_1A6EBB
-	waittext
+	waitmessage
 	waitbutton
 	goto EventScript_1A6F37
 	end
 
 EventScript_1A6F66:
 	special DoTVShowInSearchOfTrainers
-	waittext
+	waitmessage
 	waitbutton
 	compare RESULT, 0
 	goto_if_eq EventScript_1A6F66
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f2a2da881..35264d5e2 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1055,7 +1055,7 @@ bool8 ScrCmd_setobjectxy(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_movespriteperm(struct ScriptContext *ctx)
+bool8 ScrCmd_setobjectxyperm(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u16 x = VarGet(ScriptReadHalfword(ctx));
@@ -1065,7 +1065,7 @@ bool8 ScrCmd_movespriteperm(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_moveoffscreen(struct ScriptContext *ctx)
+bool8 ScrCmd_moveobjectoffscreen(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
 
@@ -1133,7 +1133,7 @@ bool8 ScrCmd_turnobject(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_spritebehave(struct ScriptContext *ctx)
+bool8 ScrCmd_setobjectmovementtype(struct ScriptContext *ctx)
 {
     u16 localId = VarGet(ScriptReadHalfword(ctx));
     u8 movementType = ScriptReadByte(ctx);
@@ -1246,13 +1246,13 @@ bool8 ScrCmd_message2(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_waittext(struct ScriptContext *ctx)
+bool8 ScrCmd_waitmessage(struct ScriptContext *ctx)
 {
     SetupNativeScript(ctx, IsFieldMessageBoxHidden);
     return TRUE;
 }
 
-bool8 ScrCmd_closebutton(struct ScriptContext *ctx)
+bool8 ScrCmd_closemessage(struct ScriptContext *ctx)
 {
     HideFieldMessageBox();
     return FALSE;
@@ -1307,7 +1307,7 @@ bool8 ScrCmd_multichoice(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
+bool8 ScrCmd_multichoicedefault(struct ScriptContext *ctx)
 {
     u8 left = ScriptReadByte(ctx);
     u8 top = ScriptReadByte(ctx);
@@ -1326,7 +1326,7 @@ bool8 ScrCmd_multichoicedef(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_showbox(struct ScriptContext *ctx)
+bool8 ScrCmd_drawbox(struct ScriptContext *ctx)
 {
     u8 left = ScriptReadByte(ctx);
     u8 top = ScriptReadByte(ctx);
@@ -1337,7 +1337,7 @@ bool8 ScrCmd_showbox(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
+bool8 ScrCmd_multichoicegrid(struct ScriptContext *ctx)
 {
     u8 left = ScriptReadByte(ctx);
     u8 top = ScriptReadByte(ctx);
@@ -1356,7 +1356,7 @@ bool8 ScrCmd_multichoicerow(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_hidebox(struct ScriptContext *ctx)
+bool8 ScrCmd_erasebox(struct ScriptContext *ctx)
 {
     u8 left = ScriptReadByte(ctx);
     u8 top = ScriptReadByte(ctx);
@@ -1368,7 +1368,7 @@ bool8 ScrCmd_hidebox(struct ScriptContext *ctx)
 }
 
 // unused
-bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
+bool8 ScrCmd_drawboxtext(struct ScriptContext *ctx)
 {
     u8 left = ScriptReadByte(ctx);
     u8 top = ScriptReadByte(ctx);
@@ -1386,7 +1386,7 @@ bool8 ScrCmd_clearbox(struct ScriptContext *ctx)
     }
 }
 
-bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_drawpokepic(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 x = ScriptReadByte(ctx);
@@ -1396,7 +1396,7 @@ bool8 ScrCmd_showpokepic(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
+bool8 ScrCmd_erasepokepic(struct ScriptContext *ctx)
 {
     bool8 (*func)(void) = ScriptMenu_GetPicboxWaitFunc();
 
@@ -1406,7 +1406,7 @@ bool8 ScrCmd_hidepokepic(struct ScriptContext *ctx)
     return TRUE;
 }
 
-bool8 ScrCmd_showcontestwinner(struct ScriptContext *ctx)
+bool8 ScrCmd_drawcontestwinner(struct ScriptContext *ctx)
 {
     u8 v1 = ScriptReadByte(ctx);
 
@@ -1545,7 +1545,7 @@ bool8 ScrCmd_vbuffer(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_givepokemon(struct ScriptContext *ctx)
+bool8 ScrCmd_givepoke(struct ScriptContext *ctx)
 {
     u16 species = VarGet(ScriptReadHalfword(ctx));
     u8 level = ScriptReadByte(ctx);
@@ -1576,7 +1576,7 @@ bool8 ScrCmd_setpokemove(struct ScriptContext *ctx)
     return FALSE;
 }
 
-bool8 ScrCmd_checkattack(struct ScriptContext *ctx)
+bool8 ScrCmd_checkpokemove(struct ScriptContext *ctx)
 {
     u8 i;
     u16 moveId = ScriptReadHalfword(ctx);