Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Fixes #580
author: Rangi <remy.oukaour+rangi42@gmail.com> 2019-03-10 16:39:31 -0400
committer: Rangi <remy.oukaour+rangi42@gmail.com> 2019-03-10 16:39:31 -0400
commit: f5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch)
tree: 2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /maps
parent: e002b536af8423f420e13e93d6c0e59f94ee5044 (diff)
104 files changed, 389 insertions, 389 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm
index c6bcbd67c..33263de62 100644
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -43,7 +43,7 @@ AzaleaTownRivalBattleScene1:
 	appear AZALEATOWN_SILVER
 	applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
 	turnobject PLAYER, DOWN
-	jump AzaleaTownRivalBattleScript
+	sjump AzaleaTownRivalBattleScript
 
 AzaleaTownRivalBattleScene2:
 	turnobject PLAYER, RIGHT
@@ -70,7 +70,7 @@ AzaleaTownRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .Totodile:
 	winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@@ -79,7 +79,7 @@ AzaleaTownRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .Chikorita:
 	winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
@@ -88,7 +88,7 @@ AzaleaTownRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .AfterBattle:
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm
index 6049d9f26..3c24a7271 100644
--- a/maps/BattleTower1F.asm
+++ b/maps/BattleTower1F.asm
@@ -19,18 +19,18 @@ BattleTower1F_MapScripts:
 	setval BATTLETOWERACTION_GET_CHALLENGE_STATE ; readmem sBattleTowerChallengeState
 	special BattleTowerAction
 	ifequal $0, .SkipEverything
-	ifequal $2, .priorityjump1
+	ifequal $2, .LeftWithoutSaving
 	ifequal $3, .SkipEverything
 	ifequal $4, .SkipEverything
 	opentext
 	writetext Text_WeveBeenWaitingForYou
 	waitbutton
 	closetext
-	priorityjump Script_ResumeBattleTowerChallenge
+	prioritysjump Script_ResumeBattleTowerChallenge
 	end
 
-.priorityjump1
-	priorityjump BattleTower_LeftWithoutSaving
+.LeftWithoutSaving
+	prioritysjump BattleTower_LeftWithoutSaving
 	setval BATTLETOWERACTION_CHALLENGECANCELED
 	special BattleTowerAction
 	setval BATTLETOWERACTION_06
@@ -61,7 +61,7 @@ BattleTower1FReceptionistScript:
 	setval BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [sBattleTowerSaveFileFlags]
 	special BattleTowerAction
 	ifnotequal $0, Script_Menu_ChallengeExplanationCancel
-	jump Script_BattleTowerIntroductionYesNo
+	sjump Script_BattleTowerIntroductionYesNo
 
 Script_Menu_ChallengeExplanationCancel:
 	writetext Text_WantToGoIntoABattleRoom
@@ -69,7 +69,7 @@ Script_Menu_ChallengeExplanationCancel:
 	special Menu_ChallengeExplanationCancel
 	ifequal 1, Script_ChooseChallenge
 	ifequal 2, Script_BattleTowerExplanation
-	jump Script_BattleTowerHopeToServeYouAgain
+	sjump Script_BattleTowerHopeToServeYouAgain
 
 Script_ChooseChallenge:
 	setval BATTLETOWERACTION_RESETDATA ; ResetBattleTowerTrainerSRAM
@@ -95,7 +95,7 @@ Script_ChooseChallenge:
 	closetext
 	setval BATTLETOWERACTION_CHOOSEREWARD
 	special BattleTowerAction
-	jump Script_WalkToBattleTowerElevator
+	sjump Script_WalkToBattleTowerElevator
 
 Script_ResumeBattleTowerChallenge:
 	closetext
@@ -146,7 +146,7 @@ Script_BattleTowerExplanation:
 Script_BattleTowerSkipExplanation:
 	setval BATTLETOWERACTION_SET_EXPLANATION_READ
 	special BattleTowerAction
-	jump Script_Menu_ChallengeExplanationCancel
+	sjump Script_Menu_ChallengeExplanationCancel
 
 Script_BattleTowerHopeToServeYouAgain:
 	writetext Text_WeHopeToServeYouAgain
@@ -196,7 +196,7 @@ UnreferencedScript_0x9e4ea:
 	special BattleTowerAction
 	ifequal $0, .zero
 	writetext Text_CantBeRegistered_PreviousRecordDeleted
-	jump continue
+	sjump continue
 
 .zero
 	writetext Text_CantBeRegistered
@@ -216,22 +216,22 @@ continue:
 	special BattleTowerAction
 	writetext Text_RightThisWayToYourBattleRoom
 	waitbutton
-	jump Script_ResumeBattleTowerChallenge
+	sjump Script_ResumeBattleTowerChallenge
 
 UnreferencedScript_0x9e53b:
 	writetext Text_FiveDayBattleLimit_Mobile
 	waitbutton
-	jump Script_BattleTowerHopeToServeYouAgain
+	sjump Script_BattleTowerHopeToServeYouAgain
 
 Script_AMonLevelExceeds:
 	writetext Text_AMonLevelExceeds
 	waitbutton
-	jump Script_Menu_ChallengeExplanationCancel
+	sjump Script_Menu_ChallengeExplanationCancel
 
 Script_MayNotEnterABattleRoomUnderL70:
 	writetext Text_MayNotEnterABattleRoomUnderL70
 	waitbutton
-	jump Script_Menu_ChallengeExplanationCancel
+	sjump Script_Menu_ChallengeExplanationCancel
 
 Script_MobileError:
 	special BattleTowerMobileError
@@ -242,7 +242,7 @@ BattleTower_LeftWithoutSaving:
 	opentext
 	writetext Text_BattleTower_LeftWithoutSaving
 	waitbutton
-	jump Script_BattleTowerHopeToServeYouAgain
+	sjump Script_BattleTowerHopeToServeYouAgain
 
 BattleTower1FYoungsterScript:
 	faceplayer
diff --git a/maps/BattleTowerBattleRoom.asm b/maps/BattleTowerBattleRoom.asm
index b05075571..6f1b63639 100644
--- a/maps/BattleTowerBattleRoom.asm
+++ b/maps/BattleTowerBattleRoom.asm
@@ -11,7 +11,7 @@ BattleTowerBattleRoom_MapScripts:
 
 .EnterBattleRoom:
 	disappear BATTLETOWERBATTLEROOM_YOUNGSTER
-	priorityjump Script_BattleRoom
+	prioritysjump Script_BattleRoom
 	setscene SCENE_FINISHED
 .DummyScene:
 	end
@@ -59,7 +59,7 @@ Script_ContinueAndBattleNextOpponent:
 	closetext
 	applymovement PLAYER, MovementData_BattleTowerBattleRoomPlayerTurnsToFaceNextOpponent
 	applymovement BATTLETOWERBATTLEROOM_RECEPTIONIST, MovementData_BattleTowerBattleRoomReceptionistWalksAway
-	jump Script_BattleRoomLoop
+	sjump Script_BattleRoomLoop
 
 Script_DontBattleNextOpponent:
 	writetext Text_SaveAndEndTheSession
@@ -87,7 +87,7 @@ Script_DontSaveAndEndTheSession:
 	special FadeOutPalettes
 	warpfacing UP, BATTLE_TOWER_1F, 7, 7
 	opentext
-	jump Script_BattleTowerHopeToServeYouAgain
+	sjump Script_BattleTowerHopeToServeYouAgain
 
 Script_FailedBattleTowerChallenge:
 	pause 60
@@ -108,7 +108,7 @@ Script_BeatenAllTrainers:
 Script_BeatenAllTrainers2:
 	opentext
 	writetext Text_CongratulationsYouveBeatenAllTheTrainers
-	jump Script_GivePlayerHisPrize
+	sjump Script_GivePlayerHisPrize
 
 UnreferencedScript_0x9f4eb:
 	setval BATTLETOWERACTION_CHALLENGECANCELED
diff --git a/maps/BattleTowerElevator.asm b/maps/BattleTowerElevator.asm
index ce7926595..42c10cc44 100644
--- a/maps/BattleTowerElevator.asm
+++ b/maps/BattleTowerElevator.asm
@@ -9,7 +9,7 @@ BattleTowerElevator_MapScripts:
 	db 0 ; callbacks
 
 .Scene0:
-	priorityjump .RideElevator
+	prioritysjump .RideElevator
 	setscene SCENE_FINISHED
 .Scene1:
 	end
diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm
index 122988582..e030f4fce 100644
--- a/maps/BattleTowerHallway.asm
+++ b/maps/BattleTowerHallway.asm
@@ -9,7 +9,7 @@ BattleTowerHallway_MapScripts:
 	db 0 ; callbacks
 
 .Scene0:
-	priorityjump .ChooseBattleRoom
+	prioritysjump .ChooseBattleRoom
 	setscene SCENE_FINISHED
 .Scene1:
 	end
@@ -17,7 +17,7 @@ BattleTowerHallway_MapScripts:
 .ChooseBattleRoom:
 	follow BATTLETOWERHALLWAY_RECEPTIONIST, PLAYER
 	callasm .asm_load_battle_room
-	jump .WalkToChosenBattleRoom
+	sjump .WalkToChosenBattleRoom
 
 .asm_load_battle_room
 	ldh a, [rSVBK]
@@ -45,23 +45,23 @@ BattleTowerHallway_MapScripts:
 	ifequal 9, .L90L100
 	ifequal 10, .L90L100
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo1020Room
-	jump .EnterBattleRoom
+	sjump .EnterBattleRoom
 
 .L30L40:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo3040Room
-	jump .EnterBattleRoom
+	sjump .EnterBattleRoom
 
 .L50L60:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo5060Room
-	jump .EnterBattleRoom
+	sjump .EnterBattleRoom
 
 .L70L80:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo7080Room
-	jump .EnterBattleRoom
+	sjump .EnterBattleRoom
 
 .L90L100:
 	applymovement BATTLETOWERHALLWAY_RECEPTIONIST, MovementData_BattleTowerHallwayWalkTo90100Room
-	jump .EnterBattleRoom
+	sjump .EnterBattleRoom
 
 .EnterBattleRoom:
 	faceobject PLAYER, BATTLETOWERHALLWAY_RECEPTIONIST
diff --git a/maps/BillsFamilysHouse.asm b/maps/BillsFamilysHouse.asm
index 0b855868c..e4ad3d34d 100644
--- a/maps/BillsFamilysHouse.asm
+++ b/maps/BillsFamilysHouse.asm
@@ -95,7 +95,7 @@ BillsSisterScript:
 .NoRoom:
 	writetext BillsSisterPhoneFullText
 	buttonsound
-	jump .Refused
+	sjump .Refused
 
 BillsHouseBookshelf1:
 	jumpstd picturebookshelf
diff --git a/maps/BillsHouse.asm b/maps/BillsHouse.asm
index 69a7fda78..b72221fbd 100644
--- a/maps/BillsHouse.asm
+++ b/maps/BillsHouse.asm
@@ -40,7 +40,7 @@ BillsGrandpa:
 	ifnotequal LICKITUNG, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
-	jump .ShowedLickitung
+	sjump .ShowedLickitung
 
 .GotEverstone:
 	writetext BillsGrandpaOddishText
@@ -54,7 +54,7 @@ BillsGrandpa:
 	ifnotequal ODDISH, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
-	jump .ShowedOddish
+	sjump .ShowedOddish
 
 .GotLeafStone:
 	writetext BillsGrandpaStaryuText
@@ -68,7 +68,7 @@ BillsGrandpa:
 	ifnotequal STARYU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
-	jump .ShowedStaryu
+	sjump .ShowedStaryu
 
 .GotWaterStone:
 	checkver
@@ -84,7 +84,7 @@ BillsGrandpa:
 	ifnotequal GROWLITHE, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
-	jump .ShowedGrowlitheVulpix
+	sjump .ShowedGrowlitheVulpix
 
 .AskVulpix:
 	writetext BillsGrandpaVulpixText
@@ -98,7 +98,7 @@ BillsGrandpa:
 	ifnotequal VULPIX, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
-	jump .ShowedGrowlitheVulpix
+	sjump .ShowedGrowlitheVulpix
 
 .GotFireStone:
 	writetext BillsGrandpaPichuText
@@ -112,7 +112,7 @@ BillsGrandpa:
 	ifnotequal PICHU, .WrongPokemon
 	scall .CorrectPokemon
 	setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
-	jump .ShowedPichu
+	sjump .ShowedPichu
 
 .ShowedLickitung:
 	checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA
diff --git a/maps/BlackthornGym1F.asm b/maps/BlackthornGym1F.asm
index 8912b792b..76d574990 100644
--- a/maps/BlackthornGym1F.asm
+++ b/maps/BlackthornGym1F.asm
@@ -76,7 +76,7 @@ BlackthornGymClairScript:
 	setevent EVENT_GOT_TM24_DRAGONBREATH
 	writetext BlackthornGymClairText_DescribeTM24
 	buttonsound
-	jump .GotTM24
+	sjump .GotTM24
 
 .BagFull:
 	writetext BlackthornGymClairText_BagFull
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm
index 195e937e3..9216832cf 100644
--- a/maps/BlackthornGym2F.asm
+++ b/maps/BlackthornGym2F.asm
@@ -29,15 +29,15 @@ BlackthornGym2F_MapScripts:
 
 .Boulder1:
 	disappear BLACKTHORNGYM2F_BOULDER1
-	jump .Fall
+	sjump .Fall
 
 .Boulder2:
 	disappear BLACKTHORNGYM2F_BOULDER2
-	jump .Fall
+	sjump .Fall
 
 .Boulder3:
 	disappear BLACKTHORNGYM2F_BOULDER3
-	jump .Fall
+	sjump .Fall
 
 .Fall:
 	pause 30
diff --git a/maps/BrunosRoom.asm b/maps/BrunosRoom.asm
index 5e7c4e247..522aa9fb2 100644
--- a/maps/BrunosRoom.asm
+++ b/maps/BrunosRoom.asm
@@ -10,7 +10,7 @@ BrunosRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .BrunosRoomDoors
 
 .LockDoor:
-	priorityjump .BrunosDoorLocksBehindYou
+	prioritysjump .BrunosDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm
index 074d3997a..7eab73050 100644
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -15,7 +15,7 @@ BurnedTower1F_MapScripts:
 	callback MAPCALLBACK_TILES, .HoleAndLadder
 
 .EusineScene:
-	priorityjump .MeetEusine
+	prioritysjump .MeetEusine
 	end
 
 .DummyScene1:
@@ -70,7 +70,7 @@ BurnedTowerRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .returnfrombattle
+	sjump .returnfrombattle
 
 .totodile
 	winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .returnfrombattle
+	sjump .returnfrombattle
 
 .chikorita
 	winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
@@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .returnfrombattle
+	sjump .returnfrombattle
 
 .returnfrombattle
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/BurnedTowerB1F.asm b/maps/BurnedTowerB1F.asm
index 09e41ddf3..60670b463 100644
--- a/maps/BurnedTowerB1F.asm
+++ b/maps/BurnedTowerB1F.asm
@@ -106,7 +106,7 @@ BurnedTowerB1FEusine:
 	readvar VAR_FACING
 	ifequal UP, .Movement2
 	applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement1
-	jump .Finish
+	sjump .Finish
 
 .Movement2:
 	applymovement BURNEDTOWERB1F_EUSINE, BurnedTowerB1FEusineMovement2
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm
index edfacac05..0aed4f770 100644
--- a/maps/CeladonDeptStore6F.asm
+++ b/maps/CeladonDeptStore6F.asm
@@ -43,7 +43,7 @@ CeladonDeptStore6FVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, CELADONDEPTSTORE6F_FRESH_WATER_PRICE
 	getitemname STRING_BUFFER_3, FRESH_WATER
-	jump .VendItem
+	sjump .VendItem
 
 .SodaPop:
 	checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
@@ -52,7 +52,7 @@ CeladonDeptStore6FVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, CELADONDEPTSTORE6F_SODA_POP_PRICE
 	getitemname STRING_BUFFER_3, SODA_POP
-	jump .VendItem
+	sjump .VendItem
 
 .Lemonade:
 	checkmoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
@@ -61,7 +61,7 @@ CeladonDeptStore6FVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, CELADONDEPTSTORE6F_LEMONADE_PRICE
 	getitemname STRING_BUFFER_3, LEMONADE
-	jump .VendItem
+	sjump .VendItem
 
 .VendItem:
 	pause 10
@@ -69,17 +69,17 @@ CeladonDeptStore6FVendingMachine:
 	writetext CeladonClangText
 	buttonsound
 	itemnotify
-	jump .Start
+	sjump .Start
 
 .NotEnoughMoney:
 	writetext CeladonVendingNoMoneyText
 	waitbutton
-	jump .Start
+	sjump .Start
 
 .NotEnoughSpace:
 	writetext CeladonVendingNoSpaceText
 	waitbutton
-	jump .Start
+	sjump .Start
 
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm
index 9866072a9..ea7ecc5b2 100644
--- a/maps/CeladonGameCornerPrizeRoom.asm
+++ b/maps/CeladonGameCornerPrizeRoom.asm
@@ -36,7 +36,7 @@ CeladonPrizeRoom_tmcounterloop:
 	ifequal 1, .DoubleTeam
 	ifequal 2, .Psychic
 	ifequal 3, .HyperBeam
-	jump CeladonPrizeRoom_CancelPurchaseScript
+	sjump CeladonPrizeRoom_CancelPurchaseScript
 
 .DoubleTeam:
 	checkcoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
@@ -47,7 +47,7 @@ CeladonPrizeRoom_tmcounterloop:
 	giveitem TM_DOUBLE_TEAM
 	iffalse CeladonPrizeRoom_notenoughroom
 	takecoins CELADONGAMECORNERPRIZEROOM_TM32_COINS
-	jump CeladonPrizeRoom_purchased
+	sjump CeladonPrizeRoom_purchased
 
 .Psychic:
 	checkcoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
@@ -58,7 +58,7 @@ CeladonPrizeRoom_tmcounterloop:
 	giveitem TM_PSYCHIC_M
 	iffalse CeladonPrizeRoom_notenoughroom
 	takecoins CELADONGAMECORNERPRIZEROOM_TM29_COINS
-	jump CeladonPrizeRoom_purchased
+	sjump CeladonPrizeRoom_purchased
 
 .HyperBeam:
 	checkcoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
@@ -69,7 +69,7 @@ CeladonPrizeRoom_tmcounterloop:
 	giveitem TM_HYPER_BEAM
 	iffalse CeladonPrizeRoom_notenoughroom
 	takecoins CELADONGAMECORNERPRIZEROOM_TM15_COINS
-	jump CeladonPrizeRoom_purchased
+	sjump CeladonPrizeRoom_purchased
 
 CeladonPrizeRoom_askbuy:
 	writetext CeladonPrizeRoom_ConfirmPurchaseText
@@ -81,7 +81,7 @@ CeladonPrizeRoom_purchased:
 	playsound SFX_TRANSACTION
 	writetext CeladonPrizeRoom_HereYouGoText
 	waitbutton
-	jump CeladonPrizeRoom_tmcounterloop
+	sjump CeladonPrizeRoom_tmcounterloop
 
 CeladonPrizeRoom_notenoughcoins:
 	writetext CeladonPrizeRoom_NotEnoughCoinsText
@@ -137,7 +137,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	ifequal 1, .Pikachu
 	ifequal 2, .Porygon
 	ifequal 3, .Larvitar
-	jump CeladonPrizeRoom_CancelPurchaseScript
+	sjump CeladonPrizeRoom_CancelPurchaseScript
 
 .Pikachu:
 	checkcoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
@@ -155,7 +155,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	special GameCornerPrizeMonCheckDex
 	givepoke PIKACHU, 25
 	takecoins CELADONGAMECORNERPRIZEROOM_PIKACHU_COINS
-	jump .loop
+	sjump .loop
 
 .Porygon:
 	checkcoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
@@ -173,7 +173,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	special GameCornerPrizeMonCheckDex
 	givepoke PORYGON, 15
 	takecoins CELADONGAMECORNERPRIZEROOM_PORYGON_COINS
-	jump .loop
+	sjump .loop
 
 .Larvitar:
 	checkcoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
@@ -191,7 +191,7 @@ CeladonGameCornerPrizeRoomPokemonVendor:
 	special GameCornerPrizeMonCheckDex
 	givepoke LARVITAR, 40
 	takecoins CELADONGAMECORNERPRIZEROOM_LARVITAR_COINS
-	jump .loop
+	sjump .loop
 
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/maps/CeladonPokecenter1F.asm b/maps/CeladonPokecenter1F.asm
index 0bd70e448..d476a6f03 100644
--- a/maps/CeladonPokecenter1F.asm
+++ b/maps/CeladonPokecenter1F.asm
@@ -45,7 +45,7 @@ CeladonEusine:
 	readvar VAR_FACING
 	ifequal UP, .Location1
 	applymovement CELADONPOKECENTER1F_EUSINE, .Movement1
-	jump .Continue
+	sjump .Continue
 
 .Location1:
 	applymovement CELADONPOKECENTER1F_EUSINE, .Movement2
diff --git a/maps/CeruleanGym.asm b/maps/CeruleanGym.asm
index f9b2f0eab..265d5472b 100644
--- a/maps/CeruleanGym.asm
+++ b/maps/CeruleanGym.asm
@@ -17,7 +17,7 @@ CeruleanGym_MapScripts:
 	end
 
 .GruntRunsOut:
-	priorityjump .GruntRunsOutScript
+	prioritysjump .GruntRunsOutScript
 	end
 
 .GruntRunsOutScript:
diff --git a/maps/CherrygroveCity.asm b/maps/CherrygroveCity.asm
index 44cc1076c..1ef3077e7 100644
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -29,7 +29,7 @@ CherrygroveCityGuideGent:
 	writetext GuideGentIntroText
 	yesorno
 	iffalse .No
-	jump .Yes
+	sjump .Yes
 .Yes:
 	writetext GuideGentTourText1
 	waitbutton
@@ -125,7 +125,7 @@ CherrygroveSilverSceneNorth:
 	dontrestartmapmusic
 	reloadmap
 	iftrue .AfterVictorious
-	jump .AfterYourDefeat
+	sjump .AfterYourDefeat
 
 .Totodile:
 	winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@@ -136,7 +136,7 @@ CherrygroveSilverSceneNorth:
 	dontrestartmapmusic
 	reloadmap
 	iftrue .AfterVictorious
-	jump .AfterYourDefeat
+	sjump .AfterYourDefeat
 
 .Chikorita:
 	winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
@@ -147,7 +147,7 @@ CherrygroveSilverSceneNorth:
 	dontrestartmapmusic
 	reloadmap
 	iftrue .AfterVictorious
-	jump .AfterYourDefeat
+	sjump .AfterYourDefeat
 
 .AfterVictorious:
 	playmusic MUSIC_RIVAL_AFTER
@@ -155,7 +155,7 @@ CherrygroveSilverSceneNorth:
 	writetext CherrygroveRivalText_YouWon
 	waitbutton
 	closetext
-	jump .FinishRival
+	sjump .FinishRival
 
 .AfterYourDefeat:
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/Colosseum.asm b/maps/Colosseum.asm
index f6ac38b4d..73c73ba93 100644
--- a/maps/Colosseum.asm
+++ b/maps/Colosseum.asm
@@ -13,7 +13,7 @@ Colosseum_MapScripts:
 	callback MAPCALLBACK_NEWMAP, .PreparePokecenter2F
 
 .InitializeColosseum:
-	priorityjump .InitializeAndPreparePokecenter2F
+	prioritysjump .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene1:
diff --git a/maps/CopycatsHouse2F.asm b/maps/CopycatsHouse2F.asm
index 9d0bbfe65..3029ac6f5 100644
--- a/maps/CopycatsHouse2F.asm
+++ b/maps/CopycatsHouse2F.asm
@@ -17,7 +17,7 @@ CopycatsHouse2F_MapScripts:
 	iftrue .Female
 	disappear COPYCATSHOUSE2F_COPYCAT2
 	appear COPYCATSHOUSE2F_COPYCAT1
-	jump .Done
+	sjump .Done
 .Female:
 	disappear COPYCATSHOUSE2F_COPYCAT1
 	appear COPYCATSHOUSE2F_COPYCAT2
@@ -37,7 +37,7 @@ Copycat:
 	applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
-	jump .Default_Merge_1
+	sjump .Default_Merge_1
 
 .Default_Female_1:
 	applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -51,7 +51,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Default_Female_2a
 	writetext CopycatText_Male_1
-	jump .Default_Merge_2a
+	sjump .Default_Merge_2a
 
 .Default_Female_2a:
 	writetext CopycatText_Female_1
@@ -61,7 +61,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Default_Female_3a
 	applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
-	jump .Default_Merge_3a
+	sjump .Default_Merge_3a
 
 .Default_Female_3a:
 	applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -80,7 +80,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Default_Female_2b
 	writetext CopycatText_Male_2
-	jump .Default_Merge_2b
+	sjump .Default_Merge_2b
 
 .Default_Female_2b:
 	writetext CopycatText_Female_2
@@ -90,7 +90,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .Default_Female_3b
 	applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
-	jump .Default_Merge_3b
+	sjump .Default_Merge_3b
 
 .Default_Female_3b:
 	applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -112,7 +112,7 @@ Copycat:
 	takeitem LOST_ITEM
 	setevent EVENT_RETURNED_LOST_ITEM_TO_COPYCAT
 	clearevent EVENT_COPYCATS_HOUSE_2F_DOLL
-	jump .GivePass
+	sjump .GivePass
 
 .TryGivePassAgain:
 	opentext
@@ -133,7 +133,7 @@ Copycat:
 	applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
 	faceplayer
 	variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
-	jump .GotPass_Merge_1
+	sjump .GotPass_Merge_1
 
 .GotPass_Female_1:
 	applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
@@ -145,7 +145,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .GotPass_Female_2
 	writetext CopycatText_Male_3
-	jump .GotPass_Merge_2
+	sjump .GotPass_Merge_2
 
 .GotPass_Female_2:
 	writetext CopycatText_Female_3
@@ -155,7 +155,7 @@ Copycat:
 	checkflag ENGINE_PLAYER_IS_FEMALE
 	iftrue .GotPass_Female_3
 	applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
-	jump .GotPass_Merge_3
+	sjump .GotPass_Merge_3
 
 .GotPass_Female_3:
 	applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
diff --git a/maps/DanceTheatre.asm b/maps/DanceTheatre.asm
index cbbb06714..9284eb271 100644
--- a/maps/DanceTheatre.asm
+++ b/maps/DanceTheatre.asm
@@ -86,7 +86,7 @@ DanceTheaterSurfGuy:
 	iffalse .KimonoGirlsUndefeated
 	checkevent EVENT_BEAT_KIMONO_GIRL_MIKI
 	iffalse .KimonoGirlsUndefeated
-	jump .GetSurf
+	sjump .GetSurf
 
 .KimonoGirlsUndefeated:
 	checkflag ENGINE_PLAYER_IS_FEMALE
diff --git a/maps/DragonShrine.asm b/maps/DragonShrine.asm
index 7124fa4c4..8cfe9368a 100644
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -12,7 +12,7 @@ DragonShrine_MapScripts:
 	db 0 ; callbacks
 
 .DragonShrineTest:
-	priorityjump .DragonShrineTestScript
+	prioritysjump .DragonShrineTestScript
 	end
 
 .DummyScene:
diff --git a/maps/DragonsDenB1F.asm b/maps/DragonsDenB1F.asm
index 54812317a..c4405842e 100644
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -66,7 +66,7 @@ DragonsDenB1F_ClairScene:
 	writetext ClairText_WhatsTheMatterDragonDen
 	waitbutton
 	closetext
-	jump .FinishClair
+	sjump .FinishClair
 
 .BagFull:
 	writetext ClairText_NoRoom
diff --git a/maps/EarlsPokemonAcademy.asm b/maps/EarlsPokemonAcademy.asm
index 4fbbb6d89..eced6f751 100644
--- a/maps/EarlsPokemonAcademy.asm
+++ b/maps/EarlsPokemonAcademy.asm
@@ -78,27 +78,27 @@ AcademyBlackboard:
 .Poison:
 	writetext AcademyPoisonText
 	waitbutton
-	jump .Loop
+	sjump .Loop
 
 .Paralysis:
 	writetext AcademyParalysisText
 	waitbutton
-	jump .Loop
+	sjump .Loop
 
 .Sleep:
 	writetext AcademySleepText
 	waitbutton
-	jump .Loop
+	sjump .Loop
 
 .Burn:
 	writetext AcademyBurnText
 	waitbutton
-	jump .Loop
+	sjump .Loop
 
 .Freeze:
 	writetext AcademyFreezeText
 	waitbutton
-	jump .Loop
+	sjump .Loop
 
 .BlackboardMenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/maps/EcruteakGym.asm b/maps/EcruteakGym.asm
index 5af6f3243..da7fcf5ea 100644
--- a/maps/EcruteakGym.asm
+++ b/maps/EcruteakGym.asm
@@ -15,7 +15,7 @@ EcruteakGym_MapScripts:
 	db 0 ; callbacks
 
 .ForcedToLeave:
-	priorityjump EcruteakGymClosed
+	prioritysjump EcruteakGymClosed
 	end
 
 .DummyScene:
diff --git a/maps/EcruteakPokecenter1F.asm b/maps/EcruteakPokecenter1F.asm
index eceb7a5ef..5f257606d 100644
--- a/maps/EcruteakPokecenter1F.asm
+++ b/maps/EcruteakPokecenter1F.asm
@@ -13,7 +13,7 @@ EcruteakPokecenter1F_MapScripts:
 	db 0 ; callbacks
 
 .MeetBill:
-	priorityjump .BillActivatesTimeCapsule
+	prioritysjump .BillActivatesTimeCapsule
 	end
 
 .DummyScene:
@@ -39,7 +39,7 @@ EcruteakPokecenter1F_MapScripts:
 	opentext
 	writetext EcruteakPokecenter1F_BillText1
 	buttonsound
-	jump .PointlessJump
+	sjump .PointlessJump
 
 .PointlessJump:
 	writetext EcruteakPokecenter1F_BillText2
diff --git a/maps/ElmsLab.asm b/maps/ElmsLab.asm
index 1ccd8d500..19221ee43 100644
--- a/maps/ElmsLab.asm
+++ b/maps/ElmsLab.asm
@@ -19,7 +19,7 @@ ElmsLab_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .MoveElmCallback
 
 .MeetElm:
-	priorityjump .WalkUpToElm
+	prioritysjump .WalkUpToElm
 	end
 
 .DummyScene1:
@@ -54,7 +54,7 @@ ElmsLab_MapScripts:
 	yesorno
 	iftrue .ElmGetsEmail
 	writetext ElmText_Refused
-	jump .MustSayYes
+	sjump .MustSayYes
 
 .ElmGetsEmail:
 	writetext ElmText_Accepted
@@ -123,7 +123,7 @@ ElmEggHatchedScript:
 	setval TOGETIC
 	special FindPartyMonThatSpeciesYourTrainerID
 	iftrue ShowElmTogepiScript
-	jump ElmCheckGotEggAgain
+	sjump ElmCheckGotEggAgain
 
 ElmCheckTogepiEgg:
 	checkevent EVENT_GOT_TOGEPI_EGG_FROM_ELMS_AIDE
@@ -183,7 +183,7 @@ CyndaquilPokeBallScript:
 	readvar VAR_FACING
 	ifequal RIGHT, ElmDirectionsScript
 	applymovement PLAYER, AfterCyndaquilMovement
-	jump ElmDirectionsScript
+	sjump ElmDirectionsScript
 
 TotodilePokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@@ -211,7 +211,7 @@ TotodilePokeBallScript:
 	givepoke TOTODILE, 5, BERRY
 	closetext
 	applymovement PLAYER, AfterTotodileMovement
-	jump ElmDirectionsScript
+	sjump ElmDirectionsScript
 
 ChikoritaPokeBallScript:
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
@@ -239,7 +239,7 @@ ChikoritaPokeBallScript:
 	givepoke CHIKORITA, 5, BERRY
 	closetext
 	applymovement PLAYER, AfterChikoritaMovement
-	jump ElmDirectionsScript
+	sjump ElmDirectionsScript
 
 DidntChooseStarterScript:
 	writetext DidntChooseStarterText
@@ -569,7 +569,7 @@ ElmsLabWindow:
 	iftrue .Normal
 	checkevent EVENT_ELM_CALLED_ABOUT_STOLEN_POKEMON
 	iftrue .BreakIn
-	jump .Normal
+	sjump .Normal
 
 .BreakIn:
 	writetext ElmsLabWindowText2
diff --git a/maps/FastShip1F.asm b/maps/FastShip1F.asm
index a69b99aa2..4862dfe5b 100644
--- a/maps/FastShip1F.asm
+++ b/maps/FastShip1F.asm
@@ -16,7 +16,7 @@ FastShip1F_MapScripts:
 	end
 
 .EnterFastShip:
-	priorityjump .EnterFastShipScript
+	prioritysjump .EnterFastShipScript
 	end
 
 .DummyScene2:
diff --git a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
index 4a611a9b2..b6820a64d 100644
--- a/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
+++ b/maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
@@ -65,7 +65,7 @@ SSAquaGranddaughterBefore:
 	writetext SSAquaGranddaughterWasPlayingMText
 	waitbutton
 	closetext
-	jump .cont
+	sjump .cont
 
 .PlayerIsFemale:
 	opentext
@@ -80,7 +80,7 @@ SSAquaGranddaughterBefore:
 	buttonsound
 	setevent EVENT_VERMILION_PORT_SAILOR_AT_GANGWAY
 	setmapscene FAST_SHIP_1F, SCENE_DEFAULT
-	jump SSAquaMetalCoatAndDocking
+	sjump SSAquaMetalCoatAndDocking
 
 SSAquaGrandpa:
 	faceplayer
diff --git a/maps/FuchsiaGym.asm b/maps/FuchsiaGym.asm
index 62428fb65..508690617 100644
--- a/maps/FuchsiaGym.asm
+++ b/maps/FuchsiaGym.asm
@@ -39,7 +39,7 @@ FuchsiaGymJanineScript:
 	playsound SFX_GET_BADGE
 	waitsfx
 	setflag ENGINE_SOULBADGE
-	jump .AfterBattle
+	sjump .AfterBattle
 .FightDone:
 	faceplayer
 	opentext
diff --git a/maps/GoldenrodCity.asm b/maps/GoldenrodCity.asm
index 4561a5218..7af886437 100644
--- a/maps/GoldenrodCity.asm
+++ b/maps/GoldenrodCity.asm
@@ -69,28 +69,28 @@ MoveTutorScript:
 	ifequal MOVETUTOR_FLAMETHROWER, .Flamethrower
 	ifequal MOVETUTOR_THUNDERBOLT, .Thunderbolt
 	ifequal MOVETUTOR_ICE_BEAM, .IceBeam
-	jump .Incompatible
+	sjump .Incompatible
 
 .Flamethrower:
 	setval MOVETUTOR_FLAMETHROWER
 	writetext UnknownText_0x1991cf
 	special MoveTutor
 	ifequal FALSE, .TeachMove
-	jump .Incompatible
+	sjump .Incompatible
 
 .Thunderbolt:
 	setval MOVETUTOR_THUNDERBOLT
 	writetext UnknownText_0x1991cf
 	special MoveTutor
 	ifequal FALSE, .TeachMove
-	jump .Incompatible
+	sjump .Incompatible
 
 .IceBeam:
 	setval MOVETUTOR_ICE_BEAM
 	writetext UnknownText_0x1991cf
 	special MoveTutor
 	ifequal FALSE, .TeachMove
-	jump .Incompatible
+	sjump .Incompatible
 
 .MoveMenuHeader:
 	db MENU_BACKUP_TILES ; flags
@@ -131,7 +131,7 @@ MoveTutorScript:
 	readvar VAR_FACING
 	ifequal LEFT, .WalkAroundPlayer
 	applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a5f
-	jump .GoInside
+	sjump .GoInside
 
 .WalkAroundPlayer:
 	applymovement GOLDENRODCITY_MOVETUTOR, MovementData_0x198a63
diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm
index c0d20b280..f7405a3c7 100644
--- a/maps/GoldenrodDeptStore5F.asm
+++ b/maps/GoldenrodDeptStore5F.asm
@@ -29,12 +29,12 @@ GoldenrodDeptStore5FClerkScript:
 	iftrue .headbutt
 	checkevent EVENT_GOT_TM08_ROCK_SMASH
 	iftrue .onlyrocksmash
-	jump .neither
+	sjump .neither
 
 .headbutt
 	checkevent EVENT_GOT_TM08_ROCK_SMASH
 	iftrue .both
-	jump .onlyheadbutt
+	sjump .onlyheadbutt
 
 .neither
 	pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
@@ -68,7 +68,7 @@ GoldenrodDeptStore5FReceptionistScript:
 	buttonsound
 	ifgreater 150 - 1, .VeryHappy
 	ifgreater 50 - 1, .SomewhatHappy
-	jump .NotVeryHappy
+	sjump .NotVeryHappy
 
 .VeryHappy:
 	writetext UnknownText_0x5615a
diff --git a/maps/GoldenrodDeptStore6F.asm b/maps/GoldenrodDeptStore6F.asm
index 779761305..e6a385f71 100644
--- a/maps/GoldenrodDeptStore6F.asm
+++ b/maps/GoldenrodDeptStore6F.asm
@@ -32,7 +32,7 @@ GoldenrodVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_FRESH_WATER_PRICE
 	getitemname STRING_BUFFER_3, FRESH_WATER
-	jump .VendItem
+	sjump .VendItem
 
 .SodaPop:
 	checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE
@@ -41,7 +41,7 @@ GoldenrodVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_SODA_POP_PRICE
 	getitemname STRING_BUFFER_3, SODA_POP
-	jump .VendItem
+	sjump .VendItem
 
 .Lemonade:
 	checkmoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE
@@ -50,7 +50,7 @@ GoldenrodVendingMachine:
 	iffalse .NotEnoughSpace
 	takemoney YOUR_MONEY, GOLDENRODDEPTSTORE6F_LEMONADE_PRICE
 	getitemname STRING_BUFFER_3, LEMONADE
-	jump .VendItem
+	sjump .VendItem
 
 .VendItem:
 	pause 10
@@ -58,17 +58,17 @@ GoldenrodVendingMachine:
 	writetext GoldenrodClangText
 	buttonsound
 	itemnotify
-	jump .Start
+	sjump .Start
 
 .NotEnoughMoney:
 	writetext GoldenrodVendingNoMoneyText
 	waitbutton
-	jump .Start
+	sjump .Start
 
 .NotEnoughSpace:
 	writetext GoldenrodVendingNoSpaceText
 	waitbutton
-	jump .Start
+	sjump .Start
 
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/maps/GoldenrodDeptStoreB1F.asm b/maps/GoldenrodDeptStoreB1F.asm
index d34dcfbe3..df78de7b6 100644
--- a/maps/GoldenrodDeptStoreB1F.asm
+++ b/maps/GoldenrodDeptStoreB1F.asm
@@ -18,11 +18,11 @@ GoldenrodDeptStoreB1F_MapScripts:
 .ClearBoxes:
 	checkevent EVENT_RECEIVED_CARD_KEY
 	iftrue .GotCardKey
-	jump .Continue
+	sjump .Continue
 
 .GotCardKey:
 	changeblock 16, 4, $0d ; floor
-	jump .Continue
+	sjump .Continue
 
 .Continue:
 	checkevent EVENT_GOLDENROD_DEPT_STORE_B1F_LAYOUT_2
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm
index 5682701ff..6cc8317c9 100644
--- a/maps/GoldenrodGameCorner.asm
+++ b/maps/GoldenrodGameCorner.asm
@@ -72,7 +72,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
 	ifequal 1, .Thunder
 	ifequal 2, .Blizzard
 	ifequal 3, .FireBlast
-	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
+	sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .Thunder:
 	checkcoins GOLDENRODGAMECORNER_TM25_COINS
@@ -83,7 +83,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
 	giveitem TM_THUNDER
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins GOLDENRODGAMECORNER_TM25_COINS
-	jump GoldenrodGameCornerTMVendor_FinishScript
+	sjump GoldenrodGameCornerTMVendor_FinishScript
 
 .Blizzard:
 	checkcoins GOLDENRODGAMECORNER_TM14_COINS
@@ -94,7 +94,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
 	giveitem TM_BLIZZARD
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins GOLDENRODGAMECORNER_TM14_COINS
-	jump GoldenrodGameCornerTMVendor_FinishScript
+	sjump GoldenrodGameCornerTMVendor_FinishScript
 
 .FireBlast:
 	checkcoins GOLDENRODGAMECORNER_TM38_COINS
@@ -105,7 +105,7 @@ GoldenrodGameCornerTMVendor_LoopScript:
 	giveitem TM_FIRE_BLAST
 	iffalse GoldenrodGameCornerPrizeMonVendor_NoRoomForPrizeScript
 	takecoins GOLDENRODGAMECORNER_TM38_COINS
-	jump GoldenrodGameCornerTMVendor_FinishScript
+	sjump GoldenrodGameCornerTMVendor_FinishScript
 
 GoldenrodGameCornerPrizeVendor_ConfirmPurchaseScript:
 	writetext GoldenrodGameCornerPrizeVendorConfirmPrizeText
@@ -117,7 +117,7 @@ GoldenrodGameCornerTMVendor_FinishScript:
 	playsound SFX_TRANSACTION
 	writetext GoldenrodGameCornerPrizeVendorHereYouGoText
 	waitbutton
-	jump GoldenrodGameCornerTMVendor_LoopScript
+	sjump GoldenrodGameCornerTMVendor_LoopScript
 
 GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript:
 	writetext GoldenrodGameCornerPrizeVendorNeedMoreCoinsText
@@ -173,7 +173,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	ifequal 1, .Abra
 	ifequal 2, .Cubone
 	ifequal 3, .Wobbuffet
-	jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
+	sjump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
 
 .Abra:
 	checkcoins GOLDENRODGAMECORNER_ABRA_COINS
@@ -191,7 +191,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	special GameCornerPrizeMonCheckDex
 	givepoke ABRA, 5
 	takecoins GOLDENRODGAMECORNER_ABRA_COINS
-	jump .loop
+	sjump .loop
 
 .Cubone:
 	checkcoins GOLDENRODGAMECORNER_CUBONE_COINS
@@ -209,7 +209,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	special GameCornerPrizeMonCheckDex
 	givepoke CUBONE, 15
 	takecoins GOLDENRODGAMECORNER_CUBONE_COINS
-	jump .loop
+	sjump .loop
 
 .Wobbuffet:
 	checkcoins GOLDENRODGAMECORNER_WOBBUFFET_COINS
@@ -227,7 +227,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
 	special GameCornerPrizeMonCheckDex
 	givepoke WOBBUFFET, 15
 	takecoins GOLDENRODGAMECORNER_WOBBUFFET_COINS
-	jump .loop
+	sjump .loop
 
 .MenuHeader:
 	db MENU_BACKUP_TILES ; flags
diff --git a/maps/GoldenrodHappinessRater.asm b/maps/GoldenrodHappinessRater.asm
index 0918b6b79..ff5ef8a84 100644
--- a/maps/GoldenrodHappinessRater.asm
+++ b/maps/GoldenrodHappinessRater.asm
@@ -19,7 +19,7 @@ GoldenrodHappinessRaterTeacherScript:
 	ifgreater 150 - 1, .SortOfHappy
 	ifgreater 100 - 1, .QuiteCute
 	ifgreater  50 - 1, .NotUsedToYou
-	jump .LooksMean
+	sjump .LooksMean
 
 .LovesYouALot:
 	writetext GoldenrodHappinessRatingText_LovesYouALot
diff --git a/maps/GoldenrodUnderground.asm b/maps/GoldenrodUnderground.asm
index 8f48efc4a..6eac61488 100644
--- a/maps/GoldenrodUnderground.asm
+++ b/maps/GoldenrodUnderground.asm
@@ -160,7 +160,7 @@ BitterMerchantScript:
 	readvar VAR_WEEKDAY
 	ifequal SUNDAY, .Open
 	ifequal SATURDAY, .Open
-	jump GoldenrodUndergroundScript_ShopClosed
+	sjump GoldenrodUndergroundScript_ShopClosed
 
 .Open:
 	pokemart MARTTYPE_BITTER, MART_UNDERGROUND
@@ -173,7 +173,7 @@ BargainMerchantScript:
 	iftrue GoldenrodUndergroundScript_ShopClosed
 	readvar VAR_WEEKDAY
 	ifequal MONDAY, .CheckMorn
-	jump GoldenrodUndergroundScript_ShopClosed
+	sjump GoldenrodUndergroundScript_ShopClosed
 
 .CheckMorn:
 	checktime MORN
@@ -188,7 +188,7 @@ OlderHaircutBrotherScript:
 	ifequal TUESDAY, .DoHaircut
 	ifequal THURSDAY, .DoHaircut
 	ifequal SATURDAY, .DoHaircut
-	jump GoldenrodUndergroundScript_ShopClosed
+	sjump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -207,25 +207,25 @@ OlderHaircutBrotherScript:
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
 	ifequal $2, .two
 	ifequal $3, .three
-	jump .else
+	sjump .else
 
 .two
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .three
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .else
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .then
 	takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_OLDER_HAIRCUT_PRICE
@@ -245,7 +245,7 @@ OlderHaircutBrotherScript:
 	iftrue EitherHaircutBrotherScript_SlightlyHappier
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue EitherHaircutBrotherScript_Happier
-	jump EitherHaircutBrotherScript_MuchHappier
+	sjump EitherHaircutBrotherScript_MuchHappier
 
 .Refused:
 	writetext UnknownText_0x7c6ea
@@ -271,7 +271,7 @@ YoungerHaircutBrotherScript:
 	ifequal SUNDAY, .DoHaircut
 	ifequal WEDNESDAY, .DoHaircut
 	ifequal FRIDAY, .DoHaircut
-	jump GoldenrodUndergroundScript_ShopClosed
+	sjump GoldenrodUndergroundScript_ShopClosed
 
 .DoHaircut:
 	checkflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
@@ -290,25 +290,25 @@ YoungerHaircutBrotherScript:
 	setflag ENGINE_GOLDENROD_UNDERGROUND_GOT_HAIRCUT
 	ifequal $2, .two
 	ifequal $3, .three
-	jump .else
+	sjump .else
 
 .two
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .three
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .else
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	clearevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_3
-	jump .then
+	sjump .then
 
 .then
 	takemoney YOUR_MONEY, GOLDENRODUNDERGROUND_YOUNGER_HAIRCUT_PRICE
@@ -328,7 +328,7 @@ YoungerHaircutBrotherScript:
 	iftrue EitherHaircutBrotherScript_SlightlyHappier
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iftrue EitherHaircutBrotherScript_Happier
-	jump EitherHaircutBrotherScript_MuchHappier
+	sjump EitherHaircutBrotherScript_MuchHappier
 
 .Refused:
 	writetext UnknownText_0x7c842
diff --git a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
index cab427d0e..78aed50ce 100644
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -176,7 +176,7 @@ UndergroundSilverBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishRivalBattle
+	sjump .FinishRivalBattle
 
 .Totodile:
 	winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@@ -185,7 +185,7 @@ UndergroundSilverBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishRivalBattle
+	sjump .FinishRivalBattle
 
 .Chikorita:
 	winlosstext UndergroundSilverWinText, UndergroundSilverLossText
@@ -194,7 +194,7 @@ UndergroundSilverBattleScript:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishRivalBattle
+	sjump .FinishRivalBattle
 
 .FinishRivalBattle:
 	playmusic MUSIC_RIVAL_AFTER
@@ -283,7 +283,7 @@ Switch1Script:
 	addval 1
 	writemem wUndergroundSwitchPositions
 	setevent EVENT_SWITCH_1
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
@@ -293,7 +293,7 @@ Switch1Script:
 	addval -1
 	writemem wUndergroundSwitchPositions
 	clearevent EVENT_SWITCH_1
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 Switch2Script:
 	opentext
@@ -308,7 +308,7 @@ Switch2Script:
 	addval 2
 	writemem wUndergroundSwitchPositions
 	setevent EVENT_SWITCH_2
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
@@ -318,7 +318,7 @@ Switch2Script:
 	addval -2
 	writemem wUndergroundSwitchPositions
 	clearevent EVENT_SWITCH_2
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 Switch3Script:
 	opentext
@@ -333,7 +333,7 @@ Switch3Script:
 	addval 3
 	writemem wUndergroundSwitchPositions
 	setevent EVENT_SWITCH_3
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
@@ -343,7 +343,7 @@ Switch3Script:
 	addval -3
 	writemem wUndergroundSwitchPositions
 	clearevent EVENT_SWITCH_3
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 EmergencySwitchScript:
 	opentext
@@ -360,7 +360,7 @@ EmergencySwitchScript:
 	setevent EVENT_SWITCH_1
 	setevent EVENT_SWITCH_2
 	setevent EVENT_SWITCH_3
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 .On:
 	writetext SwitchRoomText_OnTurnOff
@@ -372,7 +372,7 @@ EmergencySwitchScript:
 	clearevent EVENT_SWITCH_1
 	clearevent EVENT_SWITCH_2
 	clearevent EVENT_SWITCH_3
-	jump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
+	sjump GoldenrodUndergroundSwitchRoomEntrances_UpdateDoors
 
 GoldenrodUndergroundSwitchRoomEntrances_DontToggle:
 	closetext
diff --git a/maps/HallOfFame.asm b/maps/HallOfFame.asm
index 9c4df3c02..e2da3ecb0 100644
--- a/maps/HallOfFame.asm
+++ b/maps/HallOfFame.asm
@@ -9,7 +9,7 @@ HallOfFame_MapScripts:
 	db 0 ; callbacks
 
 .EnterHallOfFame:
-	priorityjump .EnterHallOfFameScript
+	prioritysjump .EnterHallOfFameScript
 	end
 
 .DummyScene:
diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm
index 149328000..df07edfe6 100644
--- a/maps/IcePathB1F.asm
+++ b/maps/IcePathB1F.asm
@@ -28,22 +28,22 @@ IcePathB1F_MapScripts:
 .Boulder1:
 	disappear ICEPATHB1F_BOULDER1
 	clearevent EVENT_BOULDER_IN_ICE_PATH_1A
-	jump .FinishBoulder
+	sjump .FinishBoulder
 
 .Boulder2:
 	disappear ICEPATHB1F_BOULDER2
 	clearevent EVENT_BOULDER_IN_ICE_PATH_2A
-	jump .FinishBoulder
+	sjump .FinishBoulder
 
 .Boulder3:
 	disappear ICEPATHB1F_BOULDER3
 	clearevent EVENT_BOULDER_IN_ICE_PATH_3A
-	jump .FinishBoulder
+	sjump .FinishBoulder
 
 .Boulder4:
 	disappear ICEPATHB1F_BOULDER4
 	clearevent EVENT_BOULDER_IN_ICE_PATH_4A
-	jump .FinishBoulder
+	sjump .FinishBoulder
 
 .FinishBoulder:
 	pause 30
diff --git a/maps/IlexForest.asm b/maps/IlexForest.asm
index 158efcd3b..482965bbb 100644
--- a/maps/IlexForest.asm
+++ b/maps/IlexForest.asm
@@ -430,7 +430,7 @@ IlexForestSignpost:
 IlexForestShrineScript:
 	checkevent EVENT_FOREST_IS_RESTLESS
 	iftrue .ForestIsRestless
-	jump .DontDoCelebiEvent
+	sjump .DontDoCelebiEvent
 
 .ForestIsRestless:
 	checkitem GS_BALL
diff --git a/maps/IndigoPlateauPokecenter1F.asm b/maps/IndigoPlateauPokecenter1F.asm
index 406e5727c..c8fd52c46 100644
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -61,7 +61,7 @@ PlateauRivalBattle1:
 	applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
 	playmusic MUSIC_RIVAL_ENCOUNTER
 	turnobject PLAYER, RIGHT
-	jump PlateauRivalBattleCommon
+	sjump PlateauRivalBattleCommon
 
 PlateauRivalBattle2:
 	checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
@@ -99,7 +99,7 @@ PlateauRivalBattleCommon:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump PlateauRivalPostBattle
+	sjump PlateauRivalPostBattle
 
 .Totodile:
 	winlosstext PlateauRivalWinText, PlateauRivalLoseText
@@ -108,7 +108,7 @@ PlateauRivalBattleCommon:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump PlateauRivalPostBattle
+	sjump PlateauRivalPostBattle
 
 .Chikorita:
 	winlosstext PlateauRivalWinText, PlateauRivalLoseText
@@ -117,7 +117,7 @@ PlateauRivalBattleCommon:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump PlateauRivalPostBattle
+	sjump PlateauRivalPostBattle
 
 PlateauRivalPostBattle:
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/KarensRoom.asm b/maps/KarensRoom.asm
index ed85ed0ba..772dfae8d 100644
--- a/maps/KarensRoom.asm
+++ b/maps/KarensRoom.asm
@@ -10,7 +10,7 @@ KarensRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .KarensRoomDoors
 
 .LockDoor:
-	priorityjump .KarensDoorLocksBehindYou
+	prioritysjump .KarensDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/KogasRoom.asm b/maps/KogasRoom.asm
index 4401e6197..00b6d4ee0 100644
--- a/maps/KogasRoom.asm
+++ b/maps/KogasRoom.asm
@@ -10,7 +10,7 @@ KogasRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .KogasRoomDoors
 
 .LockDoor:
-	priorityjump .KogasDoorLocksBehindYou
+	prioritysjump .KogasDoorLocksBehindYou
 	end
 
 .DummyScene:
diff --git a/maps/KurtsHouse.asm b/maps/KurtsHouse.asm
index 1087529be..4de412fe4 100644
--- a/maps/KurtsHouse.asm
+++ b/maps/KurtsHouse.asm
@@ -139,31 +139,31 @@ Kurt1:
 	ifequal PNK_APRICORN, .Pnk
 ; .Red
 	setevent EVENT_GAVE_KURT_RED_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Blu:
 	setevent EVENT_GAVE_KURT_BLU_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Ylw:
 	setevent EVENT_GAVE_KURT_YLW_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Grn:
 	setevent EVENT_GAVE_KURT_GRN_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Wht:
 	setevent EVENT_GAVE_KURT_WHT_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Blk:
 	setevent EVENT_GAVE_KURT_BLK_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .Pnk:
 	setevent EVENT_GAVE_KURT_PNK_APRICORN
-	jump .GaveKurtApricorns
+	sjump .GaveKurtApricorns
 
 .GaveKurtApricorns:
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -197,7 +197,7 @@ Kurt1:
 	verbosegiveitemvar LEVEL_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_RED_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveLureBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -207,7 +207,7 @@ Kurt1:
 	verbosegiveitemvar LURE_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_BLU_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveMoonBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -217,7 +217,7 @@ Kurt1:
 	verbosegiveitemvar MOON_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_YLW_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveFriendBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -227,7 +227,7 @@ Kurt1:
 	verbosegiveitemvar FRIEND_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_GRN_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveFastBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -237,7 +237,7 @@ Kurt1:
 	verbosegiveitemvar FAST_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_WHT_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveHeavyBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -247,7 +247,7 @@ Kurt1:
 	verbosegiveitemvar HEAVY_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_BLK_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .GiveLoveBall:
 	checkflag ENGINE_KURT_MAKING_BALLS
@@ -257,7 +257,7 @@ Kurt1:
 	verbosegiveitemvar LOVE_BALL, VAR_KURT_APRICORNS
 	iffalse .NoRoomForBall
 	clearevent EVENT_GAVE_KURT_PNK_APRICORN
-	jump ._ThatTurnedOutGreat
+	sjump ._ThatTurnedOutGreat
 
 .CanGiveGSBallToKurt:
 	checkevent EVENT_GAVE_GS_BALL_TO_KURT
@@ -297,7 +297,7 @@ Kurt1:
 	turnobject PLAYER, DOWN
 	playsound SFX_FLY
 	applymovement KURTSHOUSE_KURT1, MovementData_0x18e466
-	jump .KurtHasLeftTheBuilding
+	sjump .KurtHasLeftTheBuilding
 
 .GSBallRunAround:
 	turnobject PLAYER, DOWN
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm
index 910e811c3..e9cf0689d 100644
--- a/maps/LakeOfRage.asm
+++ b/maps/LakeOfRage.asm
@@ -76,7 +76,7 @@ LakeOfRageLanceScript:
 	writetext UnknownText_0x703a5
 	yesorno
 	iffalse .RefusedToHelp
-	jump .AgreedToHelp
+	sjump .AgreedToHelp
 
 RedGyarados:
 	opentext
diff --git a/maps/LakeOfRageMagikarpHouse.asm b/maps/LakeOfRageMagikarpHouse.asm
index 9d1a837ef..60e078500 100644
--- a/maps/LakeOfRageMagikarpHouse.asm
+++ b/maps/LakeOfRageMagikarpHouse.asm
@@ -47,7 +47,7 @@ MagikarpLengthRaterScript:
 	ifequal MAGIKARPLENGTH_REFUSED, .Refused
 	ifequal MAGIKARPLENGTH_TOO_SHORT, .TooShort
 	; MAGIKARPLENGTH_BEAT_RECORD
-	jump .GetReward
+	sjump .GetReward
 
 .GetReward:
 	writetext MagikarpLengthRaterText_Memento
diff --git a/maps/LancesRoom.asm b/maps/LancesRoom.asm
index 8636fc9b1..e0593d840 100644
--- a/maps/LancesRoom.asm
+++ b/maps/LancesRoom.asm
@@ -12,7 +12,7 @@ LancesRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .LancesRoomDoors
 
 .LockDoor:
-	priorityjump .LancesDoorLocksBehindYou
+	prioritysjump .LancesDoorLocksBehindYou
 	end
 
 .DummyScene:
@@ -44,7 +44,7 @@ LancesRoom_MapScripts:
 Script_ApproachLanceFromLeft:
 	special FadeOutMusic
 	applymovement PLAYER, MovementData_ApproachLanceFromLeft
-	jump LancesRoomLanceScript
+	sjump LancesRoomLanceScript
 
 Script_ApproachLanceFromRight:
 	special FadeOutMusic
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm
index 1afdb0173..ffb513a62 100644
--- a/maps/MahoganyMart1F.asm
+++ b/maps/MahoganyMart1F.asm
@@ -17,7 +17,7 @@ MahoganyMart1F_MapScripts:
 	end
 
 .LanceUncoversStaircase:
-	priorityjump MahoganyMart1FLanceUncoversStaircaseScript
+	prioritysjump MahoganyMart1FLanceUncoversStaircaseScript
 	end
 
 .MahoganyMart1FStaircase:
diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm
index 0eff7e32b..196929d65 100644
--- a/maps/MobileBattleRoom.asm
+++ b/maps/MobileBattleRoom.asm
@@ -6,7 +6,7 @@ MobileBattleRoom_MapScripts:
 	db 0 ; callbacks
 
 .InitializeMobileBattleRoom:
-	priorityjump .InitializeAndPreparePokecenter2F
+	prioritysjump .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
@@ -25,7 +25,7 @@ MobileBattleRoomConsoleScript:
 	iffalse .false
 	ifequal $1, .one_
 	ifequal $2, .two_
-	jump .false
+	sjump .false
 
 .one_
 	writetext MobileBattleRoom_HealText
diff --git a/maps/MobileTradeRoom.asm b/maps/MobileTradeRoom.asm
index b294b2355..03e71bcbb 100644
--- a/maps/MobileTradeRoom.asm
+++ b/maps/MobileTradeRoom.asm
@@ -6,7 +6,7 @@ MobileTradeRoom_MapScripts:
 	db 0 ; callbacks
 
 .InitializeMobileTradeRoom:
-	priorityjump .InitializeAndPreparePokecenter2F
+	prioritysjump .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
diff --git a/maps/MountMoon.asm b/maps/MountMoon.asm
index 1385f8e5d..7bbcbabdd 100644
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -9,7 +9,7 @@ MountMoon_MapScripts:
 	db 0 ; callbacks
 
 .RivalEncounter:
-	priorityjump .RivalBattle
+	prioritysjump .RivalBattle
 	end
 
 .DummyScene:
@@ -36,7 +36,7 @@ MountMoon_MapScripts:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishBattle
+	sjump .FinishBattle
 
 .Totodile:
 	winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
@@ -45,7 +45,7 @@ MountMoon_MapScripts:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishBattle
+	sjump .FinishBattle
 
 .Chikorita:
 	winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
@@ -54,7 +54,7 @@ MountMoon_MapScripts:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .FinishBattle
+	sjump .FinishBattle
 
 .FinishBattle:
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/MrPokemonsHouse.asm b/maps/MrPokemonsHouse.asm
index 5aee409b6..0aa7e5714 100644
--- a/maps/MrPokemonsHouse.asm
+++ b/maps/MrPokemonsHouse.asm
@@ -10,7 +10,7 @@ MrPokemonsHouse_MapScripts:
 	db 0 ; callbacks
 
 .MeetMrPokemon:
-	priorityjump .MrPokemonEvent
+	prioritysjump .MrPokemonEvent
 	end
 
 .DummyScene:
@@ -45,7 +45,7 @@ MrPokemonsHouse_MapScripts:
 	writetext MrPokemonIntroText5
 	waitbutton
 	closetext
-	jump MrPokemonsHouse_OakScript
+	sjump MrPokemonsHouse_OakScript
 
 MrPokemonsHouse_MrPokemonScript:
 	faceplayer
@@ -72,7 +72,7 @@ MrPokemonsHouse_MrPokemonScript:
 	verbosegiveitem EXP_SHARE
 	iffalse .full
 	takeitem RED_SCALE
-	jump .AlwaysNewDiscoveries
+	sjump .AlwaysNewDiscoveries
 
 .refused
 	writetext MrPokemonText_Disappointed
diff --git a/maps/NationalPark.asm b/maps/NationalPark.asm
index 4050c0b8b..bd1b9b8b6 100644
--- a/maps/NationalPark.asm
+++ b/maps/NationalPark.asm
@@ -86,7 +86,7 @@ TrainerSchoolboyJack1:
 	buttonsound
 	setevent EVENT_JACK_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .RequestNumber
+	sjump .RequestNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -96,7 +96,7 @@ TrainerSchoolboyJack1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
@@ -216,7 +216,7 @@ TrainerPokefanfBeverly1:
 	buttonsound
 	setevent EVENT_BEVERLY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .RequestNumber
+	sjump .RequestNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -226,17 +226,17 @@ TrainerPokefanfBeverly1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .GiveNugget:
 	scall .Gift
 	verbosegiveitem NUGGET
 	iffalse .NoRoom
 	clearflag ENGINE_BEVERLY_HAS_NUGGET
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoom:
-	jump .PackFull
+	sjump .PackFull
 
 .NoMarill:
 	writetext UnknownText_0x5c68a
diff --git a/maps/OaksLab.asm b/maps/OaksLab.asm
index b2a765573..89b819b41 100644
--- a/maps/OaksLab.asm
+++ b/maps/OaksLab.asm
@@ -26,7 +26,7 @@ Oak:
 	readvar VAR_BADGES
 	ifequal NUM_BADGES, .OpenMtSilver
 	ifequal NUM_JOHTO_BADGES, .Complain
-	jump .AhGood
+	sjump .AhGood
 
 .CheckPokedex:
 	writetext OakLabDexCheckText
@@ -41,17 +41,17 @@ Oak:
 	writetext OakOpenMtSilverText
 	buttonsound
 	setevent EVENT_OPENED_MT_SILVER
-	jump .CheckPokedex
+	sjump .CheckPokedex
 
 .Complain:
 	writetext OakNoKantoBadgesText
 	buttonsound
-	jump .CheckPokedex
+	sjump .CheckPokedex
 
 .AhGood:
 	writetext OakYesKantoBadgesText
 	buttonsound
-	jump .CheckPokedex
+	sjump .CheckPokedex
 
 OaksAssistant1Script:
 	jumptextfaceplayer OaksAssistant1Text
diff --git a/maps/OlivineLighthouse2F.asm b/maps/OlivineLighthouse2F.asm
index b8b730fdd..989eb1585 100644
--- a/maps/OlivineLighthouse2F.asm
+++ b/maps/OlivineLighthouse2F.asm
@@ -33,7 +33,7 @@ TrainerSailorHuey:
 	iftrue .AskedBefore
 	setevent EVENT_HUEY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedBefore:
 	scall .AskNumber2
@@ -43,7 +43,7 @@ TrainerSailorHuey:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, SAILOR, HUEY1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -99,7 +99,7 @@ TrainerSailorHuey:
 	verbosegiveitem PROTEIN
 	iffalse .PackFull
 	setevent EVENT_GOT_PROTEIN_FROM_HUEY
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .SkipGift:
 	end
@@ -112,7 +112,7 @@ TrainerSailorHuey:
 	iffalse .PackFull
 	clearevent EVENT_HUEY_PROTEIN
 	setevent EVENT_GOT_PROTEIN_FROM_HUEY
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .AskNumber1:
 	jumpstd asknumber1m
diff --git a/maps/OlivinePort.asm b/maps/OlivinePort.asm
index 3e99f456e..55e32bbe9 100644
--- a/maps/OlivinePort.asm
+++ b/maps/OlivinePort.asm
@@ -18,7 +18,7 @@ OlivinePort_MapScripts:
 	end
 
 .LeaveFastShip:
-	priorityjump .LeaveFastShipScript
+	prioritysjump .LeaveFastShipScript
 	end
 
 .LeaveFastShipScript:
@@ -101,7 +101,7 @@ OlivinePortWalkUpToShipScript:
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74a37
-	jump OlivinePortSailorAtGangwayScript
+	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
 	writetext UnknownText_0x74b41
@@ -168,11 +168,11 @@ OlivinePortSailorAfterHOFScript:
 	readvar VAR_FACING
 	ifequal RIGHT, .Right
 	applymovement PLAYER, MovementData_0x74a3f
-	jump OlivinePortSailorAtGangwayScript
+	sjump OlivinePortSailorAtGangwayScript
 
 .Right:
 	applymovement PLAYER, MovementData_0x74a49
-	jump OlivinePortSailorAtGangwayScript
+	sjump OlivinePortSailorAtGangwayScript
 
 .NoTicket:
 	writetext UnknownText_0x74b41
diff --git a/maps/PlayersHouse1F.asm b/maps/PlayersHouse1F.asm
index f86ae16da..8d5703829 100644
--- a/maps/PlayersHouse1F.asm
+++ b/maps/PlayersHouse1F.asm
@@ -28,7 +28,7 @@ MeetMomRightScript:
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
 	iffalse .OnRight
 	applymovement PLAYERSHOUSE1F_MOM1, MomTurnsTowardPlayerMovement
-	jump MeetMomScript
+	sjump MeetMomScript
 
 .OnRight:
 	applymovement PLAYERSHOUSE1F_MOM1, MomWalksToPlayerMovement
@@ -54,7 +54,7 @@ MeetMomScript:
 	special InitialSetDSTFlag
 	yesorno
 	iffalse .SetDayOfWeek
-	jump .DayOfWeekDone
+	sjump .DayOfWeekDone
 
 .WrongDay:
 	special InitialClearDSTFlag
@@ -64,17 +64,17 @@ MeetMomScript:
 	writetext ComeHomeForDSTText
 	yesorno
 	iffalse .ExplainPhone
-	jump .KnowPhone
+	sjump .KnowPhone
 
 .KnowPhone:
 	writetext KnowTheInstructionsText
 	buttonsound
-	jump .FinishPhone
+	sjump .FinishPhone
 
 .ExplainPhone:
 	writetext DontKnowTheInstructionsText
 	buttonsound
-	jump .FinishPhone
+	sjump .FinishPhone
 
 .FinishPhone:
 	writetext InstructionsNextText
@@ -84,15 +84,15 @@ MeetMomScript:
 	iftrue .FromRight
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	iffalse .FromLeft
-	jump .Finish
+	sjump .Finish
 
 .FromRight:
 	applymovement PLAYERSHOUSE1F_MOM1, MomTurnsBackMovement
-	jump .Finish
+	sjump .Finish
 
 .FromLeft:
 	applymovement PLAYERSHOUSE1F_MOM1, MomWalksBackMovement
-	jump .Finish
+	sjump .Finish
 
 .Finish:
 	special RestartMapMusic
@@ -101,7 +101,7 @@ MeetMomScript:
 
 MeetMomTalkedScript:
 	playmusic MUSIC_MOM
-	jump MeetMomScript
+	sjump MeetMomScript
 
 GearName:
 	db "#GEAR@"
@@ -163,17 +163,17 @@ NeighborScript:
 .MornScript:
 	writetext NeighborMornIntroText
 	buttonsound
-	jump .Main
+	sjump .Main
 
 .DayScript:
 	writetext NeighborDayIntroText
 	buttonsound
-	jump .Main
+	sjump .Main
 
 .NiteScript:
 	writetext NeighborNiteIntroText
 	buttonsound
-	jump .Main
+	sjump .Main
 
 .Main:
 	writetext NeighborText
diff --git a/maps/Pokecenter2F.asm b/maps/Pokecenter2F.asm
index 0ec1532a8..b79d251d0 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
-	priorityjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
+	prioritysjump Pokecenter2F_AppearMysteryGiftDeliveryGuy
 
 .Scene0Done:
 	end
 
 .Scene1:
-	priorityjump Script_LeftCableTradeCenter
+	prioritysjump Script_LeftCableTradeCenter
 	end
 
 .Scene2:
-	priorityjump Script_LeftCableColosseum
+	prioritysjump Script_LeftCableColosseum
 	end
 
 .Scene3:
-	priorityjump Script_LeftTimeCapsule
+	prioritysjump Script_LeftTimeCapsule
 	end
 
 .Scene4:
-	priorityjump Script_LeftMobileTradeRoom
+	prioritysjump Script_LeftMobileTradeRoom
 	end
 
 .Scene5:
-	priorityjump Script_LeftMobileBattleRoom
+	prioritysjump Script_LeftMobileBattleRoom
 	end
 
 Pokecenter2F_AppearMysteryGiftDeliveryGuy:
@@ -125,7 +125,7 @@ LinkReceptionistScript_Trade:
 
 .LinkTimedOut:
 	writetext Text_LinkTimedOut
-	jump .AbortLink
+	sjump .AbortLink
 
 .DidNotSave:
 	writetext Text_PleaseComeAgain
@@ -227,7 +227,7 @@ LinkReceptionistScript_Battle:
 
 .LinkTimedOut:
 	writetext Text_LinkTimedOut
-	jump .AbortLink
+	sjump .AbortLink
 
 .DidNotSave:
 	writetext Text_PleaseComeAgain
@@ -274,7 +274,7 @@ LinkReceptionistScript_Battle:
 	ifequal $1, .Mobile_OK
 	ifequal $2, .Mobile_OK
 	ifequal $3, .Mobile_InvalidParty
-	jump .Mobile_DidNotSelect
+	sjump .Mobile_DidNotSelect
 
 .Mobile_InvalidParty:
 	writetext Text_BrokeStadiumRules
@@ -347,7 +347,7 @@ LinkReceptionistScript_TimeCapsule:
 
 .LinkTimedOut:
 	writetext Text_LinkTimedOut
-	jump .Cancel
+	sjump .Cancel
 
 .DidNotSave:
 	writetext Text_PleaseComeAgain
@@ -516,12 +516,12 @@ TimeCapsuleScript_CheckPlayerGender:
 	ifequal LEFT, .FemaleFacingLeft
 	applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepUp_2
-	jump .FemaleContinue
+	sjump .FemaleContinue
 
 .FemaleFacingRight:
 	applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsRightLooksLeft_2
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepRight
-	jump .FemaleContinue
+	sjump .FemaleContinue
 
 .FemaleFacingLeft:
 	applymovementlasttalked Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight_2
@@ -562,7 +562,7 @@ Script_LeftTimeCapsule:
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
 	applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsRightLooksDown_2
-	jump .Done
+	sjump .Done
 
 .Female:
 	applymovement POKECENTER2F_TIME_CAPSULE_RECEPTIONIST, Pokecenter2FMovementData_ReceptionistStepsLeftLooksRight
diff --git a/maps/PokecomCenterAdminOfficeMobile.asm b/maps/PokecomCenterAdminOfficeMobile.asm
index 3c0b3c6c5..17de08252 100644
--- a/maps/PokecomCenterAdminOfficeMobile.asm
+++ b/maps/PokecomCenterAdminOfficeMobile.asm
@@ -28,19 +28,19 @@ PokecomCenterAdminOfficeMobileComputer1:
 	closewindow
 	ifequal 1, .PokeComClub
 	ifequal 2, .MobileCenter
-	jump .Quit
+	sjump .Quit
 
 .PokeComClub:
 	opentext
 	writetext PokecomCenterAdminOfficeMobileComputer1Text_PokeComClub
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .MobileCenter:
 	opentext
 	writetext PokecomCenterAdminOfficeMobileComputer1Text_MobileCenter
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .Quit:
 	closetext
@@ -70,19 +70,19 @@ PokecomCenterAdminOfficeMobileComputer2:
 	closewindow
 	ifequal 1, .UsePhone
 	ifequal 2, .DontUsePhone
-	jump .Quit
+	sjump .Quit
 
 .UsePhone:
 	opentext
 	writetext PokecomCenterAdminOfficeMobileComputer2Text_UsePhone
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .DontUsePhone:
 	opentext
 	writetext PokecomCenterAdminOfficeMobileComputer2Text_DontUsePhone
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .Quit:
 	closetext
diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm
index d9db0d89c..c85f216b8 100644
--- a/maps/RadioTower1F.asm
+++ b/maps/RadioTower1F.asm
@@ -58,7 +58,7 @@ RadioTower1FLuckyNumberManScript:
 	ifequal 1, .FirstPlace
 	ifequal 2, .SecondPlace
 	ifequal 3, .ThirdPlace
-	jump .NoPrize
+	sjump .NoPrize
 
 .GameOver:
 	writetext UnknownText_0x5cf7e
@@ -75,7 +75,7 @@ RadioTower1FLuckyNumberManScript:
 	iffalse .BagFull
 	itemnotify
 	setflag ENGINE_LUCKY_NUMBER_SHOW
-	jump .GameOver
+	sjump .GameOver
 
 .SecondPlace:
 	writetext UnknownText_0x5d023
@@ -86,7 +86,7 @@ RadioTower1FLuckyNumberManScript:
 	iffalse .BagFull
 	itemnotify
 	setflag ENGINE_LUCKY_NUMBER_SHOW
-	jump .GameOver
+	sjump .GameOver
 
 .ThirdPlace:
 	writetext UnknownText_0x5d076
@@ -97,7 +97,7 @@ RadioTower1FLuckyNumberManScript:
 	iffalse .BagFull
 	itemnotify
 	setflag ENGINE_LUCKY_NUMBER_SHOW
-	jump .GameOver
+	sjump .GameOver
 
 .NoPrize:
 	writetext UnknownText_0x5d0c0
diff --git a/maps/RadioTower2F.asm b/maps/RadioTower2F.asm
index d45e9ea14..218f4b716 100644
--- a/maps/RadioTower2F.asm
+++ b/maps/RadioTower2F.asm
@@ -273,7 +273,7 @@ Buena:
 	setevent EVENT_BUENA_OFFERED_HER_PHONE_NUMBER
 	opentext
 	writetext UnknownText_0x5e1ee
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .OfferedNumberBefore:
 	opentext
diff --git a/maps/RadioTower5F.asm b/maps/RadioTower5F.asm
index b89ab315c..fb4c16d75 100644
--- a/maps/RadioTower5F.asm
+++ b/maps/RadioTower5F.asm
@@ -128,7 +128,7 @@ RadioTower5FRocketBossScene:
 	setmapscene ECRUTEAK_TIN_TOWER_ENTRANCE, SCENE_DEFAULT
 	setevent EVENT_GOT_CLEAR_BELL
 	setevent EVENT_TEAM_ROCKET_DISBANDED
-	jump .UselessJump
+	sjump .UselessJump
 
 .UselessJump:
 	applymovement RADIOTOWER5F_DIRECTOR, RadioTower5FDirectorWalksOut
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 0ced38d38..8e22eedb0 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -41,7 +41,7 @@ TrainerCooltrainermGaven3:
 	buttonsound
 	setevent EVENT_GAVEN_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -51,7 +51,7 @@ TrainerCooltrainermGaven3:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -145,7 +145,7 @@ TrainerCooltrainerfBeth1:
 	buttonsound
 	setevent EVENT_BETH_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -155,7 +155,7 @@ TrainerCooltrainerfBeth1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
diff --git a/maps/Route27.asm b/maps/Route27.asm
index ec2e8f9a5..969a9ad48 100644
--- a/maps/Route27.asm
+++ b/maps/Route27.asm
@@ -26,7 +26,7 @@ FirstStepIntoKantoLeftScene:
 	turnobject ROUTE27_FISHER, LEFT
 	showemote EMOTE_SHOCK, ROUTE27_FISHER, 15
 	applymovement ROUTE27_FISHER, MovementData_0x1a0a66
-	jump FirstStepIntoKantoScene_Continue
+	sjump FirstStepIntoKantoScene_Continue
 
 FirstStepIntoKantoRightScene:
 	turnobject ROUTE27_FISHER, LEFT
@@ -76,7 +76,7 @@ TrainerBirdKeeperJose2:
 	buttonsound
 	setevent EVENT_JOSE_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -86,7 +86,7 @@ TrainerBirdKeeperJose2:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -129,10 +129,10 @@ TrainerBirdKeeperJose2:
 	verbosegiveitem STAR_PIECE
 	iffalse .NoRoom
 	clearflag ENGINE_JOSE_HAS_STAR_PIECE
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoom:
-	jump .PackFull
+	sjump .PackFull
 
 .AskNumber1:
 	jumpstd asknumber1m
@@ -209,7 +209,7 @@ TrainerCooltrainerfReena:
 	buttonsound
 	setevent EVENT_REENA_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -219,7 +219,7 @@ TrainerCooltrainerfReena:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
diff --git a/maps/Route27SandstormHouse.asm b/maps/Route27SandstormHouse.asm
index 886e7aa26..7083c95cb 100644
--- a/maps/Route27SandstormHouse.asm
+++ b/maps/Route27SandstormHouse.asm
@@ -15,7 +15,7 @@ SandstormHouseWoman:
 	writetext SandstormHouseWomanText1
 	buttonsound
 	ifgreater 150 - 1, .Loyal
-	jump .Disloyal
+	sjump .Disloyal
 
 .Loyal:
 	writetext SandstormHouseWomanLoyalText
diff --git a/maps/Route30.asm b/maps/Route30.asm
index 90c4ece81..db6f5051c 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -53,7 +53,7 @@ TrainerYoungsterJoey:
 	buttonsound
 	setevent EVENT_JOEY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .RequestNumber
+	sjump .RequestNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -63,7 +63,7 @@ TrainerYoungsterJoey:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
@@ -131,7 +131,7 @@ TrainerYoungsterJoey:
 	verbosegiveitem HP_UP
 	iffalse .PackFull
 	setevent EVENT_GOT_HP_UP_FROM_JOEY
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .done
 	end
@@ -144,7 +144,7 @@ TrainerYoungsterJoey:
 	iffalse .PackFull
 	clearevent EVENT_JOEY_HP_UP
 	setevent EVENT_GOT_HP_UP_FROM_JOEY
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .AskNumber1:
 	jumpstd asknumber1m
diff --git a/maps/Route31.asm b/maps/Route31.asm
index e0a1a9db4..189e3fbe8 100644
--- a/maps/Route31.asm
+++ b/maps/Route31.asm
@@ -41,7 +41,7 @@ TrainerBugCatcherWade1:
 	waitbutton
 	setevent EVENT_WADE_ASKED_FOR_PHONE_NUMBER
 	scall .AskPhoneNumberSTD
-	jump .Continue
+	sjump .Continue
 
 .AskAgain:
 	scall .AskAgainSTD
@@ -51,7 +51,7 @@ TrainerBugCatcherWade1:
 	ifequal PHONE_CONTACT_REFUSED, .DeclinedNumberSTD
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
 	scall .RegisterNumberSTD
-	jump .AcceptedNumberSTD
+	sjump .AcceptedNumberSTD
 
 .WadeRematch:
 	scall .RematchSTD
@@ -126,23 +126,23 @@ TrainerBugCatcherWade1:
 .Berry:
 	verbosegiveitem BERRY
 	iffalse .PackFull
-	jump .Done
+	sjump .Done
 .Psncureberry:
 	verbosegiveitem PSNCUREBERRY
 	iffalse .PackFull
-	jump .Done
+	sjump .Done
 .Przcureberry:
 	verbosegiveitem PRZCUREBERRY
 	iffalse .PackFull
-	jump .Done
+	sjump .Done
 .BitterBerry:
 	verbosegiveitem BITTER_BERRY
 	iffalse .PackFull
 .Done:
 	clearflag ENGINE_WADE_HAS_ITEM
-	jump .AcceptedNumberSTD
+	sjump .AcceptedNumberSTD
 .PackFull:
-	jump .PackFullSTD
+	sjump .PackFullSTD
 
 .AskPhoneNumberSTD:
 	jumpstd asknumber1m
diff --git a/maps/Route32.asm b/maps/Route32.asm
index d4d5dac1a..44d1d0a6c 100644
--- a/maps/Route32.asm
+++ b/maps/Route32.asm
@@ -69,7 +69,7 @@ Route32CooltrainerMContinueScene:
 	verbosegiveitem MIRACLE_SEED
 	iffalse .BagFull
 	setevent EVENT_GOT_MIRACLE_SEED_IN_ROUTE_32
-	jump .GotMiracleSeed
+	sjump .GotMiracleSeed
 
 .DontHaveZephyrBadge:
 	writetext Route32CooltrainerMText_VioletGym
@@ -120,7 +120,7 @@ Route32RoarTMGuyScript:
 Route32WannaBuyASlowpokeTailScript:
 	turnobject ROUTE32_FISHER4, DOWN
 	turnobject PLAYER, UP
-	jump _OfferToSellSlowpokeTail
+	sjump _OfferToSellSlowpokeTail
 
 SlowpokeTailSalesmanScript:
 	faceplayer
@@ -182,7 +182,7 @@ TrainerFisherRalph1:
 	buttonsound
 	setevent EVENT_RALPH_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -192,7 +192,7 @@ TrainerFisherRalph1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, FISHER, RALPH1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
@@ -316,7 +316,7 @@ TrainerPicnickerLiz1:
 	buttonsound
 	setevent EVENT_LIZ_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -326,7 +326,7 @@ TrainerPicnickerLiz1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
diff --git a/maps/Route33.asm b/maps/Route33.asm
index f8e771626..8bff3f171 100644
--- a/maps/Route33.asm
+++ b/maps/Route33.asm
@@ -30,7 +30,7 @@ TrainerHikerAnthony:
 	buttonsound
 	setevent EVENT_ANTHONY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForPhoneNumber
+	sjump .AskForPhoneNumber
 
 .AskAgain:
 	scall .AskNumber2
@@ -40,7 +40,7 @@ TrainerHikerAnthony:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
diff --git a/maps/Route34.asm b/maps/Route34.asm
index a72d65a8d..a2ea82aab 100644
--- a/maps/Route34.asm
+++ b/maps/Route34.asm
@@ -24,22 +24,22 @@ Route34_MapScripts:
 	iftrue .PutDayCareManOutside
 	clearevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	setevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
-	jump .CheckMon1
+	sjump .CheckMon1
 
 .PutDayCareManOutside:
 	setevent EVENT_DAY_CARE_MAN_IN_DAY_CARE
 	clearevent EVENT_DAY_CARE_MAN_ON_ROUTE_34
-	jump .CheckMon1
+	sjump .CheckMon1
 
 .CheckMon1:
 	checkflag ENGINE_DAY_CARE_MAN_HAS_MON
 	iffalse .HideMon1
 	clearevent EVENT_DAY_CARE_MON_1
-	jump .CheckMon2
+	sjump .CheckMon2
 
 .HideMon1:
 	setevent EVENT_DAY_CARE_MON_1
-	jump .CheckMon2
+	sjump .CheckMon2
 
 .CheckMon2:
 	checkflag ENGINE_DAY_CARE_LADY_HAS_MON
@@ -104,7 +104,7 @@ TrainerCamperTodd1:
 	buttonsound
 	setevent EVENT_TODD_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber
-	jump .FinishAsk
+	sjump .FinishAsk
 
 .AskAgain:
 	scall .AskNumber2
@@ -114,7 +114,7 @@ TrainerCamperTodd1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, CAMPER, TODD1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
@@ -229,7 +229,7 @@ TrainerPicnickerGina1:
 	buttonsound
 	setevent EVENT_GINA_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .FinishAsk
+	sjump .FinishAsk
 
 .AskAgain:
 	scall .AskNumber2
@@ -239,7 +239,7 @@ TrainerPicnickerGina1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, PICNICKER, GINA1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .Rematch:
 	scall .RematchStd
@@ -307,10 +307,10 @@ TrainerPicnickerGina1:
 	iffalse .BagFull
 	clearflag ENGINE_GINA_HAS_LEAF_STONE
 	setevent EVENT_GINA_GAVE_LEAF_STONE
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .BagFull:
-	jump .PackFull
+	sjump .PackFull
 
 .AskNumber1:
 	jumpstd asknumber1f
diff --git a/maps/Route35.asm b/maps/Route35.asm
index dc3f17014..0ed21e0e5 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -42,7 +42,7 @@ TrainerJugglerIrwin:
 	buttonsound
 	setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
 	scall Route35AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route35AskNumber2M
@@ -52,7 +52,7 @@ TrainerJugglerIrwin:
 	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
 	scall Route35RegisteredNumberM
-	jump Route35NumberAcceptedM
+	sjump Route35NumberAcceptedM
 
 Route35AskNumber1M:
 	jumpstd asknumber1m
@@ -145,7 +145,7 @@ TrainerBugCatcherArnie:
 	buttonsound
 	setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
 	scall Route35AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route35AskNumber2M
@@ -155,7 +155,7 @@ TrainerBugCatcherArnie:
 	ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
 	scall Route35RegisteredNumberM
-	jump Route35NumberAcceptedM
+	sjump Route35NumberAcceptedM
 
 .WantsBattle:
 	scall Route35RematchM
diff --git a/maps/Route35NationalParkGate.asm b/maps/Route35NationalParkGate.asm
index 4f9026979..d67480528 100644
--- a/maps/Route35NationalParkGate.asm
+++ b/maps/Route35NationalParkGate.asm
@@ -20,7 +20,7 @@ Route35NationalParkGate_MapScripts:
 	end
 
 .LeaveContestEarly:
-	priorityjump .LeavingContestEarly
+	prioritysjump .LeavingContestEarly
 	end
 
 .CheckIfContestRunning:
@@ -146,7 +146,7 @@ Route35NationalParkGate_LessThanFullParty:
 	playsound SFX_GOT_SAFARI_BALLS
 	waitsfx
 	buttonsound
-	jump Route35NationalParkGate_OkayToProceed
+	sjump Route35NationalParkGate_OkayToProceed
 
 Route35NationalParkGate_DeclinedToParticipate:
 	writetext UnknownText_0x6a5dc
diff --git a/maps/Route36.asm b/maps/Route36.asm
index bb490d1df..b4399f1dd 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -183,7 +183,7 @@ TrainerSchoolboyAlan1:
 	buttonsound
 	setevent EVENT_ALAN_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .ContinueAskForPhoneNumber
+	sjump .ContinueAskForPhoneNumber
 
 .AskAgainForPhoneNumber:
 	scall .AskNumber2
@@ -193,7 +193,7 @@ TrainerSchoolboyAlan1:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .ChooseRematch:
 	scall .Rematch
@@ -261,10 +261,10 @@ TrainerSchoolboyAlan1:
 	iffalse .BagFull
 	clearflag ENGINE_ALAN_HAS_FIRE_STONE
 	setevent EVENT_ALAN_GAVE_FIRE_STONE
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .BagFull:
-	jump .PackFull
+	sjump .PackFull
 
 .AskNumber1:
 	jumpstd asknumber1m
diff --git a/maps/Route36NationalParkGate.asm b/maps/Route36NationalParkGate.asm
index 30ea3abf3..7880cf612 100644
--- a/maps/Route36NationalParkGate.asm
+++ b/maps/Route36NationalParkGate.asm
@@ -29,7 +29,7 @@ Route36NationalParkGate_MapScripts:
 	end
 
 .LeaveContestEarly:
-	priorityjump .LeavingContestEarly
+	prioritysjump .LeavingContestEarly
 	end
 
 .CheckIfContestRunning:
@@ -198,7 +198,7 @@ Route36OfficerScriptContest:
 	playsound SFX_GOT_SAFARI_BALLS
 	waitsfx
 	buttonsound
-	jump .ResumeStartingContest
+	sjump .ResumeStartingContest
 
 .DecidedNotToJoinContest:
 	writetext UnknownText_0x6b0c6
diff --git a/maps/Route37.asm b/maps/Route37.asm
index 326e0a870..eac94fa89 100644
--- a/maps/Route37.asm
+++ b/maps/Route37.asm
@@ -73,7 +73,7 @@ SunnyScript:
 	iftrue .Kris
 	writetext SunnyGivesGiftText1
 	buttonsound
-	jump .next
+	sjump .next
 .Kris:
 	writetext SunnyGivesGiftText2
 	buttonsound
diff --git a/maps/Route38.asm b/maps/Route38.asm
index ee49612e7..5ecc35e91 100644
--- a/maps/Route38.asm
+++ b/maps/Route38.asm
@@ -53,7 +53,7 @@ TrainerLassDana1:
 	buttonsound
 	setevent EVENT_DANA_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1F
-	jump .AskForPhoneNumber
+	sjump .AskForPhoneNumber
 
 .SecondTimeAsking:
 	scall .AskNumber2F
@@ -63,7 +63,7 @@ TrainerLassDana1:
 	ifequal PHONE_CONTACT_REFUSED, .DeclinedPhoneNumber
 	gettrainername STRING_BUFFER_3, LASS, DANA1
 	scall .RegisteredPhoneNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .DanaRematch:
 	scall .Rematch
@@ -131,10 +131,10 @@ TrainerLassDana1:
 	iffalse .NoRoomForThunderstone
 	clearflag ENGINE_DANA_HAS_THUNDERSTONE
 	setevent EVENT_DANA_GAVE_THUNDERSTONE
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoomForThunderstone:
-	jump .PackFull
+	sjump .PackFull
 
 .AskNumber1F:
 	jumpstd asknumber1f
@@ -189,7 +189,7 @@ TrainerSchoolboyChad1:
 	buttonsound
 	setevent EVENT_CHAD_ASKED_FOR_PHONE_NUMBER
 	scall .AskPhoneNumber1
-	jump .AskToRegisterNumber
+	sjump .AskToRegisterNumber
 
 .SecondTimeAsking:
 	scall .AskPhoneNumber2
@@ -199,7 +199,7 @@ TrainerSchoolboyChad1:
 	ifequal PHONE_CONTACT_REFUSED, .SaidNo
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
 	scall .RegisteredChad
-	jump .HaveChadsNumber
+	sjump .HaveChadsNumber
 
 .ChadRematch:
 	scall .Rematch
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 498ac690f..60ea78350 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -42,7 +42,7 @@ TrainerPokefanmDerek:
 	buttonsound
 	setevent EVENT_DEREK_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -52,17 +52,17 @@ TrainerPokefanmDerek:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .HasNugget:
 	scall .Gift
 	verbosegiveitem NUGGET
 	iffalse .NoRoom
 	clearflag ENGINE_DEREK_HAS_NUGGET
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoom:
-	jump .PackFull
+	sjump .PackFull
 
 .WantsPikachu:
 	writetext PokefanMDerekPikachuIsItText
diff --git a/maps/Route42.asm b/maps/Route42.asm
index 8ea0b1b07..78dc2bf8b 100644
--- a/maps/Route42.asm
+++ b/maps/Route42.asm
@@ -53,7 +53,7 @@ TrainerFisherTully:
 	buttonsound
 	setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -63,7 +63,7 @@ TrainerFisherTully:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, FISHER, TULLY1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -119,10 +119,10 @@ TrainerFisherTully:
 	iffalse .NoRoom
 	clearflag ENGINE_TULLY_HAS_WATER_STONE
 	setevent EVENT_TULLY_GAVE_WATER_STONE
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoom:
-	jump .PackFull
+	sjump .PackFull
 
 .AskNumber1:
 	jumpstd asknumber1m
diff --git a/maps/Route43.asm b/maps/Route43.asm
index bffbcffde..c1593aaa8 100644
--- a/maps/Route43.asm
+++ b/maps/Route43.asm
@@ -63,7 +63,7 @@ TrainerPokemaniacBrent:
 	buttonsound
 	setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -73,7 +73,7 @@ TrainerPokemaniacBrent:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -194,7 +194,7 @@ TrainerPicnickerTiffany:
 	buttonsound
 	setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
 	scall .AskNumber1
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall .AskNumber2
@@ -204,7 +204,7 @@ TrainerPicnickerTiffany:
 	ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
 	gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
 	scall .RegisteredNumber
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .WantsBattle:
 	scall .Rematch
@@ -260,10 +260,10 @@ TrainerPicnickerTiffany:
 	iffalse .NoRoom
 	clearflag ENGINE_TIFFANY_HAS_PINK_BOW
 	setevent EVENT_TIFFANY_GAVE_PINK_BOW
-	jump .NumberAccepted
+	sjump .NumberAccepted
 
 .NoRoom:
-	jump .PackFull
+	sjump .PackFull
 
 .NoClefairy:
 	writetext PicnickerTiffanyClefairyText
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index 9d9b11994..478d67705 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -14,7 +14,7 @@ Route43Gate_MapScripts:
 	callback MAPCALLBACK_NEWMAP, .CheckIfRockets
 
 .RocketShakedown:
-	priorityjump .RocketTakeover
+	prioritysjump .RocketTakeover
 	end
 
 .DummyScene:
@@ -50,17 +50,17 @@ RocketScript_Southbound:
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
 	ifequal HAVE_MORE, RocketScript_TollSouth
-	jump RocketScript_YoureBrokeSouth
+	sjump RocketScript_YoureBrokeSouth
 
 RocketScript_TollSouth:
 	takemoney YOUR_MONEY, ROUTE43GATE_TOLL
 	writetext RocketText_ThankYou
-	jump RocketScript_ShakeDownSouth
+	sjump RocketScript_ShakeDownSouth
 
 RocketScript_YoureBrokeSouth:
 	takemoney YOUR_MONEY, ROUTE43GATE_TOLL
 	writetext RocketText_AllYouGot
-	jump RocketScript_ShakeDownSouth
+	sjump RocketScript_ShakeDownSouth
 
 RocketScript_ShakeDownSouth:
 	buttonsound
@@ -82,17 +82,17 @@ RocketScript_Northbound:
 	buttonsound
 	checkmoney YOUR_MONEY, ROUTE43GATE_TOLL - 1
 	ifequal HAVE_MORE, RocketScript_TollNorth
-	jump RocketScript_YoureBrokeNorth
+	sjump RocketScript_YoureBrokeNorth
 
 RocketScript_TollNorth:
 	takemoney YOUR_MONEY, ROUTE43GATE_TOLL
 	writetext RocketText_ThankYou
-	jump RocketScript_ShakeDownNorth
+	sjump RocketScript_ShakeDownNorth
 
 RocketScript_YoureBrokeNorth:
 	takemoney YOUR_MONEY, ROUTE43GATE_TOLL
 	writetext RocketText_AllYouGot
-	jump RocketScript_ShakeDownNorth
+	sjump RocketScript_ShakeDownNorth
 
 RocketScript_ShakeDownNorth:
 	buttonsound
diff --git a/maps/Route44.asm b/maps/Route44.asm
index f1837c732..1ac89f0d7 100644
--- a/maps/Route44.asm
+++ b/maps/Route44.asm
@@ -33,7 +33,7 @@ TrainerBirdKeeperVance1:
 	buttonsound
 	setevent EVENT_VANCE_ASKED_FOR_PHONE_NUMBER
 	scall Route44AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route44AskNumber2M
@@ -43,7 +43,7 @@ TrainerBirdKeeperVance1:
 	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
 	scall Route44RegisteredNumberM
-	jump Route44NumberAcceptedM
+	sjump Route44NumberAcceptedM
 
 .WantsBattle:
 	scall Route44RematchM
@@ -87,7 +87,7 @@ TrainerBirdKeeperVance1:
 	verbosegiveitem CARBOS
 	iffalse VancePackFull
 	setevent EVENT_GOT_CARBOS_FROM_VANCE
-	jump Route44NumberAcceptedM
+	sjump Route44NumberAcceptedM
 
 .ReceivedCarbosBefore:
 	end
@@ -100,7 +100,7 @@ TrainerBirdKeeperVance1:
 	iffalse VancePackFull
 	clearevent EVENT_VANCE_CARBOS
 	setevent EVENT_GOT_CARBOS_FROM_VANCE
-	jump Route44NumberAcceptedM
+	sjump Route44NumberAcceptedM
 
 Route44AskNumber1M:
 	jumpstd asknumber1m
@@ -177,7 +177,7 @@ TrainerFisherWilton1:
 	buttonsound
 	setevent EVENT_WILTON_ASKED_FOR_PHONE_NUMBER
 	scall Route44AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route44AskNumber2M
@@ -187,7 +187,7 @@ TrainerFisherWilton1:
 	ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
 	gettrainername STRING_BUFFER_3, FISHER, WILTON1
 	scall Route44RegisteredNumberM
-	jump Route44NumberAcceptedM
+	sjump Route44NumberAcceptedM
 
 .WantsBattle:
 	scall Route44RematchM
@@ -236,22 +236,22 @@ TrainerFisherWilton1:
 .UltraBall:
 	verbosegiveitem ULTRA_BALL
 	iffalse .Route44PackFullM
-	jump .ItemReceived
+	sjump .ItemReceived
 
 .GreatBall:
 	verbosegiveitem GREAT_BALL
 	iffalse .Route44PackFullM
-	jump .ItemReceived
+	sjump .ItemReceived
 
 .PokeBall:
 	verbosegiveitem POKE_BALL
 	iffalse .Route44PackFullM
 .ItemReceived:
 	clearflag ENGINE_WILTON_HAS_ITEM
-	jump Route44NumberAcceptedM
+	sjump Route44NumberAcceptedM
 
 .Route44PackFullM:
-	jump Route44PackFullM
+	sjump Route44PackFullM
 
 TrainerFisherEdgar:
 	trainer FISHER, EDGAR, EVENT_BEAT_FISHER_EDGAR, FisherEdgarSeenText, FisherEdgarBeatenText, 0, .Script
diff --git a/maps/Route45.asm b/maps/Route45.asm
index 1bfcef972..9b4eda79d 100644
--- a/maps/Route45.asm
+++ b/maps/Route45.asm
@@ -34,7 +34,7 @@ TrainerBlackbeltKenji:
 	waitbutton
 	setevent EVENT_KENJI_ASKED_FOR_PHONE_NUMBER
 	scall Route45AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route45AskNumber2M
@@ -44,7 +44,7 @@ TrainerBlackbeltKenji:
 	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
 	scall Route45RegisteredNumberM
-	jump Route45NumberAcceptedM
+	sjump Route45NumberAcceptedM
 
 .Registered:
 	readvar VAR_KENJI_BREAK
@@ -60,7 +60,7 @@ TrainerBlackbeltKenji:
 	iffalse .NoRoom
 	clearevent EVENT_KENJI_ON_BREAK
 	special SampleKenjiBreakCountdown
-	jump Route45NumberAcceptedM
+	sjump Route45NumberAcceptedM
 
 .Morning:
 	writetext BlackbeltKenjiMorningText
@@ -75,7 +75,7 @@ TrainerBlackbeltKenji:
 	end
 
 .NoRoom:
-	jump Route45PackFullM
+	sjump Route45PackFullM
 
 Route45AskNumber1M:
 	jumpstd asknumber1m
@@ -161,7 +161,7 @@ TrainerHikerParry:
 	buttonsound
 	setevent EVENT_PARRY_ASKED_FOR_PHONE_NUMBER
 	scall Route45AskNumber1M
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route45AskNumber2M
@@ -171,7 +171,7 @@ TrainerHikerParry:
 	ifequal PHONE_CONTACT_REFUSED, Route45NumberDeclinedM
 	gettrainername STRING_BUFFER_3, HIKER, PARRY1
 	scall Route45RegisteredNumberM
-	jump Route45NumberAcceptedM
+	sjump Route45NumberAcceptedM
 
 .WantsBattle:
 	scall Route45RematchM
@@ -215,7 +215,7 @@ TrainerHikerParry:
 	verbosegiveitem IRON
 	iffalse HikerParryHasIron
 	setevent EVENT_GOT_IRON_FROM_PARRY
-	jump Route45NumberAcceptedM
+	sjump Route45NumberAcceptedM
 
 .GotIron:
 	end
@@ -228,7 +228,7 @@ TrainerHikerParry:
 	iffalse HikerParryHasIron
 	clearevent EVENT_PARRY_IRON
 	setevent EVENT_GOT_IRON_FROM_PARRY
-	jump Route45NumberAcceptedM
+	sjump Route45NumberAcceptedM
 
 TrainerHikerTimothy:
 	trainer HIKER, TIMOTHY, EVENT_BEAT_HIKER_TIMOTHY, HikerTimothySeenText, HikerTimothyBeatenText, 0, .Script
diff --git a/maps/Route46.asm b/maps/Route46.asm
index fca785099..365748244 100644
--- a/maps/Route46.asm
+++ b/maps/Route46.asm
@@ -39,7 +39,7 @@ TrainerPicnickerErin1:
 	buttonsound
 	setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
 	scall Route46AskNumber1F
-	jump .AskForNumber
+	sjump .AskForNumber
 
 .AskedAlready:
 	scall Route46AskNumber2F
@@ -49,7 +49,7 @@ TrainerPicnickerErin1:
 	ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
 	gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
 	scall Route46RegisteredNumberF
-	jump Route46NumberAcceptedF
+	sjump Route46NumberAcceptedF
 
 .WantsBattle:
 	scall Route46RematchF
@@ -93,7 +93,7 @@ TrainerPicnickerErin1:
 	verbosegiveitem CALCIUM
 	iffalse ErinNoRoomForCalcium
 	setevent EVENT_GOT_CALCIUM_FROM_ERIN
-	jump Route46NumberAcceptedF
+	sjump Route46NumberAcceptedF
 
 .GotCalciumAlready:
 	end
@@ -106,7 +106,7 @@ TrainerPicnickerErin1:
 	iffalse ErinNoRoomForCalcium
 	clearevent EVENT_ERIN_CALCIUM
 	setevent EVENT_GOT_CALCIUM_FROM_ERIN
-	jump Route46NumberAcceptedF
+	sjump Route46NumberAcceptedF
 
 Route46AskNumber1F:
 	jumpstd asknumber1f
diff --git a/maps/RuinsOfAlphAerodactylChamber.asm b/maps/RuinsOfAlphAerodactylChamber.asm
index c5aa497f4..1c036a978 100644
--- a/maps/RuinsOfAlphAerodactylChamber.asm
+++ b/maps/RuinsOfAlphAerodactylChamber.asm
@@ -12,7 +12,7 @@ RuinsOfAlphAerodactylChamber_MapScripts:
 	end
 
 .OpenWall:
-	priorityjump .WallOpenScript
+	prioritysjump .WallOpenScript
 	end
 
 .DummyScene:
diff --git a/maps/RuinsOfAlphHoOhChamber.asm b/maps/RuinsOfAlphHoOhChamber.asm
index 4c30e0466..1ddc0302f 100644
--- a/maps/RuinsOfAlphHoOhChamber.asm
+++ b/maps/RuinsOfAlphHoOhChamber.asm
@@ -13,7 +13,7 @@ RuinsOfAlphHoOhChamber_MapScripts:
 	end
 
 .OpenWall:
-	priorityjump .WallOpenScript
+	prioritysjump .WallOpenScript
 	end
 
 .DummyScene:
diff --git a/maps/RuinsOfAlphInnerChamber.asm b/maps/RuinsOfAlphInnerChamber.asm
index 7f5348633..62b0d6c13 100644
--- a/maps/RuinsOfAlphInnerChamber.asm
+++ b/maps/RuinsOfAlphInnerChamber.asm
@@ -14,7 +14,7 @@ RuinsOfAlphInnerChamber_MapScripts:
 	end
 
 .UnownAppear:
-	priorityjump .StrangePresenceScript
+	prioritysjump .StrangePresenceScript
 	end
 
 .StrangePresenceScript:
diff --git a/maps/RuinsOfAlphKabutoChamber.asm b/maps/RuinsOfAlphKabutoChamber.asm
index f5e11cb24..37548f5ec 100644
--- a/maps/RuinsOfAlphKabutoChamber.asm
+++ b/maps/RuinsOfAlphKabutoChamber.asm
@@ -16,7 +16,7 @@ RuinsOfAlphKabutoChamber_MapScripts:
 	end
 
 .OpenWall:
-	priorityjump .WallOpenScript
+	prioritysjump .WallOpenScript
 	end
 
 .DummyScene:
diff --git a/maps/RuinsOfAlphOmanyteChamber.asm b/maps/RuinsOfAlphOmanyteChamber.asm
index d1243cc9c..cd94ea1b4 100644
--- a/maps/RuinsOfAlphOmanyteChamber.asm
+++ b/maps/RuinsOfAlphOmanyteChamber.asm
@@ -13,7 +13,7 @@ RuinsOfAlphOmanyteChamber_MapScripts:
 	end
 
 .OpenWall:
-	priorityjump .WallOpenScript
+	prioritysjump .WallOpenScript
 	end
 
 .DummyScene:
diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm
index fcd539b93..1812bcd30 100644
--- a/maps/RuinsOfAlphOutside.asm
+++ b/maps/RuinsOfAlphOutside.asm
@@ -24,12 +24,12 @@ RuinsOfAlphOutside_MapScripts:
 	iftrue .NoScientist
 	checkevent EVENT_MADE_UNOWN_APPEAR_IN_RUINS
 	iftrue .MaybeScientist
-	jump .NoScientist
+	sjump .NoScientist
 
 .MaybeScientist:
 	readvar VAR_UNOWNCOUNT
 	ifgreater 2, .YesScientist
-	jump .NoScientist
+	sjump .NoScientist
 
 .YesScientist:
 	appear RUINSOFALPHOUTSIDE_SCIENTIST
@@ -44,12 +44,12 @@ RuinsOfAlphOutside_MapScripts:
 RuinsOfAlphOutsideScientistScene1:
 	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, UP
 	turnobject PLAYER, DOWN
-	jump RuinsOfAlphOutsideScientistSceneContinue
+	sjump RuinsOfAlphOutsideScientistSceneContinue
 
 RuinsOfAlphOutsideScientistScene2:
 	turnobject RUINSOFALPHOUTSIDE_SCIENTIST, LEFT
 	turnobject PLAYER, RIGHT
-	jump RuinsOfAlphOutsideScientistSceneContinue
+	sjump RuinsOfAlphOutsideScientistSceneContinue
 
 RuinsOfAlphOutsideScientistScript:
 	faceplayer
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm
index 4c9ee01c4..13d4fe0b7 100644
--- a/maps/RuinsOfAlphResearchCenter.asm
+++ b/maps/RuinsOfAlphResearchCenter.asm
@@ -15,7 +15,7 @@ RuinsOfAlphResearchCenter_MapScripts:
 	end
 
 .GetUnownDex:
-	priorityjump .GetUnownDexScript
+	prioritysjump .GetUnownDexScript
 	end
 
 .ScientistCallback:
diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm
index 8337ae2b1..08a069e9a 100644
--- a/maps/TeamRocketBaseB2F.asm
+++ b/maps/TeamRocketBaseB2F.asm
@@ -47,7 +47,7 @@ TeamRocketBaseB2F_MapScripts:
 
 RocketBaseBossFLeft:
 	moveobject TEAMROCKETBASEB2F_LANCE, 9, 13
-	jump RocketBaseBossFScript
+	sjump RocketBaseBossFScript
 
 RocketBaseBossFRight:
 	moveobject TEAMROCKETBASEB2F_ROCKET_GIRL, 21, 16
@@ -154,7 +154,7 @@ RocketBaseLancesSideScript:
 
 LanceHealsScript1:
 	turnobject PLAYER, UP
-	jump LanceHealsCommon
+	sjump LanceHealsCommon
 
 LanceHealsScript2:
 	turnobject PLAYER, RIGHT
@@ -235,7 +235,7 @@ RocketElectrode1:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d28c
-	jump RocketBaseElectrodeScript
+	sjump RocketBaseElectrodeScript
 
 RocketElectrode2:
 	cry ELECTRODE
@@ -253,7 +253,7 @@ RocketElectrode2:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d299
-	jump RocketBaseElectrodeScript
+	sjump RocketBaseElectrodeScript
 
 RocketElectrode3:
 	cry ELECTRODE
@@ -271,7 +271,7 @@ RocketElectrode3:
 	reloadmapafterbattle
 	special PlayMapMusic
 	applymovement PLAYER, MovementData_0x6d2a4
-	jump RocketBaseElectrodeScript
+	sjump RocketBaseElectrodeScript
 
 TeamRocketBaseB2FReloadMap:
 	reloadmapafterbattle
diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm
index 9396a882a..bec7a4176 100644
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -25,7 +25,7 @@ TeamRocketBaseB3F_MapScripts:
 	callback MAPCALLBACK_TILES, .CheckGiovanniDoor
 
 .LanceGetsPassword:
-	priorityjump LanceGetPasswordScript
+	prioritysjump LanceGetPasswordScript
 	end
 
 .DummyScene1:
@@ -86,7 +86,7 @@ TeamRocketBaseB3FRocketScript:
 
 RocketBaseBossLeft:
 	applymovement PLAYER, MovementData_0x6e133
-	jump RocketBaseBoss
+	sjump RocketBaseBoss
 
 RocketBaseBossRight:
 	applymovement PLAYER, MovementData_0x6e13a
@@ -180,7 +180,7 @@ TeamRocketBaseB3FLockedDoor:
 	iffalse .NeedsPassword
 	checkevent EVENT_LEARNED_RATICATE_TAIL
 	iffalse .NeedsPassword
-	jump .OpenSesame
+	sjump .OpenSesame
 
 .NeedsPassword:
 	writetext TeamRocketBaseB3FLockedDoorNeedsPasswordText
diff --git a/maps/TimeCapsule.asm b/maps/TimeCapsule.asm
index 502312c96..b0fd42df8 100644
--- a/maps/TimeCapsule.asm
+++ b/maps/TimeCapsule.asm
@@ -11,7 +11,7 @@ TimeCapsule_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTimeCapsule:
-	priorityjump .InitializeAndPreparePokecenter2F
+	prioritysjump .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
diff --git a/maps/TinTower1F.asm b/maps/TinTower1F.asm
index 0d70c3d3a..69a5ae47c 100644
--- a/maps/TinTower1F.asm
+++ b/maps/TinTower1F.asm
@@ -20,7 +20,7 @@ TinTower1F_MapScripts:
 	callback MAPCALLBACK_TILES, .StairsCallback
 
 .FaceSuicune:
-	priorityjump .SuicuneBattle
+	prioritysjump .SuicuneBattle
 	end
 
 .DummyScene:
@@ -50,7 +50,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .NoRaikou
 	appear TINTOWER1F_RAIKOU
-	jump .CheckEntei
+	sjump .CheckEntei
 
 .NoRaikou:
 	disappear TINTOWER1F_RAIKOU
@@ -59,7 +59,7 @@ TinTower1F_MapScripts:
 	special MonCheck
 	iftrue .NoEntei
 	appear TINTOWER1F_ENTEI
-	jump .BeastsDone
+	sjump .BeastsDone
 
 .NoEntei:
 	disappear TINTOWER1F_ENTEI
diff --git a/maps/TinTowerRoof.asm b/maps/TinTowerRoof.asm
index e3b1e6107..14b487a6f 100644
--- a/maps/TinTowerRoof.asm
+++ b/maps/TinTowerRoof.asm
@@ -12,7 +12,7 @@ TinTowerRoof_MapScripts:
 	iftrue .NoAppear
 	checkitem RAINBOW_WING
 	iftrue .Appear
-	jump .NoAppear
+	sjump .NoAppear
 
 .Appear:
 	appear TINTOWERROOF_HO_OH
diff --git a/maps/TradeCenter.asm b/maps/TradeCenter.asm
index 51501c5b1..6dc1983f7 100644
--- a/maps/TradeCenter.asm
+++ b/maps/TradeCenter.asm
@@ -11,7 +11,7 @@ TradeCenter_MapScripts:
 	callback MAPCALLBACK_OBJECTS, .SetWhichChris
 
 .InitializeTradeCenter:
-	priorityjump .InitializeAndPreparePokecenter2F
+	prioritysjump .InitializeAndPreparePokecenter2F
 	end
 
 .DummyScene:
diff --git a/maps/TrainerHouseB1F.asm b/maps/TrainerHouseB1F.asm
index e09724d59..a33c8ac29 100644
--- a/maps/TrainerHouseB1F.asm
+++ b/maps/TrainerHouseB1F.asm
@@ -21,7 +21,7 @@ TrainerHouseReceptionistScript:
 	special TrainerHouse
 	iffalse .GetCal3Name
 	gettrainername STRING_BUFFER_3, CAL, CAL2
-	jump .GotName
+	sjump .GotName
 
 .GetCal3Name:
 	gettrainername STRING_BUFFER_3, CAL, CAL3
diff --git a/maps/VermilionPort.asm b/maps/VermilionPort.asm
index 638f4a9b5..68bc69e8b 100644
--- a/maps/VermilionPort.asm
+++ b/maps/VermilionPort.asm
@@ -15,7 +15,7 @@ VermilionPort_MapScripts:
 	end
 
 .LeaveFastShip:
-	priorityjump .LeaveFastShipScript
+	prioritysjump .LeaveFastShipScript
 	end
 
 .FlyPoint:
@@ -102,7 +102,7 @@ VermilionPortWalkUpToShipScript:
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74ef8
-	jump VermilionPortSailorAtGangwayScript
+	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
 	writetext UnknownText_0x74ff2
@@ -164,7 +164,7 @@ VermilionPortSailorScript:
 	closetext
 	setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_2
 	applymovement PLAYER, MovementData_0x74efe
-	jump VermilionPortSailorAtGangwayScript
+	sjump VermilionPortSailorAtGangwayScript
 
 .NoTicket:
 	writetext UnknownText_0x74ff2
diff --git a/maps/VictoryRoad.asm b/maps/VictoryRoad.asm
index 065b3335a..c8e05bf1d 100644
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -66,7 +66,7 @@ VictoryRoadRivalNext:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .GotTotodile:
 	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
@@ -75,7 +75,7 @@ VictoryRoadRivalNext:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .GotChikorita:
 	winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
@@ -84,7 +84,7 @@ VictoryRoadRivalNext:
 	startbattle
 	dontrestartmapmusic
 	reloadmapafterbattle
-	jump .AfterBattle
+	sjump .AfterBattle
 
 .AfterBattle:
 	playmusic MUSIC_RIVAL_AFTER
diff --git a/maps/VictoryRoadGate.asm b/maps/VictoryRoadGate.asm
index a2c996a1c..6aebf4378 100644
--- a/maps/VictoryRoadGate.asm
+++ b/maps/VictoryRoadGate.asm
@@ -18,7 +18,7 @@ VictoryRoadGate_MapScripts:
 
 VictoryRoadGateBadgeCheckScene:
 	turnobject PLAYER, LEFT
-	jump VictoryRoadGateBadgeCheckScript
+	sjump VictoryRoadGateBadgeCheckScript
 
 VictoryRoadGateOfficerScript:
 	faceplayer
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index 966d1f4ae..cce516cd5 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -25,7 +25,7 @@ VioletCityEarlScript:
 	writetext Text_EarlAsksIfYouBeatFalkner
 	yesorno
 	iffalse .FollowEarl
-	jump .PointlessJump
+	sjump .PointlessJump
 
 .PointlessJump:
 	writetext Text_VeryNiceIndeed
diff --git a/maps/VioletPokecenter1F.asm b/maps/VioletPokecenter1F.asm
index a309ed245..250e3ba67 100644
--- a/maps/VioletPokecenter1F.asm
+++ b/maps/VioletPokecenter1F.asm
@@ -74,7 +74,7 @@ VioletPokecenter1F_ElmsAideScript:
 
 .SecondTimeAsking:
 	writetext UnknownText_0x69712
-	jump .AskTakeEgg
+	sjump .AskTakeEgg
 
 VioletPokecenter1FGameboyKidScript:
 	jumptextfaceplayer VioletPokecenter1FGameboyKidText
diff --git a/maps/WhirlIslandLugiaChamber.asm b/maps/WhirlIslandLugiaChamber.asm
index b1c9e9a16..de2214c47 100644
--- a/maps/WhirlIslandLugiaChamber.asm
+++ b/maps/WhirlIslandLugiaChamber.asm
@@ -12,7 +12,7 @@ WhirlIslandLugiaChamber_MapScripts:
 	iftrue .NoAppear
 	checkitem SILVER_WING
 	iftrue .Appear
-	jump .NoAppear
+	sjump .NoAppear
 
 .Appear:
 	appear WHIRLISLANDLUGIACHAMBER_LUGIA
diff --git a/maps/WillsRoom.asm b/maps/WillsRoom.asm
index af3c5091f..dbb2e799f 100644
--- a/maps/WillsRoom.asm
+++ b/maps/WillsRoom.asm
@@ -10,7 +10,7 @@ WillsRoom_MapScripts:
 	callback MAPCALLBACK_TILES, .WillsRoomDoors
 
 .LockDoor:
-	priorityjump .WillsDoorLocksBehindYou
+	prioritysjump .WillsDoorLocksBehindYou
 	end
 
 .DummyScene:
author	Rangi <remy.oukaour+rangi42@gmail.com>	2019-03-10 16:39:31 -0400
committer	Rangi <remy.oukaour+rangi42@gmail.com>	2019-03-10 16:39:31 -0400
commit	f5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch)
tree	2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /maps
parent	e002b536af8423f420e13e93d6c0e59f94ee5044 (diff)