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

Fixes #580

engine/events/basement_key.asm

@@ -29,4 +29,4 @@ _BasementKey:
 
 .BasementKeyScript:
 	closetext
-	farjump BasementDoorScript
+	farsjump BasementDoorScript

engine/events/bug_contest/contest.asm

@@ -20,7 +20,7 @@ BugCatchingContestOverScript::
 	opentext
 	writetext BugCatchingContestText_BeeepTimesUp
 	waitbutton
-	jump BugCatchingContestReturnToGateScript
+	sjump BugCatchingContestReturnToGateScript
 
 BugCatchingContestOutOfBallsScript:
 	playsound SFX_ELEVATOR_END

engine/events/card_key.asm

@@ -34,4 +34,4 @@ _CardKey:
 
 .CardKeyScript:
 	closetext
-	farjump CardKeySlotScript
+	farsjump CardKeySlotScript

engine/events/fruit_trees.asm

@@ -10,7 +10,7 @@ FruitTreeScript::
 	iffalse .fruit
 	writetext NothingHereText
 	waitbutton
-	jump .end
+	sjump .end
 
 .fruit
 	writetext HeyItsFruitText
@@ -22,7 +22,7 @@ FruitTreeScript::
 	callasm PickedFruitTree
 	specialsound
 	itemnotify
-	jump .end
+	sjump .end
 
 .packisfull
 	buttonsound

engine/events/misc_scripts_2.asm

@@ -20,7 +20,7 @@ HiddenItemScript::
 	callasm SetMemEvent
 	specialsound
 	itemnotify
-	jump .finish
+	sjump .finish
 
 .bag_full
 	buttonsound

engine/events/mom_phone.asm

@@ -26,7 +26,7 @@ MomTriesToBuySomething::
 
 .Script:
 	callasm .ASMFunction
-	farjump Script_ReceivePhoneCall
+	farsjump Script_ReceivePhoneCall
 
 .ASMFunction:
 	call MomBuysItem_DeductFunds

engine/events/overworld.asm

@@ -857,7 +857,7 @@ dig_incave
 	reloadmappart
 	special UpdateTimePals
 	writetext .Text_UsedEscapeRope
-	jump .UsedDigOrEscapeRopeScript
+	sjump .UsedDigOrEscapeRopeScript
 
 .UsedDigScript:
 	reloadmappart
@@ -1044,7 +1044,7 @@ AskStrengthScript:
 	callasm TryStrengthOW
 	iffalse .AskStrength
 	ifequal $1, .DontMeetRequirements
-	jump .AlreadyUsedStrength
+	sjump .AlreadyUsedStrength
 
 .DontMeetRequirements:
 	jumptext UnknownText_0xcd73
@@ -1540,7 +1540,7 @@ FishFunction:
 Script_NotEvenANibble:
 	scall Script_FishCastRod
 	writetext UnknownText_0xd0a9
-	jump Script_NotEvenANibble_FallThrough
+	sjump Script_NotEvenANibble_FallThrough
 
 Script_NotEvenANibble2:
 	scall Script_FishCastRod
@@ -1557,7 +1557,7 @@ Script_GotABite:
 	callasm Fishing_CheckFacingUp
 	iffalse .NotFacingUp
 	applymovement PLAYER, .Movement_FacingUp
-	jump .FightTheHookedPokemon
+	sjump .FightTheHookedPokemon
 
 .NotFacingUp:
 	applymovement PLAYER, .Movement_NotFacingUp
@@ -1767,7 +1767,7 @@ FinishGettingOffBike:
 
 Script_GetOffBike_Register:
 	loadvar VAR_MOVEMENT, PLAYER_NORMAL
-	jump FinishGettingOffBike
+	sjump FinishGettingOffBike
 
 Script_CantGetOffBike:
 	writetext .CantGetOffBikeText

engine/events/poisonstep.asm

@@ -115,7 +115,7 @@ DoPoisonStep::
 	end
 
 .whiteout
-	farjump Script_OverworldWhiteout
+	farsjump Script_OverworldWhiteout
 
 .CheckWhitedOut:
 	xor a

engine/events/squirtbottle.asm

@@ -10,7 +10,7 @@ _Squirtbottle:
 	special UpdateTimePals
 	callasm .CheckCanUseSquirtbottle
 	iffalse .NothingHappenedScript
-	farjump WateredWeirdTreeScript
+	farsjump WateredWeirdTreeScript
 
 .NothingHappenedScript:
 	jumptext .NothingHappenedText

engine/events/std_collision.asm

@@ -26,4 +26,4 @@ CheckFacingTileForStdScript::
 INCLUDE "data/events/collision_stdscripts.asm"
 
 Script_JumpStdFromRAM:
-	jump wJumpStdScriptBuffer
+	sjump wJumpStdScriptBuffer

engine/events/std_scripts.asm

@@ -63,40 +63,40 @@ PokecenterNurseScript:
 	iftrue .day
 	checktime NITE
 	iftrue .nite
-	jump .ok
+	sjump .ok
 
 .morn
 	checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
 	iftrue .morn_comcenter
 	farwritetext NurseMornText
 	buttonsound
-	jump .ok
+	sjump .ok
 .morn_comcenter
 	farwritetext PokeComNurseMornText
 	buttonsound
-	jump .ok
+	sjump .ok
 
 .day
 	checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
 	iftrue .day_comcenter
 	farwritetext NurseDayText
 	buttonsound
-	jump .ok
+	sjump .ok
 .day_comcenter
 	farwritetext PokeComNurseDayText
 	buttonsound
-	jump .ok
+	sjump .ok
 
 .nite
 	checkevent EVENT_WELCOMED_TO_POKECOM_CENTER
 	iftrue .nite_comcenter
 	farwritetext NurseNiteText
 	buttonsound
-	jump .ok
+	sjump .ok
 .nite_comcenter
 	farwritetext PokeComNurseNiteText
 	buttonsound
-	jump .ok
+	sjump .ok
 
 .ok
 	; only do this once
@@ -150,7 +150,7 @@ PokecenterNurseScript:
 	farwritetext NursePokerusText
 	waitbutton
 	closetext
-	jump .pokerus_done
+	sjump .pokerus_done
 
 .pokerus_comcenter
 	farwritetext PokeComNursePokerusText
@@ -232,10 +232,10 @@ ElevatorButtonScript:
 	end
 
 StrengthBoulderScript:
-	farjump AskStrengthScript
+	farsjump AskStrengthScript
 
 SmashRockScript:
-	farjump AskRockSmashScript
+	farsjump AskRockSmashScript
 
 PokecenterSignScript:
 	farjumptext PokecenterSignText
@@ -334,7 +334,7 @@ BugContestResultsScript:
 BugContestResults_DidNotWin:
 	farwritetext ContestResults_DidNotWinText
 	buttonsound
-	jump BugContestResults_FinishUp
+	sjump BugContestResults_FinishUp
 
 BugContestResults_ReturnAfterWinnersPrize:
 	farwritetext ContestResults_JoinUsNextTimeText
@@ -388,7 +388,7 @@ BugContestResults_FirstPlace:
 	waitbutton
 	verbosegiveitem SUN_STONE
 	iffalse BugContestResults_NoRoomForSunStone
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_SecondPlace:
 	getitemname STRING_BUFFER_4, EVERSTONE
@@ -396,7 +396,7 @@ BugContestResults_SecondPlace:
 	waitbutton
 	verbosegiveitem EVERSTONE
 	iffalse BugContestResults_NoRoomForEverstone
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_ThirdPlace:
 	getitemname STRING_BUFFER_4, GOLD_BERRY
@@ -404,31 +404,31 @@ BugContestResults_ThirdPlace:
 	waitbutton
 	verbosegiveitem GOLD_BERRY
 	iffalse BugContestResults_NoRoomForGoldBerry
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_NoRoomForSunStone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_NoRoomForEverstone:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_NoRoomForGoldBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
-	jump BugContestResults_ReturnAfterWinnersPrize
+	sjump BugContestResults_ReturnAfterWinnersPrize
 
 BugContestResults_NoRoomForBerry:
 	farwritetext BugContestPrizeNoRoomText
 	buttonsound
 	setevent EVENT_CONTEST_OFFICER_HAS_BERRY
-	jump BugContestResults_DidNotWin
+	sjump BugContestResults_DidNotWin
 
 BugContestResults_CopyContestantsToResults:
 	checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
@@ -1804,7 +1804,7 @@ CoinVendor_IntroScript:
 	closewindow
 	ifequal 1, .Buy50
 	ifequal 2, .Buy500
-	jump .Cancel
+	sjump .Cancel
 
 .Buy50:
 	checkcoins MAX_COINS - 50
@@ -1817,7 +1817,7 @@ CoinVendor_IntroScript:
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy50CoinsText
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .Buy500:
 	checkcoins MAX_COINS - 500
@@ -1830,7 +1830,7 @@ CoinVendor_IntroScript:
 	playsound SFX_TRANSACTION
 	farwritetext CoinVendor_Buy500CoinsText
 	waitbutton
-	jump .loop
+	sjump .loop
 
 .NotEnoughMoney:
 	farwritetext CoinVendor_NotEnoughMoneyText

engine/events/sweet_scent.asm

@@ -21,7 +21,7 @@ SweetScentFromMenu:
 	end
 
 .BugCatchingContest:
-	farjump BugCatchingContestBattleScript
+	farsjump BugCatchingContestBattleScript
 
 SweetScentNothing:
 	writetext UnknownText_0x5072b

engine/events/trainer_scripts.asm

@@ -4,7 +4,7 @@ TalkToTrainerScript::
 	iftrue AlreadyBeatenTrainerScript
 	loadtemptrainer
 	encountermusic
-	jump StartBattleWithMapTrainerScript
+	sjump StartBattleWithMapTrainerScript
 
 SeenByTrainerScript::
 	loadtemptrainer
@@ -14,7 +14,7 @@ SeenByTrainerScript::
 	applymovementlasttalked wMovementBuffer
 	writeobjectxy LAST_TALKED
 	faceobject PLAYER, LAST_TALKED
-	jump StartBattleWithMapTrainerScript
+	sjump StartBattleWithMapTrainerScript
 
 StartBattleWithMapTrainerScript:
 	opentext

engine/events/whiteout.asm

@@ -1,6 +1,6 @@
 Script_BattleWhiteout::
 	callasm BattleBGMap
-	jump Script_Whiteout
+	sjump Script_Whiteout
 
 Script_OverworldWhiteout::
 	refreshscreen