diff --git a/docs/event_commands.md b/docs/event_commands.md
index f76adecc6..917dda09c 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -470,7 +470,7 @@ If item_id = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$8C`: deactivatefacing length
-## `$8D`: prioritysjump script
+## `$8D`: sdefer script
## `$8E`: `warpcheck`
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index 4118d0efd..ffbd01dee 100644
--- a/engine/overworld/events.asm
+++ b/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
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 92ca71605..05e0f95e5 100644
--- a/engine/overworld/scripting.asm
+++ b/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
diff --git a/macros/legacy.asm b/macros/legacy.asm
index 2abe3f8d8..e23b5f88f 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 74de5419a..0a18456fa 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -883,9 +883,9 @@ deactivatefacing: MACRO
db \1 ; time
ENDM
- const prioritysjump_command ; $8d
-prioritysjump: MACRO
- db prioritysjump_command
+ const sdefer_command ; $8d
+sdefer: MACRO
+ db sdefer_command
dw \1 ; pointer
ENDM
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index c0396a481..a0dedc70d 100644
--- a/maps/BattleTower1F.asm
+++ b/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
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index 63816a724..a8980f063 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -11,7 +11,7 @@ BattleTowerBattleRoom_MapScripts:
.EnterBattleRoom:
disappear BATTLETOWERBATTLEROOM_YOUNGSTER
- prioritysjump Script_BattleRoom
+ sdefer Script_BattleRoom
setscene SCENE_FINISHED
.DummyScene:
end
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index e46ed0047..edfa031f9 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -9,7 +9,7 @@ BattleTowerElevator_MapScripts:
def_callbacks
.Scene0:
- prioritysjump .RideElevator
+ sdefer .RideElevator
setscene SCENE_FINISHED
.Scene1:
end
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index c00a21b33..9e069a1ab 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -9,7 +9,7 @@ BattleTowerHallway_MapScripts:
def_callbacks
.Scene0:
- prioritysjump .ChooseBattleRoom
+ sdefer .ChooseBattleRoom
setscene SCENE_FINISHED
.Scene1:
end
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index b8a6d9746..065226102 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 ce4b98e6f..cbcba4373 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -15,7 +15,7 @@ BurnedTower1F_MapScripts:
callback MAPCALLBACK_TILES, .HoleAndLadder
.EusineScene:
- prioritysjump .MeetEusine
+ sdefer .MeetEusine
end
.DummyScene1:
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index 82c08b381..67851b33b 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 85f1b2c27..2030d475e 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -13,7 +13,7 @@ Colosseum_MapScripts:
callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
.InitializeColosseum:
- prioritysjump .InitializeAndPreparePokecenter2F
+ sdefer .InitializeAndPreparePokecenter2F
end
.DummyScene1:
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index a5531bf78..fb6dd0aa0 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -12,7 +12,7 @@ DragonShrine_MapScripts:
def_callbacks
.DragonShrineTest:
- prioritysjump .DragonShrineTestScript
+ sdefer .DragonShrineTestScript
end
.DummyScene:
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index b9c30f4e1..a45ca1f3f 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -15,7 +15,7 @@ EcruteakGym_MapScripts:
def_callbacks
.ForcedToLeave:
- prioritysjump EcruteakGymClosed
+ sdefer EcruteakGymClosed
end
.DummyScene:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index 0624b6eac..215acf2d9 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 72978277f..5a2d7fef8 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -19,7 +19,7 @@ ElmsLab_MapScripts:
callback MAPCALLBACK_OBJECTS, .MoveElmCallback
.MeetElm:
- prioritysjump .WalkUpToElm
+ sdefer .WalkUpToElm
end
.DummyScene1:
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index 321467c22..8361a6b31 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 ceaab6531..32bf0e490 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 abe4bc976..7422bf0e0 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 23b5afc3d..8511e4d24 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 487ac39f8..12ff8241e 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 9d8ad1256..278055d05 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/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 82e2a6335..a5f65cb8b 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -6,7 +6,7 @@ MobileBattleRoom_MapScripts:
def_callbacks
.InitializeMobileBattleRoom:
- prioritysjump .InitializeAndPreparePokecenter2F
+ sdefer .InitializeAndPreparePokecenter2F
end
.DummyScene:
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index 37cfc1347..7ce045573 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -6,7 +6,7 @@ MobileTradeRoom_MapScripts:
def_callbacks
.InitializeMobileTradeRoom:
- prioritysjump .InitializeAndPreparePokecenter2F
+ sdefer .InitializeAndPreparePokecenter2F
end
.DummyScene:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 25a3080fa..db88498aa 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 7563f6895..28369613e 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 358a7f438..ec93ca75b 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/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 97a396a3e..45d297c70 100644
--- a/maps/Pokecenter2F.asm
+++ b/maps/Pokecenter2F.asm
@@ -21,29 +21,29 @@ 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
.Scene4:
- prioritysjump Script_LeftMobileTradeRoom
+ sdefer Script_LeftMobileTradeRoom
end
.Scene5:
- prioritysjump Script_LeftMobileBattleRoom
+ sdefer Script_LeftMobileBattleRoom
end
Pokecenter2F_AppearMysteryGiftDeliveryGuy:
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 95009d5bb..2dc1d2b0c 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 08469b039..bc0168620 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 50b9d49c2..8ec6a9cd1 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/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index 3012ae023..c78f12297 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -12,7 +12,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
end
.OpenWall:
- prioritysjump .WallOpenScript
+ sdefer .WallOpenScript
end
.DummyScene:
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index e106f0b4d..eeba4f5f4 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -13,7 +13,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
end
.OpenWall:
- prioritysjump .WallOpenScript
+ sdefer .WallOpenScript
end
.DummyScene:
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index a843e0ccc..bf620af79 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/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index 607b8ed45..1962339b4 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -16,7 +16,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
end
.OpenWall:
- prioritysjump .WallOpenScript
+ sdefer .WallOpenScript
end
.DummyScene:
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index 3f80c72b2..bc928868b 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -13,7 +13,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
end
.OpenWall:
- prioritysjump .WallOpenScript
+ sdefer .WallOpenScript
end
.DummyScene:
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 6e5911a9d..0ae964952 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 35061b6f5..8325b6e82 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -25,7 +25,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 be95db858..4a674583e 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/TinTower1F.asm b/maps/TinTower1F.asm
index 5ea9b3f7c..f3e93381e 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -20,7 +20,7 @@ TinTower1F_MapScripts:
callback MAPCALLBACK_TILES, .StairsCallback
.FaceSuicune:
- prioritysjump .SuicuneBattle
+ sdefer .SuicuneBattle
end
.DummyScene:
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 40405518b..7579e2468 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 be906ee69..119069701 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 bd45ea09c..03ecc41f4 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 c33cb5e7d..80a9825e9 100644
--- a/wram.asm
+++ b/wram.asm
@@ -2659,7 +2659,7 @@ wMapStatus:: db
wMapEventStatus:: db
wScriptFlags::
-; bit 3: priority jump
+; bit 3: run deferred script
db
ds 1
wScriptFlags2::
@@ -2680,10 +2680,10 @@ wScriptStack:: ds 3 * 5
ds 1
wScriptDelay:: db
-wPriorityScriptBank::
+wDeferredScriptBank::
wScriptTextBank::
db
-wPriorityScriptAddr::
+wDeferredScriptAddr::
wScriptTextAddr::
dw
ds 1