Rename `prioritysjump` to `sdefer`

32 files changed, 45 insertions, 44 deletions

diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index b8110001..623638b4 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -423,11 +423,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
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 50ebbb04..28506813 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -204,7 +204,7 @@ ScriptCommandTable:
 	dw Script_newloadmap                 ; 89
 	dw Script_pause                      ; 8a
 	dw Script_deactivatefacing           ; 8b
-	dw Script_prioritysjump              ; 8c
+	dw Script_sdefer                     ; 8c
 	dw Script_warpcheck                  ; 8d
 	dw Script_stopandsjump               ; 8e
 	dw Script_endcallback                ; 8f
@@ -1294,13 +1294,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
diff --git a/macros/legacy.asm b/macros/legacy.asm
index 3b1d8c5f..c5d43d0d 100644
--- a/macros/legacy.asm
+++ b/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"
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 64580a82..89d25fa8 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -877,9 +877,9 @@ deactivatefacing: MACRO
 	db \1 ; time
 ENDM
 
-	const prioritysjump_command ; $8c
-prioritysjump: MACRO
-	db prioritysjump_command
+	const sdefer_command ; $8c
+sdefer: MACRO
+	db sdefer_command
 	dw \1 ; pointer
 ENDM
 
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index b9fdef79..bf06a6c9 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
-	prioritysjump .BrunosDoorLocksBehindYou
+	sdefer .BrunosDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 9e01e530..f99e8924 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -17,7 +17,7 @@ BurnedTower1F_MapScripts:
 	def_callbacks
 
 .RivalScene:
-	prioritysjump .Rival
+	sdefer .Rival
 	end
 
 .DummyScene1:
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 82c08b38..67851b33 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
 	end
 
 .GruntRunsOut:
-	prioritysjump .GruntRunsOutScript
+	sdefer .GruntRunsOutScript
 	end
 
 .GruntRunsOutScript:
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index 424a9dbc..377e21be 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -11,7 +11,7 @@ Colosseum_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeColosseum:
-	prioritysjump .InitializeAndPreparePokecenter2F
+	sdefer .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene1:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 357d4342..e15407cf 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts:
 	def_callbacks
 
 .MeetBill:
-	prioritysjump .BillActivatesTimeCapsule
+	sdefer .BillActivatesTimeCapsule
 	end
 
 .DummyScene:
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 09fd2971..b3dafe46 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -18,7 +18,7 @@ ElmsLab_MapScripts:
 	def_callbacks
 
 .MeetElm:
-	prioritysjump .WalkUpToElm
+	sdefer .WalkUpToElm
 	end
 
 .DummyScene1:
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index b61f2291..d4d621ad 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -16,7 +16,7 @@ FastShip1F_MapScripts:
 	end
 
 .EnterFastShip:
-	prioritysjump .EnterFastShipScript
+	sdefer .EnterFastShipScript
 	end
 
 .DummyScene2:
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index bc95990b..a6a3b612 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -9,7 +9,7 @@ HallOfFame_MapScripts:
 	def_callbacks
 
 .EnterHallOfFame:
-	prioritysjump .EnterHallOfFameScript
+	sdefer .EnterHallOfFameScript
 	end
 
 .DummyScene:
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index b5f21755..b1b2595f 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -10,7 +10,7 @@ KarensRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
 
 .LockDoor:
-	prioritysjump .KarensDoorLocksBehindYou
+	sdefer .KarensDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 036f6739..7924387e 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -10,7 +10,7 @@ KogasRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
 
 .LockDoor:
-	prioritysjump .KogasDoorLocksBehindYou
+	sdefer .KogasDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 6808e423..370b57f9 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -12,7 +12,7 @@ LancesRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
 
 .LockDoor:
-	prioritysjump .LancesDoorLocksBehindYou
+	sdefer .LancesDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 1cf7f03c..34b8027b 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -17,7 +17,7 @@ MahoganyMart1F_MapScripts:
 	end
 
 .LanceUncoversStaircase:
-	prioritysjump MahoganyMart1FLanceUncoversStaircaseScript
+	sdefer MahoganyMart1FLanceUncoversStaircaseScript
 	end
 
 .MahoganyMart1FStaircase:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 0addd2b0..2397158a 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -9,7 +9,7 @@ MountMoon_MapScripts:
 	def_callbacks
 
 .RivalEncounter:
-	prioritysjump .RivalBattle
+	sdefer .RivalBattle
 	end
 
 .DummyScene:
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 93d706c1..40f51b08 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -10,7 +10,7 @@ MrPokemonsHouse_MapScripts:
 	def_callbacks
 
 .MeetMrPokemon:
-	prioritysjump .MrPokemonEvent
+	sdefer .MrPokemonEvent
 	end
 
 .DummyScene:
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 42609607..016bb131 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -18,7 +18,7 @@ OlivinePort_MapScripts:
 	end
 
 .LeaveFastShip:
-	prioritysjump .LeaveFastShipScript
+	sdefer .LeaveFastShipScript
 	end
 
 .LeaveFastShipScript:
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index c14b1efd..d4714837 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -12,7 +12,7 @@ PlayersHouse1F_MapScripts:
 	def_callbacks
 
 .DummyScene0:
-	prioritysjump MeetMomScript
+	sdefer MeetMomScript
 	end
 
 .DummyScene1:
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 545d72a2..5f3511e8 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -19,21 +19,21 @@ Pokecenter2F_MapScripts:
 	clearevent EVENT_MYSTERY_GIFT_DELIVERY_GUY
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue .Scene0Done
-	prioritysjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
+	sdefer Pokecenter2F_AppearMysteryGiftDeliveryGuy
 
 .Scene0Done:
 	end
 
 .Scene1:
-	prioritysjump Script_LeftCableTradeCenter
+	sdefer Script_LeftCableTradeCenter
 	end
 
 .Scene2:
-	prioritysjump Script_LeftCableColosseum
+	sdefer Script_LeftCableColosseum
 	end
 
 .Scene3:
-	prioritysjump Script_LeftTimeCapsule
+	sdefer Script_LeftTimeCapsule
 	end
 
 Pokecenter2F_AppearMysteryGiftDeliveryGuy:
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 11f6d7e0..7dc92dfa 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -20,7 +20,7 @@ Route35NationalParkGate_MapScripts:
 	end
 
 .LeaveContestEarly:
-	prioritysjump .LeavingContestEarly
+	sdefer .LeavingContestEarly
 	end
 
 .CheckIfContestRunning:
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index ac8f1d4f..58fdbb06 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -29,7 +29,7 @@ Route36NationalParkGate_MapScripts:
 	end
 
 .LeaveContestEarly:
-	prioritysjump .LeavingContestEarly
+	sdefer .LeavingContestEarly
 	end
 
 .CheckIfContestRunning:
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index c5ed70c2..2ea2a889 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -14,7 +14,7 @@ Route43Gate_MapScripts:
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .RocketShakedown:
-	prioritysjump .RocketTakeover
+	sdefer .RocketTakeover
 	end
 
 .DummyScene:
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 0ad36e6a..6792f117 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -14,7 +14,7 @@ RuinsOfAlphInnerChamber_MapScripts:
 	end
 
 .UnownAppear:
-	prioritysjump .StrangePresenceScript
+	sdefer .StrangePresenceScript
 	end
 
 .StrangePresenceScript:
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 95388560..37113857 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -15,7 +15,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	end
 
 .GetUnownDex:
-	prioritysjump .GetUnownDexScript
+	sdefer .GetUnownDexScript
 	end
 
 .ScientistCallback:
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 559736ef..38d82e32 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -24,7 +24,7 @@ TeamRocketBaseB3F_MapScripts:
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
 
 .LanceGetsPassword:
-	prioritysjump LanceGetPasswordScript
+	sdefer LanceGetPasswordScript
 	end
 
 .DummyScene1:
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index be95db85..4a674583 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -11,7 +11,7 @@ TimeCapsule_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTimeCapsule:
-	prioritysjump .InitializeAndPreparePokecenter2F
+	sdefer .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 40405518..7579e246 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -11,7 +11,7 @@ TradeCenter_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTradeCenter:
-	prioritysjump .InitializeAndPreparePokecenter2F
+	sdefer .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 9fb011ea..17406e29 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -15,7 +15,7 @@ VermilionPort_MapScripts:
 	end
 
 .LeaveFastShip:
-	prioritysjump .LeaveFastShipScript
+	sdefer .LeaveFastShipScript
 	end
 
 .FlyPoint:
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index 7d6a5464..32ee06f1 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -10,7 +10,7 @@ WillsRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
 
 .LockDoor:
-	prioritysjump .WillsDoorLocksBehindYou
+	sdefer .WillsDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/wram.asm b/wram.asm
index c1aeb316..cf27523a 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2206,7 +2206,7 @@ wMapStatus:: db
 wMapEventStatus:: db
 
 wScriptFlags::
-; bit 3: priority jump
+; bit 3: run deferred script
 	db
 	ds 1
 wScriptFlags2::
@@ -2227,10 +2227,10 @@ wScriptStack:: ds 3 * 5
 wScriptVar:: db
 wScriptDelay:: db
 
-wPriorityScriptBank::
+wDeferredScriptBank::
 wScriptTextBank::
 	db
-wPriorityScriptAddr::
+wDeferredScriptAddr::
 wScriptTextAddr::
 	dw
 	ds 1