return → endcallback, reloadandreturn → reloadend

engine/events/poisonstep.asm

@@ -115,7 +115,7 @@ DoPoisonStep::
 	end
 
 .whiteout
-	farsjump Script_OverworldWhiteout
+	farsjump OverworldWhiteoutScript
 
 .CheckWhitedOut:
 	xor a

engine/events/std_scripts.asm

@@ -614,7 +614,7 @@ InitializeEventsScript:
 	setevent EVENT_SAFFRON_TRAIN_STATION_POPULATION
 	setevent EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
 	setevent EVENT_INITIALIZED_EVENTS
-	return
+	endcallback
 
 AskNumber1MScript:
 	special RandomPhoneMon

engine/events/whiteout.asm

@@ -2,7 +2,7 @@ Script_BattleWhiteout::
 	callasm BattleBGMap
 	sjump Script_Whiteout
 
-Script_OverworldWhiteout::
+OverworldWhiteoutScript::
 	refreshscreen
 	callasm OverworldBGMap
 

engine/overworld/events.asm

@@ -975,17 +975,17 @@ DoPlayerEvent:
 
 PlayerEventScriptPointers:
 ; entries correspond to PLAYEREVENT_* constants
-	dba Invalid_0x96c2d          ; 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_0x96c2d          ; (NUM_PLAYER_EVENTS)
+	dba Invalid_0x96c2d         ; 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_0x96c2d         ; (NUM_PLAYER_EVENTS)
 
 Invalid_0x96c2d:
 	end
@@ -1019,7 +1019,7 @@ LandAfterPitfallScript:
 	end
 
 EdgeWarpScript: ; 4
-	reloadandreturn MAPSETUP_CONNECTION
+	reloadend MAPSETUP_CONNECTION
 
 ChangeDirectionScript: ; 9
 	deactivatefacing 3

engine/overworld/scripting.asm

@@ -207,9 +207,9 @@ ScriptCommandTable:
 	dw Script_prioritysjump              ; 8d
 	dw Script_warpcheck                  ; 8e
 	dw Script_stopandsjump               ; 8f
-	dw Script_return                     ; 90
+	dw Script_endcallback                ; 90
 	dw Script_end                        ; 91
-	dw Script_reloadandreturn            ; 92
+	dw Script_reloadend                  ; 92
 	dw Script_endall                     ; 93
 	dw Script_pokemart                   ; 94
 	dw Script_elevator                   ; 95
@@ -2186,7 +2186,7 @@ Script_newloadmap:
 	call StopScript
 	ret
 
-Script_reloadandreturn:
+Script_reloadend:
 	call Script_newloadmap
 	jp Script_end
 
@@ -2265,7 +2265,7 @@ Script_end:
 	call StopScript
 	ret
 
-Script_return:
+Script_endcallback:
 	call ExitScriptSubroutine
 	jr c, .dummy
 .dummy

engine/phone/phone.asm

@@ -380,11 +380,11 @@ Function90199:
 
 LoadPhoneScriptBank:
 	memcall wPhoneScriptBank
-	return
+	endcallback
 
 LoadOutOfAreaScript:
 	scall PhoneOutOfAreaScript
-	return
+	endcallback
 
 LoadCallerScript:
 	nop