Rename prioritysjump to sdefer

docs/event_commands.md

@@ -470,7 +470,7 @@ If <code><i>item_id</i></code> = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
 ## `$8C`: <code>deactivatefacing <i>length</i></code>
 
 
-## `$8D`: <code>prioritysjump <i>script</i></code>
+## `$8D`: <code>sdefer <i>script</i></code>
 
 
 ## `$8E`: `warpcheck`

engine/overworld/events.asm

@@ -436,11 +436,11 @@ endr
 	bit 3, [hl]
 	jr z, .nope
 
-	ld hl, wPriorityScriptAddr
+	ld hl, wDeferredScriptAddr
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [wPriorityScriptBank]
+	ld a, [wDeferredScriptBank]
 	call CallScript
 	scf
 	ret

engine/overworld/scripting.asm

@@ -205,7 +205,7 @@ ScriptCommandTable:
 	dw Script_newloadmap                 ; 8a
 	dw Script_pause                      ; 8b
 	dw Script_deactivatefacing           ; 8c
-	dw Script_prioritysjump              ; 8d
+	dw Script_sdefer                     ; 8d
 	dw Script_warpcheck                  ; 8e
 	dw Script_stopandsjump               ; 8f
 	dw Script_endcallback                ; 90
@@ -1388,13 +1388,13 @@ ScriptJump:
 	ld [wScriptPos + 1], a
 	ret
 
-Script_prioritysjump:
+Script_sdefer:
 	ld a, [wScriptBank]
-	ld [wPriorityScriptBank], a
+	ld [wDeferredScriptBank], a
 	call GetScriptByte
-	ld [wPriorityScriptAddr], a
+	ld [wDeferredScriptAddr], a
 	call GetScriptByte
-	ld [wPriorityScriptAddr + 1], a
+	ld [wDeferredScriptAddr + 1], a
 	ld hl, wScriptFlags
 	set 3, [hl]
 	ret

macros/legacy.asm

@@ -119,7 +119,8 @@ checknite EQUS "checktime NITE"
 
 jump           EQUS "sjump"
 farjump        EQUS "farsjump"
-priorityjump   EQUS "prioritysjump"
+priorityjump   EQUS "sdefer"
+prioritysjump  EQUS "sdefer"
 ptcall         EQUS "memcall"
 ptjump         EQUS "memjump"
 ptpriorityjump EQUS "stopandsjump"

macros/scripts/events.asm

@@ -883,9 +883,9 @@ deactivatefacing: MACRO
 	db \1 ; time
 ENDM
 
-	const prioritysjump_command ; $8d
+	const sdefer_command ; $8d
-prioritysjump: MACRO
+sdefer: MACRO
-	db prioritysjump_command
+	db sdefer_command
 	dw \1 ; pointer
 ENDM
 

maps/BattleTower1F.asm

@@ -26,11 +26,11 @@ BattleTower1F_MapScripts:
 	writetext Text_WeveBeenWaitingForYou
 	waitbutton
 	closetext
-	prioritysjump Script_ResumeBattleTowerChallenge
+	sdefer Script_ResumeBattleTowerChallenge
 	end
 
 .LeftWithoutSaving
-	prioritysjump BattleTower_LeftWithoutSaving
+	sdefer BattleTower_LeftWithoutSaving
 	setval BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
 	setval BATTLETOWERACTION_06

maps/BattleTowerBattleRoom.asm

@@ -11,7 +11,7 @@ BattleTowerBattleRoom_MapScripts:
 
 .EnterBattleRoom:
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
-	prioritysjump Script_BattleRoom
+	sdefer Script_BattleRoom
 	setscene SCENE_FINISHED
 .DummyScene:
 	end

maps/BattleTowerElevator.asm

@@ -9,7 +9,7 @@ BattleTowerElevator_MapScripts:
 	def_callbacks
 
 .Scene0:
-	prioritysjump .RideElevator
+	sdefer .RideElevator
 	setscene SCENE_FINISHED
 .Scene1:
 	end

maps/BattleTowerHallway.asm

@@ -9,7 +9,7 @@ BattleTowerHallway_MapScripts:
 	def_callbacks
 
 .Scene0:
-	prioritysjump .ChooseBattleRoom
+	sdefer .ChooseBattleRoom
 	setscene SCENE_FINISHED
 .Scene1:
 	end

maps/BrunosRoom.asm

@@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
-	prioritysjump .BrunosDoorLocksBehindYou
+	sdefer .BrunosDoorLocksBehindYou
 	end
 
 .DummyScene:

maps/BurnedTower1F.asm

@@ -15,7 +15,7 @@ BurnedTower1F_MapScripts:
 	callback MAPCALLBACK_TILES, .HoleAndLadder
 
 .EusineScene:
-	prioritysjump .MeetEusine
+	sdefer .MeetEusine
 	end
 
 .DummyScene1:

maps/CeruleanGym.asm

@@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
 	end
 
 .GruntRunsOut:
-	prioritysjump .GruntRunsOutScript
+	sdefer .GruntRunsOutScript
 	end
 
 .GruntRunsOutScript:

maps/Colosseum.asm

@@ -13,7 +13,7 @@ Colosseum_MapScripts:
 	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
 
 .InitializeColosseum:
-	prioritysjump .InitializeAndPreparePokecenter2F
+	sdefer .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene1:

maps/DragonShrine.asm

@@ -12,7 +12,7 @@ DragonShrine_MapScripts:
 	def_callbacks
 
 .DragonShrineTest:
-	prioritysjump .DragonShrineTestScript
+	sdefer .DragonShrineTestScript
 	end
 
 .DummyScene:

maps/EcruteakGym.asm

@@ -15,7 +15,7 @@ EcruteakGym_MapScripts:
 	def_callbacks
 
 .ForcedToLeave:
-	prioritysjump EcruteakGymClosed
+	sdefer EcruteakGymClosed
 	end
 
 .DummyScene:

maps/EcruteakPokecenter1F.asm

@@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts:
 	def_callbacks
 
 .MeetBill:
-	prioritysjump .BillActivatesTimeCapsule
+	sdefer .BillActivatesTimeCapsule
 	end
 
 .DummyScene:

maps/ElmsLab.asm

@@ -19,7 +19,7 @@ ElmsLab_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
 
 .MeetElm:
-	prioritysjump .WalkUpToElm
+	sdefer .WalkUpToElm
 	end
 
 .DummyScene1:

maps/FastShip1F.asm

@@ -16,7 +16,7 @@ FastShip1F_MapScripts:
 	end
 
 .EnterFastShip:
-	prioritysjump .EnterFastShipScript
+	sdefer .EnterFastShipScript
 	end
 
 .DummyScene2:

maps/HallOfFame.asm

@@ -9,7 +9,7 @@ HallOfFame_MapScripts:
 	def_callbacks
 
 .EnterHallOfFame:
-	prioritysjump .EnterHallOfFameScript
+	sdefer .EnterHallOfFameScript
 	end
 
 .DummyScene:

maps/KarensRoom.asm

@@ -10,7 +10,7 @@ KarensRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
 
 .LockDoor:
-	prioritysjump .KarensDoorLocksBehindYou
+	sdefer .KarensDoorLocksBehindYou
 	end
 
 .DummyScene: