return → endcallback, reloadandreturn → reloadend

maps/AzaleaTown.asm

@@ -32,7 +32,7 @@ AzaleaTown_MapScripts:
 
 .Flypoint:
 	setflag ENGINE_FLYPOINT_AZALEA
-	return
+	endcallback
 
 AzaleaTownRivalBattleScene1:
 	moveobject AZALEATOWN_SILVER, 11, 11

maps/BattleTowerOutside.asm

@@ -12,11 +12,11 @@ BattleTowerOutside_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .Callback2
 
 .Callback1:
-	return
+	endcallback
 
 .Callback2:
 	clearevent EVENT_BATTLE_TOWER_OUTSIDE_SAILOR
-	return
+	endcallback
 
 BattleTowerOutsideYoungsterScript:
 	jumptextfaceplayer BattleTowerOutsideYoungsterText

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

maps/BlackthornGym1F.asm

@@ -24,7 +24,7 @@ BlackthornGym1F_MapScripts:
 	iffalse .skip3
 	changeblock 8, 6, $3b ; fallen boulder 2
 .skip3
-	return
+	endcallback
 
 BlackthornGymClairScript:
 	faceplayer

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

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

maps/BurnedTower1F.asm

@@ -33,7 +33,7 @@ BurnedTower1F_MapScripts:
 	iftrue .HideBasement
 	changeblock 6, 14, $09 ; ladder
 .HideBasement:
-	return
+	endcallback
 
 .MeetEusine:
 	turnobject BURNEDTOWER1F_EUSINE, DOWN

maps/BurnedTowerB1F.asm

@@ -28,7 +28,7 @@ BurnedTowerB1F_MapScripts:
 	iftrue .HideLadder
 	changeblock 6, 14, $02 ; floor
 .HideLadder:
-	return
+	endcallback
 
 ReleaseTheBeasts:
 	playmusic MUSIC_NONE

maps/CeladonCity.asm

@@ -17,7 +17,7 @@ CeladonCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CELADON
-	return
+	endcallback
 
 CeladonCityFisherScript:
 	jumptextfaceplayer CeladonCityFisherText

maps/CeladonDeptStore6F.asm

@@ -14,7 +14,7 @@ CeladonDeptStore6F_MapScripts:
 
 .HideRooftopStairs:
 	changeblock 12, 0, $03 ; wall
-	return
+	endcallback
 
 CeladonDeptStore6FSuperNerdScript:
 	jumptextfaceplayer CeladonDeptStore6FSuperNerdText

maps/CeruleanCity.asm

@@ -14,7 +14,7 @@ CeruleanCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CERULEAN
-	return
+	endcallback
 
 CeruleanCityCooltrainerMScript:
 	faceplayer

maps/CherrygroveCity.asm

@@ -21,7 +21,7 @@ CherrygroveCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CHERRYGROVE
-	return
+	endcallback
 
 CherrygroveCityGuideGent:
 	faceplayer

maps/CianwoodCity.asm

@@ -33,7 +33,7 @@ CianwoodCity_MapScripts:
 	iffalse .Done
 	disappear CIANWOODCITY_EUSINE
 .Done:
-	return
+	endcallback
 
 CianwoodCitySuicuneAndEusine:
 	turnobject PLAYER, UP

maps/CinnabarIsland.asm

@@ -9,7 +9,7 @@ CinnabarIsland_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_CINNABAR
-	return
+	endcallback
 
 CinnabarIslandBlue:
 	faceplayer

maps/Colosseum.asm

@@ -27,16 +27,16 @@ Colosseum_MapScripts:
 	iffalse .Chris2
 	disappear COLOSSEUM_CHRIS2
 	appear COLOSSEUM_CHRIS1
-	return
+	endcallback
 
 .Chris2:
 	disappear COLOSSEUM_CHRIS1
 	appear COLOSSEUM_CHRIS2
-	return
+	endcallback
 
 .PreparePokecenter2F:
 	setmapscene POKECENTER_2F, SCENE_POKECENTER2F_LEAVE_COLOSSEUM
-	return
+	endcallback
 
 .InitializeAndPreparePokecenter2F:
 	setscene SCENE_FINISHED

maps/CopycatsHouse2F.asm

@@ -22,7 +22,7 @@ CopycatsHouse2F_MapScripts:
 	disappear COPYCATSHOUSE2F_COPYCAT1
 	appear COPYCATSHOUSE2F_COPYCAT2
 .Done:
-	return
+	endcallback
 
 Copycat:
 	faceplayer

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

maps/DragonsDenB1F.asm

@@ -27,18 +27,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
 
 DragonsDenB1F_ClairScene:
 	appear DRAGONSDENB1F_CLAIR

maps/EcruteakCity.asm

@@ -15,7 +15,7 @@ EcruteakCity_MapScripts:
 
 .FlyPoint:
 	setflag ENGINE_FLYPOINT_ECRUTEAK
-	return
+	endcallback
 
 EcruteakCityGramps1Script:
 	jumptextfaceplayer EcruteakCityGramps1Text

maps/EcruteakTinTowerEntrance.asm

@@ -25,7 +25,7 @@ EcruteakTinTowerEntrance_MapScripts:
 	iftrue .DontBlockTower
 	checkevent EVENT_CLEARED_RADIO_TOWER
 	iftrue .BlockTower
-	return
+	endcallback
 
 .BlockTower:
 	clearevent EVENT_RANG_CLEAR_BELL_1
@@ -35,11 +35,11 @@ EcruteakTinTowerEntrance_MapScripts:
 	iftrue .NoClearBell
 	setscene SCENE_DEFAULT
 .NoClearBell:
-	return
+	endcallback
 
 .DontBlockTower:
 	clearevent EVENT_ECRUTEAK_TIN_TOWER_ENTRANCE_WANDERING_SAGE
-	return
+	endcallback
 
 EcruteakTinTowerEntrance_CoordEvent1:
 	checkevent EVENT_RANG_CLEAR_BELL_2