return → endcallback, reloadandreturn → reloadend

docs/event_commands.md

@@ -479,13 +479,13 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
 ## `$8F`: <code>stopandsjump <i>script</i></code>
 
 
-## `$90`: `return`
+## `$90`: `endcallback`
 
 
 ## `$91`: `end`
 
 
-## `$92`: <code>reloadandreturn <i>which_method</i></code>
+## `$92`: <code>reloadend <i>which_method</i></code>
 
 
 ## `$93`: `endall`

docs/map_event_scripts.md

@@ -68,7 +68,7 @@
 
 .Boulders:
 	writecmdqueue .BoulderCmdQueue
-	return
+	endcallback
 
 .BoulderCmdQueue:
 	cmdqueue CMDQUEUE_STONETABLE, .BoulderTable

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 Invalid_0x96c2d         ; PLAYEREVENT_NONE
-	dba SeenByTrainerScript      ; PLAYEREVENT_SEENBYTRAINER
+	dba SeenByTrainerScript     ; PLAYEREVENT_SEENBYTRAINER
-	dba TalkToTrainerScript      ; PLAYEREVENT_TALKTOTRAINER
+	dba TalkToTrainerScript     ; PLAYEREVENT_TALKTOTRAINER
-	dba FindItemInBallScript     ; PLAYEREVENT_ITEMBALL
+	dba FindItemInBallScript    ; PLAYEREVENT_ITEMBALL
-	dba EdgeWarpScript           ; PLAYEREVENT_CONNECTION
+	dba EdgeWarpScript          ; PLAYEREVENT_CONNECTION
-	dba WarpToNewMapScript       ; PLAYEREVENT_WARP
+	dba WarpToNewMapScript      ; PLAYEREVENT_WARP
-	dba FallIntoMapScript        ; PLAYEREVENT_FALL
+	dba FallIntoMapScript       ; PLAYEREVENT_FALL
-	dba Script_OverworldWhiteout ; PLAYEREVENT_WHITEOUT
+	dba OverworldWhiteoutScript ; PLAYEREVENT_WHITEOUT
-	dba HatchEggScript           ; PLAYEREVENT_HATCH
+	dba HatchEggScript          ; PLAYEREVENT_HATCH
-	dba ChangeDirectionScript    ; PLAYEREVENT_JOYCHANGEFACING
+	dba ChangeDirectionScript   ; PLAYEREVENT_JOYCHANGEFACING
-	dba Invalid_0x96c2d          ; (NUM_PLAYER_EVENTS)
+	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

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"

macros/scripts/events.asm

@@ -900,9 +900,9 @@ stopandsjump: MACRO
 	dw \1 ; pointer
 ENDM
 
-	const return_command ; $90
+	const endcallback_command ; $90
-return: MACRO
+endcallback: MACRO
-	db return_command
+	db endcallback_command
 ENDM
 
 	const end_command ; $91
@@ -910,9 +910,9 @@ end: MACRO
 	db end_command
 ENDM
 
-	const reloadandreturn_command ; $92
+	const reloadend_command ; $92
-reloadandreturn: MACRO
+reloadend: MACRO
-	db reloadandreturn_command
+	db reloadend_command
 	db \1 ; which_method
 ENDM
 

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