Rename several script commands

16 files changed, 267 insertions, 267 deletions

diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm
index ebf5e48d8..4e2130d65 100755
--- a/engine/breeding/egg.asm
+++ b/engine/breeding/egg.asm
@@ -194,7 +194,7 @@ OverworldHatchEgg:: ; 16f5e
 	call Function16f70
 	call ExitAllMenus
 	call RestartMapMusic
-	jp LoadMoveSprites
+	jp CloseText
 ; 16f70
 
 Function16f70: ; 16f70 (5:6f70)
diff --git a/engine/decorations.asm b/engine/decorations.asm
index 1fa5cac7e..2da9fa48a 100755
--- a/engine/decorations.asm
+++ b/engine/decorations.asm
@@ -1246,9 +1246,9 @@ DecorationDesc_PosterPointers: ; 26f84
 DecorationDesc_TownMapPoster: ; 0x26f91
 	loadfont
 	writetext .TownMapText
-	closetext
+	waitbutton
 	special Special_TownMap
-	loadmovesprites
+	closetext
 	end
 ; 0x26f9b
 
diff --git a/engine/events_2.asm b/engine/events_2.asm
index c9b673e81..5be1d4226 100644
--- a/engine/events_2.asm
+++ b/engine/events_2.asm
@@ -142,7 +142,7 @@ RandomEncounter:: ; 97cc0
 ; 97cf9
 
 WildBattleScript: ; 97cf9
-	battlecheck
+	setup_random_encounter
 	startbattle
 	returnafterbattle
 	end
diff --git a/engine/fruit_trees.asm b/engine/fruit_trees.asm
index 28e6e8cec..e6f7de9d1 100644
--- a/engine/fruit_trees.asm
+++ b/engine/fruit_trees.asm
@@ -9,7 +9,7 @@ FruitTreeScript:: ; 44000
 	callasm CheckFruitTree
 	iffalse .fruit
 	writetext NothingHereText
-	closetext
+	waitbutton
 	jump .end
 
 .fruit
@@ -27,10 +27,10 @@ FruitTreeScript:: ; 44000
 .packisfull
 	keeptextopen
 	writetext FruitPackIsFullText
-	closetext
+	waitbutton
 
 .end
-	loadmovesprites
+	closetext
 	end
 ; 44041
 
diff --git a/engine/link.asm b/engine/link.asm
index 9d21104f8..8ba1702e9 100755
--- a/engine/link.asm
+++ b/engine/link.asm
@@ -1378,7 +1378,7 @@ Function28926: ; 28926
 	hlcoord 0, 15
 	ld b, $1
 	ld c, $12
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 2, 16
 	ld de, String28ab4
 	call PlaceString
@@ -1487,7 +1487,7 @@ Function28926: ; 28926
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call Function28eef
+	call Predef_LinkTextbox
 	callba Function4d354
 	ld hl, UnknownText_0x28aaf
 	bccoord 1, 14
@@ -1509,7 +1509,7 @@ Function28926: ; 28926
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call Function28eef
+	call Predef_LinkTextbox
 	callba Function4d354
 	ld hl, UnknownText_0x28ac4
 	bccoord 1, 14
@@ -1519,7 +1519,7 @@ Function28926: ; 28926
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 1, 14
 	ld de, String28ece
 	call PlaceString
@@ -1666,7 +1666,7 @@ Function28b87: ; 28b87
 	hlcoord 0, 12
 	ld b, $4
 	ld c, $12
-	call Function28eef
+	call Predef_LinkTextbox
 	callba Function4d354
 	ld a, [wd002]
 	ld hl, PartySpecies
@@ -1695,7 +1695,7 @@ Function28b87: ; 28b87
 	hlcoord 10, 7
 	ld b, $3
 	ld c, $7
-	call Function28eef
+	call Predef_LinkTextbox
 	ld de, String28eab
 	hlcoord 12, 8
 	call PlaceString
@@ -1735,7 +1735,7 @@ Function28b87: ; 28b87
 	hlcoord 0, 12
 	ld b, 4
 	ld c, 18
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 1, 14
 	ld de, String28ece
 	call PlaceString
@@ -1752,7 +1752,7 @@ Function28b87: ; 28b87
 	hlcoord 0, 12
 	ld b, 4
 	ld c, 18
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 1, 14
 	ld de, String28ece
 	call PlaceString
@@ -1982,7 +1982,7 @@ Function28b87: ; 28b87
 	hlcoord 0, 12
 	ld b, 4
 	ld c, 18
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 1, 14
 	ld de, String28ebd
 	call PlaceString
@@ -2019,10 +2019,10 @@ String28ece: ; 28ece
 	next "was canceled!@"
 
 
-Function28eef: ; 28eef
+Predef_LinkTextbox: ; 28eef
 	ld d, h
 	ld e, l
-	callba Function16d6ca
+	callba LinkTextbox
 	ret
 ; 28ef8
 
@@ -2041,11 +2041,11 @@ Function28f09: ; 28f09
 	hlcoord 0, 0
 	ld b, 6
 	ld c, 18
-	call Function28eef
+	call Predef_LinkTextbox
 	hlcoord 0, 8
 	ld b, 6
 	ld c, 18
-	call Function28eef
+	call Predef_LinkTextbox
 	callba Functionfb60d
 	ret
 ; 28f24
diff --git a/engine/map_objects.asm b/engine/map_objects.asm
index 168c5389c..13e4f73bf 100644
--- a/engine/map_objects.asm
+++ b/engine/map_objects.asm
@@ -2736,7 +2736,7 @@ Function5602: ; 5602, called at battle start
 	ld a, PLAYER
 	call Function5629 ; respawn player
 
-	ld a, [wd459]
+	ld a, [wBattleScriptFlags]
 	bit 7, a
 	jr z, .ok
 
diff --git a/engine/menu.asm b/engine/menu.asm
index a1ec30b7a..6978a0e54 100755
--- a/engine/menu.asm
+++ b/engine/menu.asm
@@ -4,7 +4,7 @@ Function2400e:: ; 2400e
 	rst FarCall
 	call Function24085
 	call UpdateSprites
-	call Function321c
+	call ApplyTilemap
 	call Function2408f
 	ret
 ; 24022
@@ -16,7 +16,7 @@ Function24022:: ; 24022
 	call Function24085
 	callba MobileTextBorder
 	call UpdateSprites
-	call Function321c
+	call ApplyTilemap
 	call Function2408f
 	ret
 ; 2403c
@@ -28,7 +28,7 @@ Function2403c:: ; 2403c
 	call Function24085
 	callba MobileTextBorder
 	call UpdateSprites
-	call Function321c
+	call ApplyTilemap
 	call Function2411a
 	ld hl, wcfa5
 	set 7, [hl]
diff --git a/engine/phone.asm b/engine/phone.asm
index ab0ecb84a..672ca6042 100644
--- a/engine/phone.asm
+++ b/engine/phone.asm
@@ -443,9 +443,9 @@ Script_ReceivePhoneCall: ; 0x90241
 	refreshscreen $0
 	callasm RingTwice_StartCall
 	ptcall wd048
-	closetext
+	waitbutton
 	callasm HangUp
-	loadmovesprites
+	closetext
 	callasm InitCallReceiveDelay
 	end
 ; 0x90255
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm
index 5d0795766..0ce4f017b 100644
--- a/engine/phone_scripts.asm
+++ b/engine/phone_scripts.asm
@@ -188,7 +188,7 @@ BillPhoneScript1: ; 0xbcfc5
 
 BillPhoneScript2: ; 0xbd007
 	farwritetext BillPhoneNewlyFullText
-	closetext
+	waitbutton
 	end
 
 ; Elm
diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm
index 4d296aab2..064b35a6c 100755
--- a/engine/pokecenter_pc.asm
+++ b/engine/pokecenter_pc.asm
@@ -188,7 +188,7 @@ _KrissHousePC: ; 156d9
 	and a
 	jr nz, .asm_156f9
 	call OverworldTextModeSwitch
-	call Function321c
+	call ApplyTilemap
 	call UpdateSprites
 	call PC_PlayShutdownSound
 	ld c, $0
@@ -466,16 +466,16 @@ UnknownText_0x158c7: ; 0x158c7
 
 
 Function158cc: ; 0x158cc
-	ld a, [wc2ce]
+	ld a, [wSpriteUpdatesEnabled]
 	push af
 	ld a, $0
-	ld [wc2ce], a
+	ld [wSpriteUpdatesEnabled], a
 	callba CheckItemMenu
 	ld a, [wItemAttributeParamBuffer]
 	ld hl, .jumptable
 	rst JumpTable
 	pop af
-	ld [wc2ce], a
+	ld [wSpriteUpdatesEnabled], a
 	ret
 ; 0x158e7
 
@@ -577,10 +577,10 @@ Function15985: ; 0x15985
 	xor a
 	ld [wd0e3], a
 .asm_15989
-	ld a, [wc2ce]
+	ld a, [wSpriteUpdatesEnabled]
 	push af
 	ld a, $0
-	ld [wc2ce], a
+	ld [wSpriteUpdatesEnabled], a
 	ld hl, MenuData15a08
 	call CopyMenuDataHeader
 	hlcoord 0, 0
@@ -597,7 +597,7 @@ Function15985: ; 0x15985
 	ld a, [MenuSelection2]
 	ld [wd0d7], a
 	pop af
-	ld [wc2ce], a
+	ld [wSpriteUpdatesEnabled], a
 	ld a, [wd0e3]
 	and a
 	jr nz, .asm_159d8
diff --git a/engine/predef.asm b/engine/predef.asm
index c089215a6..680a6b4a0 100644
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -46,7 +46,7 @@ PredefPointers:: ; 856b
 	add_predef CalcPkmnStatC
 	add_predef CanLearnTMHMMove
 	add_predef GetTMHMMove
-	add_predef Function28eef ; $ 10
+	add_predef Predef_LinkTextbox ; $ 10
 	add_predef PrintMoveDesc
 	add_predef UpdatePlayerHUD
 	add_predef FillBox
diff --git a/engine/scripting.asm b/engine/scripting.asm
index 945368e2b..966a537c7 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -143,7 +143,7 @@ ScriptCommandTable: ; 96cb1
 	dw Script_pocketisfull
 	dw Script_loadfont
 	dw Script_refreshscreen
-	dw Script_loadmovesprites
+	dw Script_closetext
 	dw Script_loadbytec2cf
 	dw Script_farwritetext
 	dw Script_writetext
@@ -156,26 +156,26 @@ IF _CRYSTAL
 	dw Script_farjumptext
 ENDC
 	dw Script_jumptext
-	dw Script_closetext
+	dw Script_waitbutton
 	dw Script_keeptextopen
 	dw Script_pokepic
-	dw Script_pokepicyesorno
+	dw Script_closepokepic
 	dw Script_interpretmenu
 	dw Script_interpretmenu2
 	dw Script_loadpikachudata
-	dw Script_battlecheck
-	dw Script_loadtrainerdata
-	dw Script_loadpokedata
-	dw Script_loadtrainer
+	dw Script_setup_random_encounter
+	dw Script_memtrainerdata
+	dw Script_scriptedpokedata
+	dw Script_scriptedtrainerdata
 	dw Script_startbattle
 	dw Script_returnafterbattle
 	dw Script_catchtutorial
 	dw Script_trainertext
-	dw Script_trainerstatus
+	dw Script_trainerflagaction
 	dw Script_winlosstext
 	dw Script_scripttalkafter
-	dw Script_talkaftercancel
-	dw Script_talkaftercheck
+	dw Script_end_if_just_battled
+	dw Script_check_just_battled
 	dw Script_setlasttalked
 	dw Script_applymovement
 	dw Script_applymovement2
@@ -200,13 +200,13 @@ ENDC
 	dw Script_writecmdqueue
 	dw Script_delcmdqueue
 	dw Script_playmusic
-	dw Script_playrammusic
+	dw Script_encountermusic
 	dw Script_musicfadeout
 	dw Script_playmapmusic
 	dw Script_reloadmapmusic
 	dw Script_cry
 	dw Script_playsound
-	dw Script_waitbutton
+	dw Script_waitsfx
 	dw Script_warpsound
 	dw Script_specialsound
 	dw Script_passtoengine
@@ -347,8 +347,8 @@ JumpTextFacePlayerScript: ; 96e79
 JumpTextScript: ; 96e7a
 	loadfont
 	repeattext -1, -1
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 ; 96e81
 
@@ -431,10 +431,10 @@ Script_repeattext: ; 96ebb
 	ret
 ; 96ed9
 
-Script_closetext: ; 96ed9
+Script_waitbutton: ; 96ed9
 ; script command 0x54
 
-	jp CloseText
+	jp WaitButton
 ; 96edc
 
 Script_keeptextopen: ; 96edc
@@ -455,9 +455,9 @@ Script_yesorno: ; 96eed
 ; script command 0x4e
 
 	call YesNoBox
-	ld a, 0
+	ld a, FALSE
 	jr c, .no
-	ld a, 1
+	ld a, TRUE
 .no
 	ld [ScriptVar], a
 	ret
@@ -502,10 +502,10 @@ Script_pokepic: ; 96f16
 	ret
 ; 96f29
 
-Script_pokepicyesorno: ; 96f29
+Script_closepokepic: ; 96f29
 ; script command 0x57
 
-	callba PokepicYesOrNo
+	callba ClosePokepic
 	ret
 ; 96f30
 
@@ -575,9 +575,9 @@ GiveItemScript: ; 96f77
 	callasm ret_96f76
 	writetext ReceivedItemText
 	iffalse .Full
-	waitbutton
+	waitsfx
 	specialsound
-	closetext
+	waitbutton
 	itemnotify
 	end
 
@@ -611,7 +611,7 @@ Script_verbosegiveitem2: ; 96f8e
 	ld [wItemQuantityChangeBuffer], a
 	ld hl, NumItems
 	call ReceiveItem
-	ld a, 1
+	ld a, TRUE
 	jr c, .ok2
 	xor a
 .ok2
@@ -748,7 +748,7 @@ Script_elevator: ; 9707c
 	ld b, a
 	callba Elevator
 	ret c
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 97099
@@ -885,7 +885,7 @@ Script_scripttalkafter: ; 97125
 	jp ScriptJump
 ; 97132
 
-Script_trainerstatus: ; 97132
+Script_trainerflagaction: ; 97132
 ; script command 0x63
 ; parameters:
 ;     action (SingleByteParam)
@@ -902,7 +902,7 @@ Script_trainerstatus: ; 97132
 	ld a, c
 	and a
 	ret z
-	ld a, 1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 9714c
@@ -926,21 +926,21 @@ Script_winlosstext: ; 9714c
 	ret
 ; 97163
 
-Script_talkaftercancel: ; 97163
+Script_end_if_just_battled: ; 97163
 ; script command 0x66
 
-	ld a, [wd04d]
+	ld a, [wRunningTrainerBattleScript]
 	and a
 	ret z
 	jp Script_end
 ; 9716b
 
-Script_talkaftercheck: ; 9716b
+Script_check_just_battled: ; 9716b
 ; script command 0x67
 
-	ld a, 1
+	ld a, TRUE
 	ld [ScriptVar], a
-	ld a, [wd04d]
+	ld a, [wRunningTrainerBattleScript]
 	and a
 	ret nz
 	xor a
@@ -948,7 +948,7 @@ Script_talkaftercheck: ; 9716b
 	ret
 ; 9717a
 
-Script_playrammusic: ; 9717a
+Script_encountermusic: ; 9717a
 ; script command 0x80
 
 	ld a, [OtherTrainerClass]
@@ -1011,7 +1011,7 @@ Script_playsound: ; 971b7
 	ret
 ; 971c3
 
-Script_waitbutton: ; 971c3
+Script_waitsfx: ; 971c3
 ; script command 0x86
 
 	call WaitSFX
@@ -1481,19 +1481,19 @@ Script_loadpikachudata: ; 973f0
 	ret
 ; 973fb
 
-Script_battlecheck: ; 973fb
+Script_setup_random_encounter: ; 973fb
 ; script command 0x5b
 
 	xor a
-	ld [wd459], a
+	ld [wBattleScriptFlags], a
 	ret
 ; 97400
 
-Script_loadtrainerdata: ; 97400
+Script_memtrainerdata: ; 97400
 ; script command 0x5c
 
 	ld a, (1 << 7) | 1
-	ld [wd459], a
+	ld [wBattleScriptFlags], a
 	ld a, [WalkingDirection]
 	ld [OtherTrainerClass], a
 	ld a, [FacingDirection]
@@ -1501,14 +1501,14 @@ Script_loadtrainerdata: ; 97400
 	ret
 ; 97412
 
-Script_loadpokedata: ; 97412
+Script_scriptedpokedata: ; 97412
 ; script command 0x5d
 ; parameters:
 ;     pokemon (PokemonParam)
 ;     level (DecimalParam)
 
 	ld a, (1 << 7)
-	ld [wd459], a
+	ld [wBattleScriptFlags], a
 	call GetScriptByte
 	ld [TempWildMonSpecies], a
 	call GetScriptByte
@@ -1516,14 +1516,14 @@ Script_loadpokedata: ; 97412
 	ret
 ; 97424
 
-Script_loadtrainer: ; 97424
+Script_scriptedtrainerdata: ; 97424
 ; script command 0x5e
 ; parameters:
 ;     trainer_group (TrainerGroupParam)
 ;     trainer_id (TrainerIdParam)
 
 	ld a, (1 << 7) | 1
-	ld [wd459], a
+	ld [wBattleScriptFlags], a
 	call GetScriptByte
 	ld [OtherTrainerClass], a
 	call GetScriptByte
@@ -1557,7 +1557,7 @@ Script_catchtutorial: ; 97447
 Script_returnafterbattle: ; 97459
 ; script command 0x60
 
-	ld hl, wd459
+	ld hl, wBattleScriptFlags
 	ld d, [hl]
 	ld [hl], $0
 	ld a, [wBattleResult]
@@ -1589,7 +1589,7 @@ Script_reloadmap: ; 97491
 ; script command 0x7b
 
 	xor a
-	ld [wd459], a
+	ld [wBattleScriptFlags], a
 	ld a, MAPSETUP_RELOADMAP
 	ld [hMapEntryMethod], a
 	ld a, $1
@@ -2362,7 +2362,7 @@ Script_giveitem: ; 977ca
 	ld hl, NumItems
 	call ReceiveItem
 	jr nc, .full
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 .full
@@ -2388,7 +2388,7 @@ Script_takeitem: ; 977f0
 	ld hl, NumItems
 	call TossItem
 	ret nc
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 97812
@@ -2405,7 +2405,7 @@ Script_checkitem: ; 97812
 	ld hl, NumItems
 	call CheckItem
 	ret nc
-	ld a, 1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 97829
@@ -2534,7 +2534,7 @@ Script_checktime: ; 978ae
 	call GetScriptByte
 	and c
 	ret z
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 978c3
@@ -2551,7 +2551,7 @@ Script_checkpoke: ; 978c3
 	ld de, 1
 	call IsInArray
 	ret nc
-	ld a, 1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 978da
@@ -2567,7 +2567,7 @@ Script_addcellnum: ; 978da
 	ld c, a
 	callba AddPhoneNumber
 	ret nc
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 978ef
@@ -2583,7 +2583,7 @@ Script_delcellnum: ; 978ef
 	ld c, a
 	callba DelCellNum
 	ret nc
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 97904
@@ -2600,7 +2600,7 @@ Script_checkcellnum: ; 97904
 	ld c, a
 	callba CheckCellNum
 	ret nc
-	ld a, $1
+	ld a, TRUE
 	ld [ScriptVar], a
 	ret
 ; 97919
@@ -2624,7 +2624,7 @@ Script_checkphonecall: ; 97926
 	ld a, [wSpecialPhoneCallID]
 	and a
 	jr z, .ok
-	ld a, 1
+	ld a, TRUE
 .ok
 	ld [ScriptVar], a
 	ret
@@ -2728,7 +2728,7 @@ Script_checkevent: ; 979a4
 	ld a, c
 	and a
 	jr z, .false
-	ld a, 1
+	ld a, TRUE
 .false
 	ld [ScriptVar], a
 	ret
@@ -2743,7 +2743,7 @@ Script_setflag: ; 979bb
 	ld e, a
 	call GetScriptByte
 	ld d, a
-	ld b, 1 ; set
+	ld b, SET_FLAG
 	call _EngineFlagAction
 	ret
 ; 979c9
@@ -2757,7 +2757,7 @@ Script_clearflag: ; 979c9
 	ld e, a
 	call GetScriptByte
 	ld d, a
-	ld b, 0 ; clear
+	ld b, RESET_FLAG
 	call _EngineFlagAction
 	ret
 ; 979d7
@@ -2776,7 +2776,7 @@ Script_checkflag: ; 979d7
 	ld a, c
 	and a
 	jr z, .false
-	ld a, 1
+	ld a, TRUE
 .false
 	ld [ScriptVar], a
 	ret
@@ -3053,15 +3053,15 @@ Script_loadbytec2cf: ; 97b27
 ; 97b2e
 
 
-LoadMoveSpritesScript: ; 97b2e
-	loadmovesprites
+CloseTextScript: ; 97b2e
+	closetext
 ; 97b2f
 
-Script_loadmovesprites: ; 97b2f
+Script_closetext: ; 97b2f
 ; script command 0x49
 
 	call Function2e20
-	call LoadMoveSprites
+	call CloseText
 	ret
 ; 97b36
 
diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm
index 916e48b3c..9de31192b 100755
--- a/engine/selectmenu.asm
+++ b/engine/selectmenu.asm
@@ -9,8 +9,8 @@ SelectMenu:: ; 13327
 	ld b, BANK(ItemMayBeRegisteredText)
 	ld hl, ItemMayBeRegisteredText
 	call MapTextbox
-	call CloseText
-	jp LoadMoveSprites
+	call WaitButton
+	jp CloseText
 ; 13340
 
 
@@ -141,7 +141,7 @@ UseRegisteredItem: ; 133c3
 .NoFunction ; 133df
 	call LoadFont
 	call CantUseItem
-	call LoadMoveSprites
+	call CloseText
 	and a
 	ret
 ; 133ea
@@ -149,7 +149,7 @@ UseRegisteredItem: ; 133c3
 .Current ; 133ea
 	call LoadFont
 	call DoItemEffect
-	call LoadMoveSprites
+	call CloseText
 	and a
 	ret
 ; 133f5
@@ -159,7 +159,7 @@ UseRegisteredItem: ; 133c3
 	call FadeToMenu
 	call DoItemEffect
 	call ReturnToCallingMenu
-	call LoadMoveSprites
+	call CloseText
 	and a
 	ret
 ; 13406
@@ -185,7 +185,7 @@ UseRegisteredItem: ; 133c3
 
 ._cantuse
 	call CantUseItem
-	call LoadMoveSprites
+	call CloseText
 	and a
 	ret
 ; 1342d
diff --git a/engine/startmenu.asm b/engine/startmenu.asm
index a40aa734e..a0b6c5c0e 100755
--- a/engine/startmenu.asm
+++ b/engine/startmenu.asm
@@ -61,8 +61,8 @@ endr
 .MenuReturns
 	dw .Reopen
 	dw .Exit
-	dw .ExitMenuCallFuncLoadMoveSprites
-	dw .ExitMenuRunScriptLoadMoveSprites
+	dw .ExitMenuCallFuncCloseText
+	dw .ExitMenuRunScriptCloseText
 	dw .ExitMenuRunScript
 	dw .ReturnEnd
 	dw .ReturnRedraw
@@ -78,7 +78,7 @@ endr
 .ReturnEnd
 	call ExitMenu
 .ReturnEnd2
-	call LoadMoveSprites
+	call CloseText
 	call UpdateTimePals
 	ret
 
@@ -115,14 +115,14 @@ endr
 	ret
 ; 12699
 
-.ExitMenuRunScriptLoadMoveSprites ; 12699
+.ExitMenuRunScriptCloseText ; 12699
 	call ExitMenu
 	ld a, HMENURETURN_SCRIPT
 	ld [hMenuReturn], a
 	jr .ReturnEnd2
 ; 126a2
 
-.ExitMenuCallFuncLoadMoveSprites ; 126a2
+.ExitMenuCallFuncCloseText ; 126a2
 	call ExitMenu
 	ld hl, wQueuedScriptAddr
 	ld a, [hli]
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index a886dbbf3..93a5ec2f5 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -138,8 +138,8 @@ PokeCenterNurseScript:
 	spriteface LAST_TALKED, DOWN
 	pause 10
 
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .pokerus
@@ -148,14 +148,14 @@ PokeCenterNurseScript:
 	iftrue .pokerus_comcenter
 
 	farwritetext UnknownText_0x1b0241
+	waitbutton
 	closetext
-	loadmovesprites
 	jump .pokerus_done
 
 .pokerus_comcenter
 	farwritetext UnknownText_0x1b02d6
+	waitbutton
 	closetext
-	loadmovesprites
 
 .pokerus_done
 	setflag ENGINE_POKERUS
@@ -183,9 +183,9 @@ MerchandiseShelfScript:
 TownMapScript:
 	loadfont
 	farwritetext TownMapText
-	closetext
+	waitbutton
 	special Special_TownMap
-	loadmovesprites
+	closetext
 	end
 
 WindowScript:
@@ -194,8 +194,8 @@ WindowScript:
 TVScript:
 	loadfont
 	farwritetext TVText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 HomepageScript:
@@ -205,7 +205,7 @@ Radio1Script:
 	loadfont
 	writebyte $0
 	special MapRadio
-	loadmovesprites
+	closetext
 	end
 
 Radio2Script:
@@ -213,7 +213,7 @@ Radio2Script:
 	loadfont
 	writebyte $4
 	special MapRadio
-	loadmovesprites
+	closetext
 	end
 
 TrashCanScript: ; 0xbc1a5
@@ -222,7 +222,7 @@ TrashCanScript: ; 0xbc1a5
 PCScript:
 	loadfont
 	special PokemonCenterPC
-	loadmovesprites
+	closetext
 	end
 
 ElevatorButtonScript:
@@ -319,7 +319,7 @@ BugContestResultsScript:
 	clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
 	loadfont
 	farwritetext ContestResults_ReadyToJudgeText
-	closetext
+	waitbutton
 	special BugContestJudging
 	RAM2MEM $0
 	if_equal 1, BugContestResults_FirstPlace
@@ -327,7 +327,7 @@ BugContestResultsScript:
 	if_equal 3, BugContestResults_ThirdPlace
 	farwritetext ContestResults_ConsolationPrizeText
 	keeptextopen
-	waitbutton
+	waitsfx
 	verbosegiveitem BERRY
 	iffalse BugContestResults_NoRoomForBerry
 
@@ -345,16 +345,16 @@ BugContestResults_FinishUp
 	checkevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
 	iffalse BugContestResults_DidNotLeaveMons
 	farwritetext ContestResults_ReturnPartyText
-	closetext
+	waitbutton
 	special ContestReturnMons
 BugContestResults_DidNotLeaveMons
 	special CheckPartyFullAfterContest
 	if_equal $0, BugContestResults_CleanUp
 	if_equal $2, BugContestResults_CleanUp
 	farwritetext ContestResults_PartyFullText
-	closetext
+	waitbutton
 BugContestResults_CleanUp
-	loadmovesprites
+	closetext
 	dotrigger $0
 	domaptrigger ROUTE_35_NATIONAL_PARK_GATE, $0
 	setevent EVENT_BUG_CATCHING_CONTESTANT_1A
@@ -386,7 +386,7 @@ BugContestResults_FirstPlace ; 0xbc31e
 	setevent EVENT_GAVE_KURT_APRICORNS
 	itemtotext SUN_STONE, $1
 	farwritetext ContestResults_PlayerWonAPrizeText
-	closetext
+	waitbutton
 	verbosegiveitem SUN_STONE
 	iffalse BugContestResults_NoRoomForSunStone
 	jump BugContestResults_ReturnAfterWinnersPrize
@@ -395,7 +395,7 @@ BugContestResults_FirstPlace ; 0xbc31e
 BugContestResults_SecondPlace ; 0xbc332
 	itemtotext EVERSTONE, $1
 	farwritetext ContestResults_PlayerWonAPrizeText
-	closetext
+	waitbutton
 	verbosegiveitem EVERSTONE
 	iffalse BugContestResults_NoRoomForEverstone
 	jump BugContestResults_ReturnAfterWinnersPrize
@@ -404,7 +404,7 @@ BugContestResults_SecondPlace ; 0xbc332
 BugContestResults_ThirdPlace ; 0xbc343
 	itemtotext GOLD_BERRY, $1
 	farwritetext ContestResults_PlayerWonAPrizeText
-	closetext
+	waitbutton
 	verbosegiveitem GOLD_BERRY
 	iffalse BugContestResults_NoRoomForGoldBerry
 	jump BugContestResults_ReturnAfterWinnersPrize
@@ -793,7 +793,7 @@ AskNumber2MScript:
 RegisteredNumberMScript:
 	farwritetext RegisteredNumber1Text
 	playsound SFX_REGISTER_PHONE_NUMBER
-	waitbutton
+	waitsfx
 	keeptextopen
 	end
 
@@ -822,103 +822,103 @@ NumberAcceptedMScript:
 
 .Jack
 	farwritetext JackNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Huey
 	farwritetext HueyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gaven
 	farwritetext GavenNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Jose
 	farwritetext JoseNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Joey
 	farwritetext JoeyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wade
 	farwritetext WadeNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Ralph
 	farwritetext RalphNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Anthony
 	farwritetext AnthonyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Todd
 	farwritetext ToddNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Irwin
 	farwritetext IrwinNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Arnie
 	farwritetext ArnieNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Alan
 	farwritetext AlanNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Chad
 	farwritetext ChadNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Derek
 	farwritetext DerekNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tully
 	farwritetext TullyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Brent
 	farwritetext BrentNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Vance
 	farwritetext VanceNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wilton
 	farwritetext WiltonNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Kenji
 	farwritetext KenjiNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Parry
 	farwritetext ParryNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 NumberDeclinedMScript:
@@ -946,103 +946,103 @@ NumberDeclinedMScript:
 
 .Jack
 	farwritetext JackNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Huey
 	farwritetext HueyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gaven
 	farwritetext GavenNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Jose
 	farwritetext JoseNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Joey
 	farwritetext JoeyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wade
 	farwritetext WadeNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Ralph
 	farwritetext RalphNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Anthony
 	farwritetext AnthonyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Todd
 	farwritetext ToddNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Irwin
 	farwritetext IrwinNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Arnie
 	farwritetext ArnieNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Alan
 	farwritetext AlanNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Chad
 	farwritetext ChadNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Derek
 	farwritetext DerekNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tully
 	farwritetext TullyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Brent
 	farwritetext BrentNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Vance
 	farwritetext VanceNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wilton
 	farwritetext WiltonNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Kenji
 	farwritetext KenjiNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Parry
 	farwritetext ParryNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 PhoneFullMScript:
@@ -1070,103 +1070,103 @@ PhoneFullMScript:
 
 .Jack
 	farwritetext JackPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Huey
 	farwritetext HueyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gaven
 	farwritetext GavenPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Jose
 	farwritetext JosePhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Joey
 	farwritetext JoeyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wade
 	farwritetext WadePhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Ralph
 	farwritetext RalphPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Anthony
 	farwritetext AnthonyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Todd
 	farwritetext ToddPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Irwin
 	farwritetext IrwinPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Arnie
 	farwritetext ArniePhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Alan
 	farwritetext AlanPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Chad
 	farwritetext ChadPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Derek
 	farwritetext DerekPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tully
 	farwritetext TullyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Brent
 	farwritetext BrentPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Vance
 	farwritetext VancePhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wilton
 	farwritetext WiltonPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Kenji
 	farwritetext KenjiPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Parry
 	farwritetext ParryPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 RematchMScript:
@@ -1191,88 +1191,88 @@ RematchMScript:
 
 .Jack
 	farwritetext JackRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Huey
 	farwritetext HueyRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gaven
 	farwritetext GavenRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Jose
 	farwritetext JoseRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Joey
 	farwritetext JoeyRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wade
 	farwritetext WadeRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Ralph
 	farwritetext RalphRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Anthony
 	farwritetext AnthonyRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Todd
 	farwritetext ToddRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Arnie
 	farwritetext ArnieRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Alan
 	farwritetext AlanRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Chad
 	farwritetext ChadRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tully
 	farwritetext TullyRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Brent
 	farwritetext BrentRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Vance
 	farwritetext VanceRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wilton
 	farwritetext WiltonRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Parry
 	farwritetext ParryRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 GiftMScript:
@@ -1330,58 +1330,58 @@ PackFullMScript:
 
 .Huey
 	farwritetext HueyPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Jose
 	farwritetext JosePackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Joey
 	farwritetext JoeyPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wade
 	farwritetext WadePackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Alan
 	farwritetext AlanPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Derek
 	farwritetext DerekPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tully
 	farwritetext TullyPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Vance
 	farwritetext VancePackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Wilton
 	farwritetext WiltonPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Kenji
 	farwritetext KenjiPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Parry
 	farwritetext ParryPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 RematchGiftMScript:
@@ -1484,7 +1484,7 @@ AskNumber2FScript:
 RegisteredNumberFScript:
 	farwritetext RegisteredNumber2Text
 	playsound SFX_REGISTER_PHONE_NUMBER
-	waitbutton
+	waitsfx
 	keeptextopen
 	end
 
@@ -1501,43 +1501,43 @@ NumberAcceptedFScript: ; 0xbcbd3
 
 .Beverly
 	farwritetext BeverlyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Beth
 	farwritetext BethNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Reena
 	farwritetext ReenaNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Liz
 	farwritetext LizNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gina
 	farwritetext GinaNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Dana
 	farwritetext DanaNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tiffany
 	farwritetext TiffanyNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Erin
 	farwritetext ErinNumberAcceptedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 NumberDeclinedFScript:
@@ -1553,43 +1553,43 @@ NumberDeclinedFScript:
 
 .Beverly
 	farwritetext BeverlyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Beth
 	farwritetext BethNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Reena
 	farwritetext ReenaNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Liz
 	farwritetext LizNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gina
 	farwritetext GinaNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Dana
 	farwritetext DanaNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tiffany
 	farwritetext TiffanyNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Erin
 	farwritetext ErinNumberDeclinedText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 PhoneFullFScript:
@@ -1605,43 +1605,43 @@ PhoneFullFScript:
 
 .Beverly
 	farwritetext BeverlyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Beth
 	farwritetext BethPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Reena
 	farwritetext ReenaPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Liz
 	farwritetext LizPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gina
 	farwritetext GinaPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Dana
 	farwritetext DanaPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tiffany
 	farwritetext TiffanyPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Erin
 	farwritetext ErinPhoneFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 RematchFScript:
@@ -1656,38 +1656,38 @@ RematchFScript:
 
 .Beth
 	farwritetext BethRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Reena
 	farwritetext ReenaRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Liz
 	farwritetext LizRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gina
 	farwritetext GinaRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Dana
 	farwritetext DanaRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tiffany
 	farwritetext TiffanyRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Erin
 	farwritetext ErinRematchText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 GiftFScript:
@@ -1724,28 +1724,28 @@ PackFullFScript:
 
 .Beverly
 	farwritetext BeverlyPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Gina
 	farwritetext GinaPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Dana
 	farwritetext DanaPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Tiffany
 	farwritetext TiffanyPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 .Erin
 	farwritetext ErinPackFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 RematchGiftFScript:
@@ -1762,8 +1762,8 @@ GymStatue1Script:
 	mapnametotext $0
 	loadfont
 	farwritetext GymStatue_CityGymText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 GymStatue2Script:
@@ -1772,23 +1772,23 @@ GymStatue2Script:
 	farwritetext GymStatue_CityGymText
 	keeptextopen
 	farwritetext GymStatue_WinningTrainersText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 ReceiveItemScript: ; 0xbcdb9
-	waitbutton
+	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_ITEM
-	waitbutton
+	waitsfx
 	end
 ; 0xbcdc3
 
 ReceiveTogepiEggScript: ; 0xbcdc3
-	waitbutton
+	waitsfx
 	farwritetext ReceivedItemText
 	playsound SFX_GET_EGG_FROM_DAYCARE_LADY
-	waitbutton
+	waitsfx
 	end
 ; 0xbcdcd
 
@@ -1800,8 +1800,8 @@ GameCornerCoinVendorScript: ; 0xbcdcd
 	checkitem COIN_CASE
 	iftrue CoinVendor_IntroScript
 	farwritetext CoinVendor_NoCoinCaseText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 ; 0xbcde0
 
@@ -1825,10 +1825,10 @@ CoinVendor_Buy50CoinsScript: ; 0xbcdf7
 	if_equal $2, CoinVendor_NotEnoughMoneyScript
 	givecoins 50
 	takemoney $0, 1000
-	waitbutton
+	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy50CoinsText
-	closetext
+	waitbutton
 	jump CoinVendor_SellCoinsMenuScript
 ; 0xbce1b
 
@@ -1839,31 +1839,31 @@ CoinVendor_Buy500CoinsScript: ; 0xbce1b
 	if_equal $2, CoinVendor_NotEnoughMoneyScript
 	givecoins 500
 	takemoney $0, 10000
-	waitbutton
+	waitsfx
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy500CoinsText
-	closetext
+	waitbutton
 	jump CoinVendor_SellCoinsMenuScript
 ; 0xbce3f
 
 CoinVendor_NotEnoughMoneyScript: ; 0xbce3f
 	farwritetext CoinVendor_NotEnoughMoneyText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 ; 0xbce46
 
 CoinVendor_CoinCaseFullScript: ; 0xbce46
 	farwritetext CoinVendor_CoinCaseFullText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 ; 0xbce4d
 
 CoinVendor_CancelScript: ; 0xbce4d
 	farwritetext CoinVendor_CancelText
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 ; 0xbce54
 
@@ -1892,20 +1892,20 @@ HappinessCheckScript:
 	if_less_than 50, .Unhappy
 	if_less_than 150, .KindaHappy
 	farwritetext HappinessText3
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .KindaHappy
 	farwritetext HappinessText2
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 .Unhappy
 	farwritetext HappinessText1
+	waitbutton
 	closetext
-	loadmovesprites
 	end
 
 Movement_ContestResults_WalkAfterWarp: ; bcea1
diff --git a/engine/timeset.asm b/engine/timeset.asm
index 0b0f12718..1f82da884 100755
--- a/engine/timeset.asm
+++ b/engine/timeset.asm
@@ -6,7 +6,7 @@ InitClock: ; 90672 (24:4672)
 	ld [hInMenu], a
 
 	ld a, $0
-	ld [wc2ce], a
+	ld [wSpriteUpdatesEnabled], a
 	ld a, $10
 	ld [MusicFade], a
 	ld a, MUSIC_NONE % $100
@@ -436,7 +436,7 @@ Special_SetDayOfWeek: ; 90913
 	ld [hl], $f5
 	hlcoord 10, 5
 	call Function909de
-	call Function321c
+	call ApplyTilemap
 	ld c, 10
 	call DelayFrames
 .asm_9096a