return → endcallback, reloadandreturn → reloadend

83 files changed, 162 insertions, 160 deletions

diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index 98a6e25a..e6de6f19 100644
--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@@ -115,7 +115,7 @@ DoPoisonStep::
 	end
 
 .whiteout
-	farsjump Script_OverworldWhiteout
+	farsjump OverworldWhiteoutScript
 
 .CheckWhitedOut:
 	xor a
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index c21c3347..245a213b 100644
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -555,7 +555,7 @@ InitializeEventsScript:
 	setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
 	setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
 	setevent EVENT_INITIALIZED_EVENTS
-	return
+	endcallback
 
 AskNumber1MScript:
 	writetext AskNumber1MText
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 15ea07a3..4b4ff375 100644
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -2,7 +2,7 @@ Script_BattleWhiteout::
 	callasm BattleBGMap
 	sjump Script_Whiteout
 
-Script_OverworldWhiteout::
+OverworldWhiteoutScript::
 	refreshscreen
 	callasm OverworldBGMap
 
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index c55e58de..d00796b7 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -963,17 +963,17 @@ DoPlayerEvent:
 
 PlayerEventScriptPointers:
 ; entries correspond to PLAYEREVENT_* constants
-	dba Invalid_0x96b60          ; PLAYEREVENT_NONE
-	dba SeenByTrainerScript      ; PLAYEREVENT_SEENBYTRAINER
-	dba TalkToTrainerScript      ; PLAYEREVENT_TALKTOTRAINER
-	dba FindItemInBallScript     ; PLAYEREVENT_ITEMBALL
-	dba EdgeWarpScript           ; PLAYEREVENT_CONNECTION
-	dba WarpToNewMapScript       ; PLAYEREVENT_WARP
-	dba FallIntoMapScript        ; PLAYEREVENT_FALL
-	dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
-	dba HatchEggScript           ; PLAYEREVENT_HATCH
-	dba ChangeDirectionScript    ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96b60          ; (NUM_PLAYER_EVENTS)
+	dba Invalid_0x96b60         ; PLAYEREVENT_NONE
+	dba SeenByTrainerScript     ; PLAYEREVENT_SEENBYTRAINER
+	dba TalkToTrainerScript     ; PLAYEREVENT_TALKTOTRAINER
+	dba FindItemInBallScript    ; PLAYEREVENT_ITEMBALL
+	dba EdgeWarpScript          ; PLAYEREVENT_CONNECTION
+	dba WarpToNewMapScript      ; PLAYEREVENT_WARP
+	dba FallIntoMapScript       ; PLAYEREVENT_FALL
+	dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
+	dba HatchEggScript          ; PLAYEREVENT_HATCH
+	dba ChangeDirectionScript   ; PLAYEREVENT_JOYCHANGEFACING
+	dba Invalid_0x96b60         ; (NUM_PLAYER_EVENTS)
 
 Invalid_0x96b60:
 	end
@@ -1006,10 +1006,10 @@ LandAfterPitfallScript:
 	earthquake 16
 	end
 
-EdgeWarpScript: ; 4
-	reloadandreturn MAPSETUP_CONNECTION
+EdgeWarpScript:
+	reloadend MAPSETUP_CONNECTION
 
-ChangeDirectionScript: ; 9
+ChangeDirectionScript:
 	deactivatefacing 3
 	callasm EnableWildEncounters
 	end
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 11f3fc45..3ebc8dd4 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -206,9 +206,9 @@ ScriptCommandTable:
 	dw Script_prioritysjump              ; 8c
 	dw Script_warpcheck                  ; 8d
 	dw Script_stopandsjump               ; 8e
-	dw Script_return                     ; 8f
+	dw Script_endcallback                ; 8f
 	dw Script_end                        ; 90
-	dw Script_reloadandreturn            ; 91
+	dw Script_reloadend                  ; 91
 	dw Script_endall                     ; 92
 	dw Script_pokemart                   ; 93
 	dw Script_elevator                   ; 94
@@ -2072,7 +2072,7 @@ Script_newloadmap:
 	call StopScript
 	ret
 
-Script_reloadandreturn:
+Script_reloadend:
 	call Script_newloadmap
 	jp Script_end
 
@@ -2157,7 +2157,7 @@ Script_end:
 	call StopScript
 	ret
 
-Script_return:
+Script_endcallback:
 	call ExitScriptSubroutine
 	jr c, .dummy
 .dummy
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 2b939033..7b2646ed 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -387,11 +387,11 @@ Function901a1:
 
 LoadPhoneScriptBank:
 	memcall wPhoneScriptBank
-	return
+	endcallback
 
 LoadOutOfAreaScript:
 	scall PhoneOutOfAreaScript
-	return
+	endcallback
 
 LoadCallerScript:
 	nop
diff --git a/macros/legacy.asm b/macros/legacy.asm
index 016f0eff..18273ee3 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -113,6 +113,8 @@ if_not_equal    EQUS "ifnotequal"
 if_greater_than EQUS "ifgreater"
 if_less_than    EQUS "ifless"
 end_all         EQUS "endall"
+return          EQUS "endcallback"
+reloadandreturn EQUS "reloadend"
 
 checkmaptriggers EQUS "checkmapscene"
 domaptrigger     EQUS "setmapscene"
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index dc348178..606dd5dd 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -894,9 +894,9 @@ stopandsjump: MACRO
 	dw \1 ; pointer
 ENDM
 
-	const return_command ; $8f
-return: MACRO
-	db return_command
+	const endcallback_command ; $8f
+endcallback: MACRO
+	db endcallback_command
 ENDM
 
 	const end_command ; $90
@@ -904,9 +904,9 @@ end: MACRO
 	db end_command
 ENDM
 
-	const reloadandreturn_command ; $91
-reloadandreturn: MACRO
-	db reloadandreturn_command
+	const reloadend_command ; $91
+reloadend: MACRO
+	db reloadend_command
 	db \1 ; which_method
 ENDM
 
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index 714a470a..9e213c95 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -27,7 +27,7 @@ AzaleaTown_MapScripts:
 
 .Flypoint:
 	setflag ENGINE_FLYPOINT_AZALEA
-	return
+	endcallback
 
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11
diff --git a/maps/BlackthornCity.asm b/maps/BlackthornCity.asm
index 4e91c9bc..635cceba 100644
--- a/maps/BlackthornCity.asm
+++ b/maps/BlackthornCity.asm
@@ -18,17 +18,17 @@ BlackthornCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_BLACKTHORN
-	return
+	endcallback
 
 .Santos:
 	readvar VAR_WEEKDAY
 	ifequal SATURDAY, .SantosAppears
 	disappear BLACKTHORNCITY_SANTOS
-	return
+	endcallback
 
 .SantosAppears:
 	appear BLACKTHORNCITY_SANTOS
-	return
+	endcallback
 
 BlackthornSuperNerdScript:
 	faceplayer
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 183e747d..0f86b6b4 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -24,7 +24,7 @@ BlackthornGym1F_MapScripts:
 	iffalse .skip3
 	changeblock 8, 6, $3b ; fallen boulder 2
 .skip3
-	return
+	endcallback
 
 BlackthornGymClairScript:
 	faceplayer
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index bfbabef2..e50721b6 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -16,7 +16,7 @@ BlackthornGym2F_MapScripts:
 
 .SetUpStoneTable:
 	writecmdqueue .CommandQueue
-	return
+	endcallback
 
 .CommandQueue:
 	cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 03a1099c..bf13f4da 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -25,7 +25,7 @@ BrunosRoom_MapScripts:
 	iffalse .KeepExitClosed
 	changeblock 4, 2, $16 ; open door
 .KeepExitClosed:
-	return
+	endcallback
 
 .BrunosDoorLocksBehindYou:
 	applymovement PLAYER, BrunosRoom_EnterMovement
diff --git a/maps/CeladonCity.asm b/maps/CeladonCity.asm
index 514d8041..4c9f8ff4 100644
--- a/maps/CeladonCity.asm
+++ b/maps/CeladonCity.asm
@@ -17,7 +17,7 @@ CeladonCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CELADON
-	return
+	endcallback
 
 CeladonCityFisherScript:
 	jumptextfaceplayer CeladonCityFisherText
diff --git a/maps/CeruleanCity.asm b/maps/CeruleanCity.asm
index f482cf61..6758562f 100644
--- a/maps/CeruleanCity.asm
+++ b/maps/CeruleanCity.asm
@@ -14,7 +14,7 @@ CeruleanCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CERULEAN
-	return
+	endcallback
 
 CeruleanCityCooltrainerMScript:
 	faceplayer
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 553bb6ad..26d77300 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -21,7 +21,7 @@ CherrygroveCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CHERRYGROVE
-	return
+	endcallback
 
 CherrygroveCityGuideGent:
 	faceplayer
diff --git a/maps/CianwoodCity.asm b/maps/CianwoodCity.asm
index 1ce52179..895924a5 100644
--- a/maps/CianwoodCity.asm
+++ b/maps/CianwoodCity.asm
@@ -18,7 +18,7 @@ CianwoodCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CIANWOOD
-	return
+	endcallback
 
 CianwoodCityChucksWife:
 	faceplayer
diff --git a/maps/CinnabarIsland.asm b/maps/CinnabarIsland.asm
index 79e9a5cb..8284266d 100644
--- a/maps/CinnabarIsland.asm
+++ b/maps/CinnabarIsland.asm
@@ -9,7 +9,7 @@ CinnabarIsland_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CINNABAR
-	return
+	endcallback
 
 CinnabarIslandBlue:
 	faceplayer
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 863ca4bb..99b9f56b 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -22,12 +22,12 @@ Colosseum_MapScripts:
 	iffalse .Chris2
 	disappear COLOSSEUM_CHRIS2
 	appear COLOSSEUM_CHRIS1
-	return
+	endcallback
 
 .Chris2:
 	disappear COLOSSEUM_CHRIS1
 	appear COLOSSEUM_CHRIS2
-	return
+	endcallback
 
 .InitializeAndPreparePokecenter2F:
 	setscene SCENE_FINISHED
diff --git a/maps/DayCare.asm b/maps/DayCare.asm
index ba2fd1e0..64ab52d3 100644
--- a/maps/DayCare.asm
+++ b/maps/DayCare.asm
@@ -13,12 +13,12 @@ DayCare_MapScripts:
 	iftrue .PutDayCareManOutside
 	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
-	return
+	endcallback
 
 .PutDayCareManOutside:
 	setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
-	return
+	endcallback
 
 DayCareManScript_Inside:
 	faceplayer
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 77ca2610..73eaad56 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -13,18 +13,18 @@ DragonsDenB1F_MapScripts:
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
 	iftrue .CheckDay
 	disappear DRAGONSDENB1F_SILVER
-	return
+	endcallback
 
 .CheckDay:
 	readvar VAR_WEEKDAY
 	ifequal TUESDAY, .AppearSilver
 	ifequal THURSDAY, .AppearSilver
 	disappear DRAGONSDENB1F_SILVER
-	return
+	endcallback
 
 .AppearSilver:
 	appear DRAGONSDENB1F_SILVER
-	return
+	endcallback
 
 DragonsDenB1FDragonFangScript:
 	giveitem DRAGON_FANG
diff --git a/maps/EcruteakCity.asm b/maps/EcruteakCity.asm
index e7dc703d..0a3eb5c6 100644
--- a/maps/EcruteakCity.asm
+++ b/maps/EcruteakCity.asm
@@ -14,7 +14,7 @@ EcruteakCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_ECRUTEAK
-	return
+	endcallback
 
 EcruteakCityGramps1Script:
 	jumptextfaceplayer EcruteakCityGramps1Text
diff --git a/maps/FuchsiaCity.asm b/maps/FuchsiaCity.asm
index 79c9125c..f3a2dfb2 100644
--- a/maps/FuchsiaCity.asm
+++ b/maps/FuchsiaCity.asm
@@ -12,7 +12,7 @@ FuchsiaCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_FUCHSIA
-	return
+	endcallback
 
 FuchsiaCityYoungster:
 	jumptextfaceplayer FuchsiaCityYoungsterText
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index aa3860fa..26a66405 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -23,7 +23,7 @@ GoldenrodCity_MapScripts:
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_GOLDENROD
 	setflag ENGINE_REACHED_GOLDENROD
-	return
+	endcallback
 
 GoldenrodCityPokefanMScript:
 	jumptextfaceplayer GoldenrodCityPokefanMText
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index d07e6e48..a398243a 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -16,11 +16,11 @@ GoldenrodDeptStore5F_MapScripts:
 	readvar VAR_WEEKDAY
 	ifequal SUNDAY, .yes
 	disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
-	return
+	endcallback
 
 .yes
 	appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
-	return
+	endcallback
 
 GoldenrodDeptStore5FClerkScript:
 	faceplayer
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index e86cbcb3..f8dae3e6 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -30,19 +30,19 @@ GoldenrodDeptStoreB1F_MapScripts:
 	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_3
 	iftrue .Layout3
 	changeblock 10, 8, $0d ; floor
-	return
+	endcallback
 
 .Layout2:
 	changeblock 4, 10, $0d ; floor
-	return
+	endcallback
 
 .Layout3:
 	changeblock 10, 12, $0d ; floor
-	return
+	endcallback
 
 .Unblock:
 	clearevent EVENT_GOLDENROD_UNDERGROUND_WAREHOUSE_BLOCKED_OFF
-	return
+	endcallback
 
 GoldenrodDeptStoreB1FBlackBelt1Script:
 	jumptextfaceplayer GoldenrodDeptStoreB1FBlackBelt1Text
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 99860be6..49a413b2 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -38,16 +38,16 @@ GoldenrodUnderground_MapScripts:
 	clearevent EVENT_SWITCH_14
 	setval 0
 	writemem wUndergroundSwitchPositions
-	return
+	endcallback
 
 .CheckBasementKey:
 	checkevent EVENT_USED_BASEMENT_KEY
 	iffalse .LockBasementDoor
-	return
+	endcallback
 
 .LockBasementDoor:
 	changeblock 18, 6, $3d ; locked door
-	return
+	endcallback
 
 .CheckDayOfWeek:
 	readvar VAR_WEEKDAY
@@ -63,7 +63,7 @@ GoldenrodUnderground_MapScripts:
 	disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	appear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Monday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
@@ -74,42 +74,42 @@ GoldenrodUnderground_MapScripts:
 	disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Tuesday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
 	appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Wednesday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
 	disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Thursday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
 	appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Friday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
 	disappear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	appear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 .Saturday:
 	disappear GOLDENRODUNDERGROUND_GRAMPS
 	appear GOLDENRODUNDERGROUND_OLDER_HAIRCUT_BROTHER
 	disappear GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_BROTHER
 	appear GOLDENRODUNDERGROUND_GRANNY
-	return
+	endcallback
 
 TrainerSupernerdEric:
 	trainer SUPER_NERD, ERIC, EVENT_BEAT_SUPER_NERD_ERIC, SupernerdEricSeenText, SupernerdEricBeatenText, 0, .Script
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index c59ed938..52d2cc0d 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -108,7 +108,7 @@ GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
 	doorstate 15, CLOSED1
 	doorstate 16, OPEN1
 .false14
-	return
+	endcallback
 
 GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript:
 	jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_SuperNerdText
diff --git a/maps/GoldenrodUndergroundWarehouse.asm b/maps/GoldenrodUndergroundWarehouse.asm
index e0f95e38..cdc1b1b0 100644
--- a/maps/GoldenrodUndergroundWarehouse.asm
+++ b/maps/GoldenrodUndergroundWarehouse.asm
@@ -30,7 +30,7 @@ GoldenrodUndergroundWarehouse_MapScripts:
 	clearevent EVENT_SWITCH_14
 	setval 0
 	writemem wUndergroundSwitchPositions
-	return
+	endcallback
 
 TrainerGruntM24:
 	trainer GRUNTM, GRUNTM_24, EVENT_BEAT_ROCKET_GRUNTM_24, GruntM24SeenText, GruntM24BeatenText, 0, .Script
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 45c5a355..c141ab26 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -13,7 +13,7 @@ IcePathB1F_MapScripts:
 
 .SetUpStoneTable:
 	writecmdqueue .CommandQueue
-	return
+	endcallback
 
 .CommandQueue:
 	cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 6594aee5..7a745462 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -39,7 +39,7 @@ IndigoPlateauPokecenter1F_MapScripts:
 	clearevent EVENT_BEAT_ELITE_4_KAREN
 	clearevent EVENT_BEAT_CHAMPION_LANCE
 	setevent EVENT_LANCES_ROOM_OAK_AND_MARY
-	return
+	endcallback
 
 PlateauRivalBattle1:
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index 1d5a16ab..2dd40593 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -25,7 +25,7 @@ KarensRoom_MapScripts:
 	iffalse .KeepExitClosed
 	changeblock 4, 2, $16 ; open door
 .KeepExitClosed:
-	return
+	endcallback
 
 .KarensDoorLocksBehindYou:
 	applymovement PLAYER, KarensRoom_EnterMovement
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index ec86adba..67887ef8 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -25,7 +25,7 @@ KogasRoom_MapScripts:
 	iffalse .KeepExitClosed
 	changeblock 4, 2, $16 ; open door
 .KeepExitClosed:
-	return
+	endcallback
 
 .KogasDoorLocksBehindYou:
 	applymovement PLAYER, KogasRoom_EnterMovement
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index acf76eb1..236e0062 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -17,13 +17,13 @@ KurtsHouse_MapScripts:
 	iftrue .MakingBalls
 	disappear KURTSHOUSE_KURT2
 	appear KURTSHOUSE_KURT1
-	return
+	endcallback
 
 .MakingBalls:
 	disappear KURTSHOUSE_KURT1
 	appear KURTSHOUSE_KURT2
 .Done:
-	return
+	endcallback
 
 Kurt1:
 	faceplayer
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 00b6fb00..4fbe1a3f 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -29,17 +29,17 @@ LakeOfRage_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_LAKE_OF_RAGE
-	return
+	endcallback
 
 .Wesley:
 	readvar VAR_WEEKDAY
 	ifequal WEDNESDAY, .WesleyAppears
 	disappear LAKEOFRAGE_WESLEY
-	return
+	endcallback
 
 .WesleyAppears:
 	appear LAKEOFRAGE_WESLEY
-	return
+	endcallback
 
 LakeOfRageLanceScript:
 	checkevent EVENT_REFUSED_TO_HELP_LANCE_AT_LAKE_OF_RAGE
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index ae302a49..b98da1c7 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -27,7 +27,7 @@ LancesRoom_MapScripts:
 	iffalse .KeepExitClosed
 	changeblock 4, 0, $0b ; open door
 .KeepExitClosed:
-	return
+	endcallback
 
 .LancesDoorLocksBehindYou:
 	applymovement PLAYER, LancesRoom_EnterMovement
diff --git a/maps/LavenderTown.asm b/maps/LavenderTown.asm
index a1eda99c..a5ee5926 100644
--- a/maps/LavenderTown.asm
+++ b/maps/LavenderTown.asm
@@ -12,7 +12,7 @@ LavenderTown_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_LAVENDER
-	return
+	endcallback
 
 LavenderTownPokefanMScript:
 	jumptextfaceplayer LavenderTownPokefanMText
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index b3cb7ab0..01156bd7 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -23,11 +23,11 @@ MahoganyMart1F_MapScripts:
 .MahoganyMart1FStaircase:
 	checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART
 	iftrue .ShowStairs
-	return
+	endcallback
 
 .ShowStairs:
 	changeblock 6, 2, $1e ; stairs
-	return
+	endcallback
 
 MahoganyMart1FPharmacistScript:
 	faceplayer
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm
index d76b3383..b98baa26 100644
--- a/maps/MahoganyTown.asm
+++ b/maps/MahoganyTown.asm
@@ -22,7 +22,7 @@ MahoganyTown_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_MAHOGANY
-	return
+	endcallback
 
 MahoganyTownTryARageCandyBarScript:
 	showemote EMOTE_SHOCK, MAHOGANYTOWN_POKEFAN_M, 15
diff --git a/maps/MountMoonSquare.asm b/maps/MountMoonSquare.asm
index 977a4486..28a5519c 100644
--- a/maps/MountMoonSquare.asm
+++ b/maps/MountMoonSquare.asm
@@ -16,11 +16,11 @@ MountMoonSquare_MapScripts:
 
 .DisappearMoonStone:
 	setevent EVENT_MOUNT_MOON_SQUARE_HIDDEN_MOON_STONE
-	return
+	endcallback
 
 .DisappearRock:
 	disappear MOUNTMOONSQUARE_ROCK
-	return
+	endcallback
 
 ClefairyDance:
 	checkflag ENGINE_MT_MOON_SQUARE_CLEFAIRY
diff --git a/maps/NewBarkTown.asm b/maps/NewBarkTown.asm
index 5f9a98d5..374ea261 100644
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -20,7 +20,7 @@ NewBarkTown_MapScripts:
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_NEW_BARK
 	clearevent EVENT_FIRST_TIME_BANKING_WITH_MOM
-	return
+	endcallback
 
 NewBarkTown_TeacherStopsYouScene1:
 	playmusic MUSIC_MOM
diff --git a/maps/OlivineCity.asm b/maps/OlivineCity.asm
index dfcf8877..cd8d03b7 100644
--- a/maps/OlivineCity.asm
+++ b/maps/OlivineCity.asm
@@ -20,7 +20,7 @@ OlivineCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_OLIVINE
-	return
+	endcallback
 
 OlivineCityRivalSceneTop:
 	turnobject PLAYER, LEFT
diff --git a/maps/PalletTown.asm b/maps/PalletTown.asm
index 9907e719..edf67d2a 100644
--- a/maps/PalletTown.asm
+++ b/maps/PalletTown.asm
@@ -10,7 +10,7 @@ PalletTown_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_PALLET
-	return
+	endcallback
 
 PalletTownTeacherScript:
 	jumptextfaceplayer PalletTownTeacherText
diff --git a/maps/PewterCity.asm b/maps/PewterCity.asm
index 9e9eb341..78df2ca8 100644
--- a/maps/PewterCity.asm
+++ b/maps/PewterCity.asm
@@ -13,7 +13,7 @@ PewterCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_PEWTER
-	return
+	endcallback
 
 PewterCityCooltrainerFScript:
 	jumptextfaceplayer PewterCityCooltrainerFText
diff --git a/maps/PlayersHouse2F.asm b/maps/PlayersHouse2F.asm
index 00b3e381..c1514423 100644
--- a/maps/PlayersHouse2F.asm
+++ b/maps/PlayersHouse2F.asm
@@ -21,14 +21,14 @@ PlayersHouse2F_MapScripts:
 	checkevent EVENT_INITIALIZED_EVENTS
 	iftrue .SkipInitialization
 	jumpstd InitializeEventsScript
-	return
+	endcallback
 
 .SkipInitialization:
-	return
+	endcallback
 
 .SetUpTileDecorations:
 	special ToggleMaptileDecorations
-	return
+	endcallback
 
 PlayersHouseRadioScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
diff --git a/maps/RadioTower3F.asm b/maps/RadioTower3F.asm
index b61529ca..2a9d0ea9 100644
--- a/maps/RadioTower3F.asm
+++ b/maps/RadioTower3F.asm
@@ -16,12 +16,12 @@ RadioTower3F_MapScripts:
 .CardKeyShutterCallback:
 	checkevent EVENT_USED_THE_CARD_KEY_IN_THE_RADIO_TOWER
 	iftrue .Change
-	return
+	endcallback
 
 .Change:
 	changeblock 14, 2, $2a ; open shutter
 	changeblock 14, 4, $01 ; floor
-	return
+	endcallback
 
 RadioTower3FSuperNerdScript:
 	jumptextfaceplayer RadioTower3FSuperNerdText
diff --git a/maps/Route16.asm b/maps/Route16.asm
index 9a00cc07..19b4b6f9 100644
--- a/maps/Route16.asm
+++ b/maps/Route16.asm
@@ -10,11 +10,11 @@ Route16_MapScripts:
 	readvar VAR_XCOORD
 	ifgreater 13, .CanWalk
 	setflag ENGINE_ALWAYS_ON_BIKE
-	return
+	endcallback
 
 .CanWalk:
 	clearflag ENGINE_ALWAYS_ON_BIKE
-	return
+	endcallback
 
 CyclingRoadSign:
 	jumptext CyclingRoadSignText
diff --git a/maps/Route17.asm b/maps/Route17.asm
index 8dc90d12..1c853ab4 100644
--- a/maps/Route17.asm
+++ b/maps/Route17.asm
@@ -13,7 +13,7 @@ Route17_MapScripts:
 .AlwaysOnBike:
 	setflag ENGINE_ALWAYS_ON_BIKE
 	setflag ENGINE_DOWNHILL
-	return
+	endcallback
 
 TrainerBikerCharles:
 	trainer BIKER, CHARLES, EVENT_BEAT_BIKER_CHARLES, BikerCharlesSeenText, BikerCharlesBeatenText, 0, .Script
diff --git a/maps/Route19.asm b/maps/Route19.asm
index 59749480..11e66960 100644
--- a/maps/Route19.asm
+++ b/maps/Route19.asm
@@ -22,7 +22,7 @@ Route19_MapScripts:
 	changeblock  4,  8, $7a ; rock
 	changeblock 10, 10, $7a ; rock
 .Done:
-	return
+	endcallback
 
 TrainerSwimmerfDawn:
 	trainer SWIMMERF, DAWN, EVENT_BEAT_SWIMMERF_DAWN, SwimmerfDawnSeenText, SwimmerfDawnBeatenText, 0, .Script
diff --git a/maps/Route20.asm b/maps/Route20.asm
index 9169212e..d04bc01c 100644
--- a/maps/Route20.asm
+++ b/maps/Route20.asm
@@ -11,7 +11,7 @@ Route20_MapScripts:
 
 .ClearRocks:
 	setevent EVENT_CINNABAR_ROCKS_CLEARED
-	return
+	endcallback
 
 TrainerSwimmerfNicole:
 	trainer SWIMMERF, NICOLE, EVENT_BEAT_SWIMMERF_NICOLE, SwimmerfNicoleSeenText, SwimmerfNicoleBeatenText, 0, .Script
diff --git a/maps/Route23.asm b/maps/Route23.asm
index 86e5935f..267accbe 100644
--- a/maps/Route23.asm
+++ b/maps/Route23.asm
@@ -6,7 +6,7 @@ Route23_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_INDIGO_PLATEAU
-	return
+	endcallback
 
 IndigoPlateauSign:
 	jumptext IndigoPlateauSignText
diff --git a/maps/Route29.asm b/maps/Route29.asm
index fe5a8257..8273a4fc 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -28,13 +28,13 @@ Route29_MapScripts:
 
 .TuscanyDisappears:
 	disappear ROUTE29_TUSCANY
-	return
+	endcallback
 
 .DoesTuscanyAppear:
 	readvar VAR_WEEKDAY
 	ifnotequal TUESDAY, .TuscanyDisappears
 	appear ROUTE29_TUSCANY
-	return
+	endcallback
 
 Route29Tutorial1:
 	turnobject ROUTE29_COOLTRAINER_M1, UP
diff --git a/maps/Route31.asm b/maps/Route31.asm
index 58e326fb..00ef7ed3 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -16,11 +16,11 @@ Route31_MapScripts:
 .CheckMomCall:
 	checkevent EVENT_TALKED_TO_MOM_AFTER_MYSTERY_EGG_QUEST
 	iffalse .DoMomCall
-	return
+	endcallback
 
 .DoMomCall:
 	specialphonecall SPECIALCALL_WORRIED
-	return
+	endcallback
 
 TrainerBugCatcherWade1:
 	trainer BUG_CATCHER, WADE1, EVENT_BEAT_BUG_CATCHER_WADE, BugCatcherWade1SeenText, BugCatcherWade1BeatenText, 0, .Script
diff --git a/maps/Route32.asm b/maps/Route32.asm
index e9ff6ce3..bf64268e 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -36,11 +36,11 @@ Route32_MapScripts:
 	readvar VAR_WEEKDAY
 	ifequal FRIDAY, .FriedaAppears
 	disappear ROUTE32_FRIEDA
-	return
+	endcallback
 
 .FriedaAppears:
 	appear ROUTE32_FRIEDA
-	return
+	endcallback
 
 Route32CooltrainerMScript:
 	faceplayer
diff --git a/maps/Route34.asm b/maps/Route34.asm
index 340b8f02..d4811773 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -44,11 +44,11 @@ Route34_MapScripts:
 	checkflag ENGINE_DAY_CARE_LADY_HAS_MON
 	iffalse .HideMon2
 	clearevent EVENT_DAY_CARE_MON_2
-	return
+	endcallback
 
 .HideMon2:
 	setevent EVENT_DAY_CARE_MON_2
-	return
+	endcallback
 
 DayCareManScript_Outside:
 	faceplayer
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index a9584e75..d33de362 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -27,11 +27,11 @@ Route35NationalParkGate_MapScripts:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
 	setscene SCENE_ROUTE35NATIONALPARKGATE_NOTHING
-	return
+	endcallback
 
 .BugContestIsRunning:
 	setscene SCENE_ROUTE35NATIONALPARKGATE_LEAVE_CONTEST_EARLY
-	return
+	endcallback
 
 .CheckIfContestAvailable:
 	readvar VAR_WEEKDAY
@@ -43,13 +43,13 @@ Route35NationalParkGate_MapScripts:
 	disappear ROUTE35NATIONALPARKGATE_OFFICER1
 	appear ROUTE35NATIONALPARKGATE_YOUNGSTER
 	appear ROUTE35NATIONALPARKGATE_OFFICER2
-	return
+	endcallback
 
 .SetContestOfficer:
 	appear ROUTE35NATIONALPARKGATE_OFFICER1
 	disappear ROUTE35NATIONALPARKGATE_YOUNGSTER
 	disappear ROUTE35NATIONALPARKGATE_OFFICER2
-	return
+	endcallback
 
 .LeavingContestEarly:
 	applymovement PLAYER, Route35NationalParkGatePlayerApproachOfficer1Movement
diff --git a/maps/Route36.asm b/maps/Route36.asm
index d0e5fdd9..34764ed7 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -17,11 +17,11 @@ Route36_MapScripts:
 	readvar VAR_WEEKDAY
 	ifequal THURSDAY, .ArthurAppears
 	disappear ROUTE36_ARTHUR
-	return
+	endcallback
 
 .ArthurAppears:
 	appear ROUTE36_ARTHUR
-	return
+	endcallback
 
 SudowoodoScript:
 	checkitem SQUIRTBOTTLE
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 0ffeb386..3a905ef5 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -36,11 +36,11 @@ Route36NationalParkGate_MapScripts:
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .BugContestIsRunning
 	setscene SCENE_ROUTE36NATIONALPARKGATE_NOTHING
-	return
+	endcallback
 
 .BugContestIsRunning:
 	setscene SCENE_ROUTE36NATIONALPARKGATE_LEAVE_CONTEST_EARLY
-	return
+	endcallback
 
 .CheckIfContestAvailable:
 	checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
@@ -53,13 +53,13 @@ Route36NationalParkGate_MapScripts:
 	iftrue .SetContestOfficer
 	disappear ROUTE36NATIONALPARKGATE_OFFICER1
 	appear ROUTE36NATIONALPARKGATE_OFFICER2
-	return
+	endcallback
 
 .SetContestOfficer:
 	appear ROUTE36NATIONALPARKGATE_OFFICER1
 	disappear ROUTE36NATIONALPARKGATE_OFFICER2
 .Return:
-	return
+	endcallback
 
 .LeavingContestEarly:
 	turnobject PLAYER, UP
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 549670b1..55e2f37f 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -17,11 +17,11 @@ Route37_MapScripts:
 	readvar VAR_WEEKDAY
 	ifequal SUNDAY, .SunnyAppears
 	disappear ROUTE37_SUNNY
-	return
+	endcallback
 
 .SunnyAppears:
 	appear ROUTE37_SUNNY
-	return
+	endcallback
 
 TrainerTwinsAnnandanne1:
 	trainer TWINS, ANNANDANNE1, EVENT_BEAT_TWINS_ANN_AND_ANNE, TwinsAnnandanne1SeenText, TwinsAnnandanne1BeatenText, 0, .Script
diff --git a/maps/Route40.asm b/maps/Route40.asm
index 6c45e6b4..4715a392 100644
--- a/maps/Route40.asm
+++ b/maps/Route40.asm
@@ -19,11 +19,11 @@ Route40_MapScripts:
 	readvar VAR_WEEKDAY
 	ifequal MONDAY, .MonicaAppears
 	disappear ROUTE40_MONICA
-	return
+	endcallback
 
 .MonicaAppears:
 	appear ROUTE40_MONICA
-	return
+	endcallback
 
 TrainerSwimmerfElaine:
 	trainer SWIMMERF, ELAINE, EVENT_BEAT_SWIMMERF_ELAINE, SwimmerfElaineSeenText, SwimmerfElaineBeatenText, 0, .Script
diff --git a/maps/Route43.asm b/maps/Route43.asm
index 16304ee5..b7d25da6 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -18,11 +18,11 @@ Route43_MapScripts:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
 	setmapscene ROUTE_43_GATE, SCENE_DEFAULT
-	return
+	endcallback
 
 .NoRockets:
 	setmapscene ROUTE_43_GATE, SCENE_FINISHED
-	return
+	endcallback
 
 TrainerCamperSpencer:
 	trainer CAMPER, SPENCER, EVENT_BEAT_CAMPER_SPENCER, CamperSpencerSeenText, CamperSpencerBeatenText, 0, .Script
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index e1f16337..3a2fa599 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -24,11 +24,11 @@ Route43Gate_MapScripts:
 	checkevent EVENT_CLEARED_ROCKET_HIDEOUT
 	iftrue .NoRockets
 	setmapscene ROUTE_43, 0 ; Route 43 does not have a scene variable
-	return
+	endcallback
 
 .NoRockets:
 	setmapscene ROUTE_43, 1 ; Route 43 does not have a scene variable
-	return
+	endcallback
 
 .RocketTakeover:
 	playmusic MUSIC_ROCKET_ENCOUNTER
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index f795b272..103df046 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -7,12 +7,12 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 .HiddenDoors:
 	checkevent EVENT_SOLVED_AERODACTYL_PUZZLE
 	iffalse .FloorClosed
-	return
+	endcallback
 
 .FloorClosed:
 	changeblock 2, 2, $01 ; left floor
 	changeblock 4, 2, $02 ; right floor
-	return
+	endcallback
 
 RuinsOfAlphAerodactylChamberPuzzle:
 	refreshscreen
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 57b13100..4fc7f21c 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -7,12 +7,12 @@ RuinsOfAlphHoOhChamber_MapScripts:
 .HiddenDoors:
 	checkevent EVENT_SOLVED_HO_OH_PUZZLE
 	iffalse .FloorClosed
-	return
+	endcallback
 
 .FloorClosed:
 	changeblock 2, 2, $01 ; left floor
 	changeblock 4, 2, $02 ; right floor
-	return
+	endcallback
 
 RuinsOfAlphHoOhChamberPuzzle:
 	refreshscreen
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 7e8377b1..865f6874 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -13,12 +13,12 @@ RuinsOfAlphKabutoChamberReceptionistScript:
 RuinsOfAlphKabutoChamberHiddenDoors:
 	checkevent EVENT_SOLVED_KABUTO_PUZZLE
 	iffalse .FloorClosed
-	return
+	endcallback
 
 .FloorClosed:
 	changeblock 2, 2, $01 ; left floor
 	changeblock 4, 2, $02 ; right floor
-	return
+	endcallback
 
 RuinsOfAlphKabutoChamberPuzzle:
 	refreshscreen
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index fc8bf60f..c46aae2a 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -7,12 +7,12 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 .HiddenDoors:
 	checkevent EVENT_SOLVED_OMANYTE_PUZZLE
 	iffalse .FloorClosed
-	return
+	endcallback
 
 .FloorClosed:
 	changeblock 2, 2, $01 ; left floor
 	changeblock 4, 2, $02 ; right floor
-	return
+	endcallback
 
 RuinsOfAlphOmanyteChamberPuzzle:
 	refreshscreen
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index af06bbae..b0c9cab7 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -34,12 +34,12 @@ RuinsOfAlphOutside_MapScripts:
 .YesScientist:
 	appear RUINSOFALPHOUTSIDE_SCIENTIST
 	setscene SCENE_RUINSOFALPHOUTSIDE_GET_UNOWN_DEX
-	return
+	endcallback
 
 .NoScientist:
 	disappear RUINSOFALPHOUTSIDE_SCIENTIST
 	setscene SCENE_RUINSOFALPHOUTSIDE_NOTHING
-	return
+	endcallback
 
 RuinsOfAlphOutsideScientistScene1:
 	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 05948048..460241fe 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -21,12 +21,12 @@ RuinsOfAlphResearchCenter_MapScripts:
 .ScientistCallback:
 	checkscene
 	ifequal SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX, .ShowScientist
-	return
+	endcallback
 
 .ShowScientist:
 	moveobject RUINSOFALPHRESEARCHCENTER_SCIENTIST3, 3, 7
 	appear RUINSOFALPHRESEARCHCENTER_SCIENTIST3
-	return
+	endcallback
 
 .GetUnownDexScript:
 	applymovement RUINSOFALPHRESEARCHCENTER_SCIENTIST3, MovementData_0x110b15
diff --git a/maps/SaffronCity.asm b/maps/SaffronCity.asm
index 3914d4d2..d8828471 100644
--- a/maps/SaffronCity.asm
+++ b/maps/SaffronCity.asm
@@ -16,7 +16,7 @@ SaffronCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_SAFFRON
-	return
+	endcallback
 
 SaffronCityLass1Script:
 	faceplayer
diff --git a/maps/SilverCaveOutside.asm b/maps/SilverCaveOutside.asm
index 171468e0..a578b026 100644
--- a/maps/SilverCaveOutside.asm
+++ b/maps/SilverCaveOutside.asm
@@ -6,7 +6,7 @@ SilverCaveOutside_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_SILVER_CAVE
-	return
+	endcallback
 
 MtSilverPokecenterSign:
 	jumpstd PokecenterSignScript
diff --git a/maps/TeamRocketBaseB1F.asm b/maps/TeamRocketBaseB1F.asm
index d74f05bb..bce4cbab 100644
--- a/maps/TeamRocketBaseB1F.asm
+++ b/maps/TeamRocketBaseB1F.asm
@@ -18,7 +18,7 @@ TeamRocketBaseB1F_MapScripts:
 
 .HideSecurityGrunt:
 	disappear TEAMROCKETBASEB1F_ROCKET1
-	return
+	endcallback
 
 SecurityCamera1a:
 	checkevent EVENT_SECURITY_CAMERA_1
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index a3569fc1..399b0fad 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -39,11 +39,11 @@ TeamRocketBaseB2F_MapScripts:
 .TransmitterDoorCallback:
 	checkevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER
 	iftrue .OpenDoor
-	return
+	endcallback
 
 .OpenDoor:
 	changeblock 14, 12, $07 ; floor
-	return
+	endcallback
 
 RocketBaseBossFLeft:
 	moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 209f0057..410625cb 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -39,11 +39,11 @@ TeamRocketBaseB3F_MapScripts:
 .CheckGiovanniDoor:
 	checkevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE
 	iftrue .OpenSesame
-	return
+	endcallback
 
 .OpenSesame:
 	changeblock 10, 8, $07 ; floor
-	return
+	endcallback
 
 LanceGetPasswordScript:
 	turnobject PLAYER, LEFT
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 7edc4499..ca6c897e 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -22,12 +22,12 @@ TimeCapsule_MapScripts:
 	iffalse .Chris2
 	disappear TIMECAPSULE_CHRIS2
 	appear TIMECAPSULE_CHRIS1
-	return
+	endcallback
 
 .Chris2:
 	disappear TIMECAPSULE_CHRIS1
 	appear TIMECAPSULE_CHRIS2
-	return
+	endcallback
 
 .InitializeAndPreparePokecenter2F:
 	setscene SCENE_FINISHED
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index 08108cc8..30a40737 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -16,11 +16,11 @@ TinTowerRoof_MapScripts:
 
 .Appear:
 	appear TINTOWERROOF_HO_OH
-	return
+	endcallback
 
 .NoAppear:
 	disappear TINTOWERROOF_HO_OH
-	return
+	endcallback
 
 TinTowerHoOh:
 	faceplayer
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index b7b70897..4ac5ad2a 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -22,12 +22,12 @@ TradeCenter_MapScripts:
 	iffalse .Chris2
 	disappear TRADECENTER_CHRIS2
 	appear TRADECENTER_CHRIS1
-	return
+	endcallback
 
 .Chris2:
 	disappear TRADECENTER_CHRIS1
 	appear TRADECENTER_CHRIS2
-	return
+	endcallback
 
 .InitializeAndPreparePokecenter2F:
 	setscene SCENE_FINISHED
diff --git a/maps/UnionCaveB2F.asm b/maps/UnionCaveB2F.asm
index 71973831..59a3cd02 100644
--- a/maps/UnionCaveB2F.asm
+++ b/maps/UnionCaveB2F.asm
@@ -19,11 +19,11 @@ UnionCaveB2F_MapScripts:
 	ifequal FRIDAY, .Appear
 .NoAppear:
 	disappear UNIONCAVEB2F_LAPRAS
-	return
+	endcallback
 
 .Appear:
 	appear UNIONCAVEB2F_LAPRAS
-	return
+	endcallback
 
 UnionCaveLapras:
 	faceplayer
diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 46d70be6..63dd15be 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -14,7 +14,7 @@ VermilionCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_VERMILION
-	return
+	endcallback
 
 VermilionCityTeacherScript:
 	jumptextfaceplayer VermilionCityTeacherText
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 494fdea3..626f7090 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -20,7 +20,7 @@ VermilionPort_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_VERMILION
-	return
+	endcallback
 
 .LeaveFastShipScript:
 	applymovement PLAYER, MovementData_0x16c65b
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 0c97b044..a0b311e7 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -16,7 +16,7 @@ VioletCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_VIOLET
-	return
+	endcallback
 
 VioletCityEarlScript:
 	applymovement VIOLETCITY_EARL, VioletCitySpinningEarl_MovementData
diff --git a/maps/ViridianCity.asm b/maps/ViridianCity.asm
index 1f789f36..aef09e14 100644
--- a/maps/ViridianCity.asm
+++ b/maps/ViridianCity.asm
@@ -12,7 +12,7 @@ ViridianCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_VIRIDIAN
-	return
+	endcallback
 
 ViridianCityCoffeeGramps:
 	faceplayer
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index c3446319..cbe55491 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -16,11 +16,11 @@ WhirlIslandLugiaChamber_MapScripts:
 
 .Appear:
 	appear WHIRLISLANDLUGIACHAMBER_LUGIA
-	return
+	endcallback
 
 .NoAppear:
 	disappear WHIRLISLANDLUGIACHAMBER_LUGIA
-	return
+	endcallback
 
 Lugia:
 	faceplayer
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 42451e12..ea340aef 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -25,7 +25,7 @@ WillsRoom_MapScripts:
 	iffalse .KeepExitClosed
 	changeblock 4, 2, $16 ; open door
 .KeepExitClosed:
-	return
+	endcallback
 
 .WillsDoorLocksBehindYou:
 	applymovement PLAYER, WillsRoom_EnterMovement