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

Fixes #580
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions
--- a/engine/phone/scripts/alan.asm
+++ b/engine/phone/scripts/alan.asm
@@ -13,15 +13,15 @@ AlanPhoneCalleeScript:
 	iftrue AlanWednesdayDay

 .NotWednesday:
-	farjump UnknownScript_0xa0970
+	farsjump UnknownScript_0xa0970

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_36
-	farjump UnknownScript_0xa0a73
+	farsjump UnknownScript_0xa0a73

 .FireStone:
 	getlandmarkname STRING_BUFFER_5, ROUTE_36
-	farjump UnknownScript_0xa0ac5
+	farsjump UnknownScript_0xa0ac5

 AlanPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
@@ -44,7 +44,7 @@ AlanPhoneCallerScript:
 	ifequal 0, AlanHasFireStone

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 AlanWednesdayDay:
 	setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
@@ -52,9 +52,9 @@ AlanWednesdayDay:
 AlanWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_36
 	setflag ENGINE_ALAN
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 AlanHasFireStone:
 	setflag ENGINE_ALAN_HAS_FIRE_STONE
 	getlandmarkname STRING_BUFFER_5, ROUTE_36
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male
--- a/engine/phone/scripts/anthony.asm
+++ b/engine/phone/scripts/anthony.asm
@@ -13,15 +13,15 @@ AnthonyPhoneCalleeScript:
 .NotFriday:
 	checkflag ENGINE_DUNSPARCE_SWARM
 	iftrue .AlreadySwarming
-	farjump UnknownScript_0xa0950
+	farsjump UnknownScript_0xa0950

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_33
-	farjump UnknownScript_0xa0a5f
+	farsjump UnknownScript_0xa0a5f

 .AlreadySwarming:
 	getlandmarkname STRING_BUFFER_5, ROUTE_33
-	farjump UnknownScript_0xa0afa
+	farsjump UnknownScript_0xa0afa

 AnthonyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, HIKER, ANTHONY2
@@ -38,7 +38,7 @@ AnthonyPhoneCallerScript:
 .TriesSwarm:
 	farscall PhoneScript_Random5
 	ifequal 0, AnthonyTriesDunsparceSwarm
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 AnthonyFridayNight:
 	setflag ENGINE_ANTHONY_FRIDAY_NIGHT
@@ -46,7 +46,7 @@ AnthonyFridayNight:
 AnthonyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_33
 	setflag ENGINE_ANTHONY
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 AnthonyTriesDunsparceSwarm:
 	checkflag ENGINE_DUNSPARCE_SWARM
@@ -55,7 +55,7 @@ AnthonyTriesDunsparceSwarm:
 	getmonname STRING_BUFFER_4, DUNSPARCE
 	swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
 	getlandmarkname STRING_BUFFER_5, DARK_CAVE
-	farjump UnknownScript_0xa05de
+	farsjump UnknownScript_0xa05de

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male
--- a/engine/phone/scripts/arnie.asm
+++ b/engine/phone/scripts/arnie.asm
@@ -13,15 +13,15 @@ ArniePhoneCalleeScript:
 .NotTuesday:
 	checkflag ENGINE_YANMA_SWARM
 	iftrue .AlreadySwarming
-	farjump UnknownScript_0xa0968
+	farsjump UnknownScript_0xa0968

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_35
-	farjump UnknownScript_0xa0a6e
+	farsjump UnknownScript_0xa0a6e

 .AlreadySwarming:
 	getlandmarkname STRING_BUFFER_5, ROUTE_35
-	farjump UnknownScript_0xa0aff
+	farsjump UnknownScript_0xa0aff

 ArniePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
@@ -38,7 +38,7 @@ ArniePhoneCallerScript:
 	ifequal 0, ArnieYanmaSwarm
 	farscall PhoneScript_Random3
 	ifequal 0, ArnieFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 ArnieTuesdayMorning:
 	setflag ENGINE_ARNIE_TUESDAY_MORNING
@@ -46,7 +46,7 @@ ArnieTuesdayMorning:
 ArnieWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_35
 	setflag ENGINE_ARNIE
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 ArnieYanmaSwarm: ; start swarm
 	checkflag ENGINE_YANMA_SWARM
@@ -55,10 +55,10 @@ ArnieYanmaSwarm: ; start swarm
 	getmonname STRING_BUFFER_4, YANMA
 	swarm SWARM_YANMA, ROUTE_35
 	getlandmarkname STRING_BUFFER_5, ROUTE_35
-	farjump UnknownScript_0xa05ce
+	farsjump UnknownScript_0xa05ce

 ArnieFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 ArnieYanmaAlreadySwarming:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male
--- a/engine/phone/scripts/beth.asm
+++ b/engine/phone/scripts/beth.asm
@@ -11,11 +11,11 @@ BethPhoneCalleeScript:
 	iftrue BethFridayAfternoon

 .NotFriday:
-	farjump UnknownScript_0xa0918
+	farsjump UnknownScript_0xa0918

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_26
-	farjump BethBattleReminderScript
+	farsjump BethBattleReminderScript

 BethPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
@@ -28,7 +28,7 @@ BethPhoneCallerScript:
 	ifequal 0, BethWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 BethFridayAfternoon:
 	setflag ENGINE_BETH_FRIDAY_AFTERNOON
@@ -36,4 +36,4 @@ BethFridayAfternoon:
 BethWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_26
 	setflag ENGINE_BETH
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/beverly.asm
+++ b/engine/phone/scripts/beverly.asm
@@ -3,11 +3,11 @@ BeverlyPhoneCalleeScript:
 	farscall PhoneScript_AnswerPhone_Female
 	checkflag ENGINE_BEVERLY_HAS_NUGGET
 	iftrue .HasNugget
-	farjump UnknownScript_0xa0900
+	farsjump UnknownScript_0xa0900

 .HasNugget:
 	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
-	farjump UnknownScript_0xa0aa5
+	farsjump UnknownScript_0xa0aa5

 BeverlyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, POKEFANF, BEVERLY1
@@ -18,9 +18,9 @@ BeverlyPhoneCallerScript:
 	ifequal 0, .FoundNugget

 .HasNugget:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 .FoundNugget:
 	setflag ENGINE_BEVERLY_HAS_NUGGET
 	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
-	farjump PhoneScript_FoundItem_Female
+	farsjump PhoneScript_FoundItem_Female
--- a/engine/phone/scripts/bill.asm
+++ b/engine/phone/scripts/bill.asm
@@ -5,17 +5,17 @@ BillPhoneCalleeScript:
 	iftrue .nitegreet
 	farwritetext BillPhoneMornGreetingText
 	buttonsound
-	jump .main
+	sjump .main

 .daygreet
 	farwritetext BillPhoneDayGreetingText
 	buttonsound
-	jump .main
+	sjump .main

 .nitegreet
 	farwritetext BillPhoneNiteGreetingText
 	buttonsound
-	jump .main
+	sjump .main

 .main
 	farwritetext BillPhoneGenericText
--- a/engine/phone/scripts/brent.asm
+++ b/engine/phone/scripts/brent.asm
@@ -11,11 +11,11 @@ BrentPhoneCalleeScript:
 	iftrue BrentMondayMorning

 .NotMonday:
-	farjump UnknownScript_0xa0998
+	farsjump UnknownScript_0xa0998

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
-	farjump UnknownScript_0xa0a87
+	farsjump UnknownScript_0xa0a87

 BrentPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
@@ -30,7 +30,7 @@ BrentPhoneCallerScript:
 	ifequal 0, BrentWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 BrentMondayMorning:
 	setflag ENGINE_BRENT_MONDAY_MORNING
@@ -38,7 +38,7 @@ BrentMondayMorning:
 BrentWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
 	setflag ENGINE_BRENT
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 BrentBillTrivia:
-	farjump BrentBillTriviaScript
+	farsjump BrentBillTriviaScript
--- a/engine/phone/scripts/brent_gossip.asm
+++ b/engine/phone/scripts/brent_gossip.asm
@@ -14,49 +14,49 @@ BrentBillTriviaScript:
 .Father:
 	farwritetext UnknownText_0x662bc
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Grandpa:
 	farwritetext UnknownText_0x662fc
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Goldenrod:
 	farwritetext UnknownText_0x66335
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Route25:
 	farwritetext UnknownText_0x66366
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Abra:
 	farwritetext UnknownText_0x663a1
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Sister:
 	farwritetext UnknownText_0x663e6
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Milk:
 	farwritetext UnknownText_0x66421
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Battling:
 	farwritetext UnknownText_0x6645f
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .FlowerShop:
 	farwritetext UnknownText_0x6649b
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .KimonoGirl:
 	farwritetext UnknownText_0x664dd
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/buena.asm
+++ b/engine/phone/scripts/buena.asm
@@ -4,13 +4,13 @@ BuenaPhoneCalleeScript:
 	readvar VAR_HOUR
 	ifgreater 17, BuenaPhoneScript_AfterMidnight1
 	scall BuenaPhoneScript_CheckTimeOfDay1
-	jump BuenaPhoneScript_Random1
+	sjump BuenaPhoneScript_Random1

 BuenaPhoneCallerScript:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue BuenaPhoneScript_Rocket
 	scall BuenaPhoneScript_CheckTimeOfDay2
-	jump BuenaPhoneScript_Random2
+	sjump BuenaPhoneScript_Random2

 BuenaPhoneScript_CheckTimeOfDay1:
 	checktime MORN
@@ -69,7 +69,7 @@ BuenaPhoneScript_Random2:
 	checkevent EVENT_BEAT_ELITE_FOUR
 	iftrue .PostE4
 	random 11
-	jump .Jumptable
+	sjump .Jumptable

 .PostE4:
 	random 14
@@ -92,55 +92,55 @@ BuenaPhoneScript_Random2:

 .zero
 	writetext UnknownText_0xa0efb
-	jump .finish
+	sjump .finish

 .one
 	writetext UnknownText_0xa0fcf
-	jump .finish
+	sjump .finish

 .two
 	writetext UnknownText_0xa109d
-	jump .finish
+	sjump .finish

 .three
 	writetext UnknownText_0xa1143
-	jump .finish
+	sjump .finish

 .four
 	writetext UnknownText_0xa1244
-	jump .finish
+	sjump .finish

 .five
 	writetext UnknownText_0xa1318
-	jump .finish
+	sjump .finish

 .six
 	writetext UnknownText_0xa13d8
-	jump .finish
+	sjump .finish

 .seven
 	writetext UnknownText_0xa1488
-	jump .finish
+	sjump .finish

 .eight
 	writetext UnknownText_0xa15de
-	jump .finish
+	sjump .finish

 .nine
 	writetext UnknownText_0xa1717
-	jump .finish
+	sjump .finish

 .ten
 	writetext UnknownText_0xa183d
-	jump .finish
+	sjump .finish

 .eleven
 	writetext UnknownText_0xa19b1
-	jump .finish
+	sjump .finish

 .twelve
 	writetext UnknownText_0xa1ac0
-	jump .finish
+	sjump .finish

 .thirteen
 	writetext UnknownText_0xa1bed
--- a/engine/phone/scripts/chad.asm
+++ b/engine/phone/scripts/chad.asm
@@ -11,11 +11,11 @@ ChadPhoneCalleeScript:
 	iftrue ChadFridayMorning

 .NotFriday:
-	farjump UnknownScript_0xa0980
+	farsjump UnknownScript_0xa0980

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
-	farjump UnknownScript_0xa0a7d
+	farsjump UnknownScript_0xa0a7d

 ChadPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, CHAD1
@@ -32,7 +32,7 @@ ChadPhoneCallerScript:
 .Generic:
 	farscall PhoneScript_Random3
 	ifequal 0, ChadFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 ChadFridayMorning:
 	setflag ENGINE_CHAD_FRIDAY_MORNING
@@ -40,10 +40,10 @@ ChadFridayMorning:
 ChadWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
 	setflag ENGINE_CHAD
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 ChadFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 ChadOakGossip:
-	farjump ChadOakGossipScript
+	farsjump ChadOakGossipScript
--- a/engine/phone/scripts/chad_gossip.asm
+++ b/engine/phone/scripts/chad_gossip.asm
@@ -14,49 +14,49 @@ ChadOakGossipScript:
 .Blue:
 	farwritetext ChadBlueGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Daisy:
 	farwritetext ChadDaisyGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .ProfElm:
 	farwritetext ChadProfElmGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Dream:
 	farwritetext ChadDreamGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Kurt:
 	farwritetext ChadKurtGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .League:
 	farwritetext ChadLeagueGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .RadioShow:
 	farwritetext ChadRadioShowGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Battling:
 	farwritetext ChadBattlingGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .DaisyTea:
 	farwritetext ChadDaisyTeaGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Traveled:
 	farwritetext ChadTravelGossipText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/dana.asm
+++ b/engine/phone/scripts/dana.asm
@@ -13,15 +13,15 @@ DanaPhoneCalleeScript:
 	iftrue DanaThursdayNight

 .NotThursday:
-	farjump UnknownScript_0xa0978
+	farsjump UnknownScript_0xa0978

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
-	farjump UnknownScript_0xa0a78
+	farsjump UnknownScript_0xa0a78

 .HasThunderstone:
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
-	farjump UnknownScript_0xa0acd
+	farsjump UnknownScript_0xa0acd

 DanaPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, LASS, DANA1
@@ -46,7 +46,7 @@ DanaPhoneCallerScript:
 .Generic:
 	farscall PhoneScript_Random3
 	ifequal 0, DanaFoundRare
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 DanaThursdayNight:
 	setflag ENGINE_DANA_THURSDAY_NIGHT
@@ -54,12 +54,12 @@ DanaThursdayNight:
 DanaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
 	setflag ENGINE_DANA
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female

 DanaFoundRare:
-	farjump Phone_CheckIfUnseenRare_Female
+	farsjump Phone_CheckIfUnseenRare_Female

 DanaHasThunderstone:
 	setflag ENGINE_DANA_HAS_THUNDERSTONE
 	getlandmarkname STRING_BUFFER_5, ROUTE_38
-	farjump PhoneScript_FoundItem_Female
+	farsjump PhoneScript_FoundItem_Female
--- a/engine/phone/scripts/derek.asm
+++ b/engine/phone/scripts/derek.asm
@@ -13,14 +13,14 @@ DerekPhoneCalleeScript:
 	ifequal SATURDAY, .ContestToday

 .NoContest:
-	farjump UnknownScript_0xa0988
+	farsjump UnknownScript_0xa0988

 .ContestToday:
-	farjump PhoneScript_BugCatchingContest
+	farsjump PhoneScript_BugCatchingContest

 .Nugget:
 	getlandmarkname STRING_BUFFER_5, ROUTE_39
-	farjump UnknownScript_0xa0ad5
+	farsjump UnknownScript_0xa0ad5

 DerekPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, POKEFANM, DEREK1
@@ -37,12 +37,12 @@ DerekPhoneCallerScript:
 .NoContest:
 	farscall PhoneScript_Random4
 	ifequal 0, .Nugget
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 .ContestToday:
-	farjump PhoneScript_BugCatchingContest
+	farsjump PhoneScript_BugCatchingContest

 .Nugget:
 	setflag ENGINE_DEREK_HAS_NUGGET
 	getlandmarkname STRING_BUFFER_5, ROUTE_39
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male
--- a/engine/phone/scripts/erin.asm
+++ b/engine/phone/scripts/erin.asm
@@ -11,11 +11,11 @@ ErinPhoneCalleeScript:
 	iftrue ErinSaturdayNight

 .NotSaturday:
-	farjump ErinWorkingHardScript
+	farsjump ErinWorkingHardScript

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_46
-	farjump ErinComeBattleScript
+	farsjump ErinComeBattleScript

 ErinPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
@@ -29,7 +29,7 @@ ErinPhoneCallerScript:
 	ifequal 1, ErinWantsBattle

 .GenericCall:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 ErinSaturdayNight:
 	setflag ENGINE_ERIN_SATURDAY_NIGHT
@@ -37,4 +37,4 @@ ErinSaturdayNight:
 ErinWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_46
 	setflag ENGINE_ERIN
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/gaven.asm
+++ b/engine/phone/scripts/gaven.asm
@@ -11,11 +11,11 @@ GavenPhoneCalleeScript:
 	iftrue GavenThursdayMorning

 .NotThursday:
-	farjump UnknownScript_0xa0910
+	farsjump UnknownScript_0xa0910

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_26
-	farjump UnknownScript_0xa0a37
+	farsjump UnknownScript_0xa0a37

 GavenPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
@@ -30,7 +30,7 @@ GavenPhoneCallerScript:
 .WaitingForBattle:
 	farscall PhoneScript_Random3
 	ifequal 0, GavenFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 GavenThursdayMorning:
 	setflag ENGINE_GAVEN_THURSDAY_MORNING
@@ -38,7 +38,7 @@ GavenThursdayMorning:
 GavenWantsRematch:
 	getlandmarkname STRING_BUFFER_5, ROUTE_26
 	setflag ENGINE_GAVEN
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 GavenFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male
--- a/engine/phone/scripts/generic_callee.asm
+++ b/engine/phone/scripts/generic_callee.asm
@@ -1245,15 +1245,15 @@ PhoneScript_MonFlavorText:
 	ifequal $0, .TooEnergetic
 	farwritetext UnknownText_0x1b518b
 	buttonsound
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 .TooEnergetic:
-	farjump .unnecessary
+	farsjump .unnecessary

 .unnecessary
 	farwritetext UnknownText_0x1b522b
 	buttonsound
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 GrandmaString: db "Grandma@"
 GrandpaString: db "Grandpa@"
--- a/engine/phone/scripts/generic_caller.asm
+++ b/engine/phone/scripts/generic_caller.asm
@@ -3,56 +3,56 @@ Phone_GenericCall_Male:
 	farscall PhoneScript_Random2
 	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Male
-	farjump Phone_FoundAMon_Male
+	farsjump Phone_FoundAMon_Male

 .Bragging:
-	farjump Phone_BraggingCall_Male
+	farsjump Phone_BraggingCall_Male

 Phone_GenericCall_Female:
 	special RandomPhoneMon
 	farscall PhoneScript_Random2
 	ifequal 0, .Bragging
 	farscall PhoneScript_Generic_Female
-	farjump Phone_FoundAMon_Female
+	farsjump Phone_FoundAMon_Female

 .Bragging:
-	farjump Phone_BraggingCall_Female
+	farsjump Phone_BraggingCall_Female

 Phone_BraggingCall_Male:
 	farscall Phone_WhosBragging_Male
-	farjump Phone_FoundAMon_Male
+	farsjump Phone_FoundAMon_Male

 Phone_BraggingCall_Female:
 	farscall Phone_WhosBragging_Female
-	farjump Phone_FoundAMon_Female
+	farsjump Phone_FoundAMon_Female

 Phone_FoundAMon_Male:
 	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
 	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Male
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 .GotAway:
-	farjump Phone_GotAwayCall_Male
+	farsjump Phone_GotAwayCall_Male

 Phone_FoundAMon_Female:
 	special RandomPhoneWildMon
 	farscall PhoneScript_Random2
 	ifequal 0, .GotAway
 	farscall Phone_WhoDefeatedMon_Female
-	farjump PhoneScript_HangupText_Female
+	farsjump PhoneScript_HangupText_Female

 .GotAway:
-	farjump Phone_GotAwayCall_Female
+	farsjump Phone_GotAwayCall_Female

 Phone_GotAwayCall_Male:
 	farscall Phone_WhoLostAMon_Male
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 Phone_GotAwayCall_Female:
 	farscall Phone_WhoLostAMon_Female
-	farjump PhoneScript_HangupText_Female
+	farsjump PhoneScript_HangupText_Female

 Phone_WhosBragging_Male:
 	readvar VAR_CALLERID
@@ -524,11 +524,11 @@ Phone_WhoLostAMon_Female:

 PhoneScript_WantsToBattle_Male:
 	farscall PhoneScript_RematchText_Male
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 PhoneScript_WantsToBattle_Female:
 	farscall PhoneScript_RematchText_Female
-	farjump PhoneScript_HangupText_Female
+	farsjump PhoneScript_HangupText_Female

 PhoneScript_RematchText_Male:
 	readvar VAR_CALLERID
@@ -837,18 +837,18 @@ PhoneScript_HangupText_Female:
 Phone_CheckIfUnseenRare_Male:
 	scall PhoneScriptRareWildMon
 	iffalse .HangUp
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 .HangUp:
-	farjump PhoneScript_HangupText_Male
+	farsjump PhoneScript_HangupText_Male

 Phone_CheckIfUnseenRare_Female:
 	scall PhoneScriptRareWildMon
 	iffalse .HangUp
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 .HangUp:
-	farjump PhoneScript_HangupText_Female
+	farsjump PhoneScript_HangupText_Female

 PhoneScriptRareWildMon:
 	special RandomUnseenWildMon
@@ -862,37 +862,37 @@ PhoneScript_BugCatchingContest:
 .Wade:
 	farwritetext WadeBugCatchingContestText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Derek:
 	farwritetext DerekBugCatchingContestText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 IrwinRocketRumor:
 	farwritetext UnknownText_0x64032
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa05c6:
 	farwritetext UnknownText_0x177378
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa05ce:
 	farwritetext UnknownText_0x64b5f
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa05d6:
 	farwritetext UnknownText_0x175dd9
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa05de:
 	farwritetext UnknownText_0x176c61
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 PhoneScript_FoundItem_Male:
 	readvar VAR_CALLERID
@@ -953,9 +953,9 @@ PhoneScript_FoundItem_Female:
 UnknownScript_0xa0644:
 	farwritetext UnknownText_0x176feb
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 KenjiCallingPhoneScript:
 	farwritetext UnknownText_0x66dc5
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/gina.asm
+++ b/engine/phone/scripts/gina.asm
@@ -15,18 +15,18 @@ GinaPhoneCalleeScript:
 .NotSunday:
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue .Rockets
-	farjump UnknownScript_0xa0960
+	farsjump UnknownScript_0xa0960

 .Rockets:
-	farjump UnknownScript_0xa05c6
+	farsjump UnknownScript_0xa05c6

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
-	farjump UnknownScript_0xa0a69
+	farsjump UnknownScript_0xa0a69

 .HasLeafStone:
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
-	farjump UnknownScript_0xa0abd
+	farsjump UnknownScript_0xa0abd

 GinaPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, GINA1
@@ -53,7 +53,7 @@ GinaPhoneCallerScript:
 	ifequal 0, GinaWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 GinaSundayDay:
 	setflag ENGINE_GINA_SUNDAY_AFTERNOON
@@ -61,12 +61,12 @@ GinaSundayDay:
 GinaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
 	setflag ENGINE_GINA
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female

 GinaRockets:
-	farjump UnknownScript_0xa05c6
+	farsjump UnknownScript_0xa05c6

 GinaHasLeafStone:
 	setflag ENGINE_GINA_HAS_LEAF_STONE
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
-	farjump PhoneScript_FoundItem_Female
+	farsjump PhoneScript_FoundItem_Female
--- a/engine/phone/scripts/hangups.asm
+++ b/engine/phone/scripts/hangups.asm
@@ -1,132 +1,132 @@
 JackPhoneTips:
 	farwritetext UnknownText_0x1745c2
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0900:
 	farwritetext UnknownText_0x17485b
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0908:
 	farwritetext UnknownText_0x17496b
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0910:
 	farwritetext UnknownText_0x174c29
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0918:
 	farwritetext UnknownText_0x174ec5
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0920:
 	farwritetext UnknownText_0x17519b
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0928:
 	farwritetext UnknownText_0x17549b
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0930:
 	farwritetext UnknownText_0x17571d
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0938:
 	farwritetext UnknownText_0x175abe
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0940:
 	farwritetext UnknownText_0x175eaf
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0948:
 	farwritetext UnknownText_0x1768b0
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0950:
 	farwritetext UnknownText_0x176d32
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0958:
 	farwritetext UnknownText_0x1770fb
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0960:
 	farwritetext UnknownText_0x177465
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0968:
 	farwritetext UnknownText_0x64bc6
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0970:
 	farwritetext UnknownText_0x64e90
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0978:
 	farwritetext UnknownText_0x65161
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0980:
 	farwritetext UnknownText_0x65a23
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0988:
 	farwritetext UnknownText_0x65d5c
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0990:
 	farwritetext UnknownText_0x65ff2
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0998:
 	farwritetext UnknownText_0x6651e
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa09a0:
 	farwritetext UnknownText_0x66882
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 VanceLookingForward:
 	farwritetext VanceLookingForwardText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 WiltonHaventFoundAnything:
 	farwritetext WiltonHaventFoundAnythingText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 ParryBattleWithMe:
 	farwritetext ParryBattleWithMeText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 ErinWorkingHardScript:
 	farwritetext ErinWorkingHardText
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa09c8:
 	random 3
@@ -137,17 +137,17 @@ UnknownScript_0xa09c8:
 UnknownScript_0xa09d6:
 	farwritetext UnknownText_0x64846
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa09de:
 	farwritetext UnknownText_0x64881
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa09e6:
 	farwritetext UnknownText_0x648dc
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 KenjiAnswerPhoneScript:
 	readvar VAR_KENJI_BREAK
@@ -155,12 +155,12 @@ KenjiAnswerPhoneScript:
 	ifequal 1, .OnBreak
 	farwritetext UnknownText_0x66e17
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Training:
 	farwritetext UnknownText_0x66e67
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .OnBreak:
 	checktime MORN
@@ -170,14 +170,14 @@ KenjiAnswerPhoneScript:
 	setevent EVENT_KENJI_ON_BREAK
 	farwritetext KenjiBreakText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Morning:
 	farwritetext UnknownText_0x66ed3
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Night:
 	farwritetext UnknownText_0x66f52
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/hangups_2.asm
+++ b/engine/phone/scripts/hangups_2.asm
@@ -1,49 +1,49 @@
 UnknownScript_0xa0aa5:
 	farwritetext UnknownText_0x174895
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0aad:
 	farwritetext UnknownText_0x17529c
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0ab5:
 	farwritetext UnknownText_0x175b6d
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0abd:
 	farwritetext UnknownText_0x17750e
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0ac5:
 	farwritetext UnknownText_0x64f1a
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0acd:
 	farwritetext UnknownText_0x6520f
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 UnknownScript_0xa0ad5:
 	farwritetext UnknownText_0x65da6
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0add:
 	farwritetext UnknownText_0x66087
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 UnknownScript_0xa0ae5:
 	farwritetext UnknownText_0x6691d
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 WiltonWantThis:
 	farwritetext WiltonWantThisText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/huey.asm
+++ b/engine/phone/scripts/huey.asm
@@ -12,11 +12,11 @@ HueyPhoneCalleeScript:

 .NotWednesday:
 	special RandomPhoneMon
-	farjump UnknownScript_0xa0908
+	farsjump UnknownScript_0xa0908

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
-	farjump HueyWantsBattleScript
+	farsjump HueyWantsBattleScript

 HueyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SAILOR, HUEY1
@@ -30,7 +30,7 @@ HueyPhoneCallerScript:
 	ifequal 1, HueyWantsBattle

 .Flavor:
-	farjump PhoneScript_MonFlavorText
+	farsjump PhoneScript_MonFlavorText

 HueyWednesdayNight:
 	setflag ENGINE_HUEY_WEDNESDAY_NIGHT
@@ -38,4 +38,4 @@ HueyWednesdayNight:
 HueyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
 	setflag ENGINE_HUEY
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/irwin.asm
+++ b/engine/phone/scripts/irwin.asm
@@ -3,17 +3,17 @@ IrwinPhoneCalleeScript:
 	farscall PhoneScript_AnswerPhone_Male
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue .Rockets
-	farjump UnknownScript_0xa09c8
+	farsjump UnknownScript_0xa09c8

 .Rockets:
-	farjump IrwinRocketRumor
+	farsjump IrwinRocketRumor

 IrwinPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
 	farscall PhoneScript_GreetPhone_Male
 	checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
 	iftrue .Rockets
-	farjump IrwinRumorScript
+	farsjump IrwinRumorScript

 .Rockets:
-	farjump IrwinRocketRumor
+	farsjump IrwinRocketRumor
--- a/engine/phone/scripts/irwin_gossip.asm
+++ b/engine/phone/scripts/irwin_gossip.asm
@@ -25,64 +25,64 @@ IrwinRumorScript:
 	iftrue .PlainBadge
 	farwritetext IrwinCalledRightAwayText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .PlainBadge:
 	farwritetext UnknownText_0x64099
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .JasmineReturned:
 	farwritetext UnknownText_0x640e6
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .RocketHideout:
 	farwritetext UnknownText_0x6416d
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .RadioTower:
 	farwritetext UnknownText_0x641e8
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .RisingBadge:
 	farwritetext UnknownText_0x64247
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .EliteFour:
 	farwritetext UnknownText_0x642bb
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .VermilionCity:
 	farwritetext UnknownText_0x643d4
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .TrainPass:
 	farwritetext UnknownText_0x64448
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Snorlax:
 	farwritetext UnknownText_0x6455b
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .MtSilver:
 	farwritetext UnknownText_0x645ff
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .FogBadge:
 	farwritetext UnknownText_0x646df
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .MarshBadge:
 	farwritetext UnknownText_0x647d8
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/jack.asm
+++ b/engine/phone/scripts/jack.asm
@@ -11,11 +11,11 @@ JackPhoneCalleeScript:
 	iftrue JackMondayMorning

 .NotMonday:
-	farjump JackPhoneTips
+	farsjump JackPhoneTips

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
-	farjump JackWantsBattleScript
+	farsjump JackWantsBattleScript

 JackPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1
@@ -32,7 +32,7 @@ JackPhoneCallerScript:
 .WaitingForBattle:
 	farscall PhoneScript_Random3
 	ifequal 0, JackFindsRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 JackMondayMorning:
 	setflag ENGINE_JACK_MONDAY_MORNING
@@ -40,10 +40,10 @@ JackMondayMorning:
 JackWantsToBattle:
 	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
 	setflag ENGINE_JACK
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 JackFindsRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 JackBattleTrivia:
-	farjump JackTriviaScript
+	farsjump JackTriviaScript
--- a/engine/phone/scripts/jack_gossip.asm
+++ b/engine/phone/scripts/jack_gossip.asm
@@ -15,54 +15,54 @@ JackTriviaScript:
 .Thunder:
 	farwritetext JackThunderTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Rollout:
 	farwritetext JackRolloutTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Solarbeam:
 	farwritetext JackSolarbeamTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Stomp:
 	farwritetext JackStompTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Gust:
 	farwritetext JackGustTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Twister:
 	farwritetext JackTwisterTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Earthquake:
 	farwritetext JackEarthquakeTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Magnitude:
 	farwritetext JackMagnitudeTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .Sandstorm:
 	farwritetext JackSandstormTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .SunnyDay:
 	farwritetext JackSunnyDayTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male

 .RainDance:
 	farwritetext JackRainDanceTriviaText
 	buttonsound
-	jump PhoneScript_HangupText_Male
+	sjump PhoneScript_HangupText_Male
--- a/engine/phone/scripts/joey.asm
+++ b/engine/phone/scripts/joey.asm
@@ -12,11 +12,11 @@ JoeyPhoneCalleeScript:

 .NotMonday:
 	special RandomPhoneMon
-	farjump UnknownScript_0xa0930
+	farsjump UnknownScript_0xa0930

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_30
-	farjump UnknownScript_0xa0a4b
+	farsjump UnknownScript_0xa0a4b

 JoeyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
@@ -30,7 +30,7 @@ JoeyPhoneCallerScript:
 	ifequal 1, JoeyWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 JoeyMondayAfternoon:
 	setflag ENGINE_JOEY_MONDAY_AFTERNOON
@@ -38,4 +38,4 @@ JoeyMondayAfternoon:
 JoeyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_30
 	setflag ENGINE_JOEY
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/jose.asm
+++ b/engine/phone/scripts/jose.asm
@@ -13,15 +13,15 @@ JosePhoneCalleeScript:
 	iftrue JoseSaturdayNight

 .NotSaturday:
-	farjump UnknownScript_0xa0920
+	farsjump UnknownScript_0xa0920

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
-	farjump UnknownScript_0xa0a41
+	farsjump UnknownScript_0xa0a41

 .HasItem:
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
-	farjump UnknownScript_0xa0a41
+	farsjump UnknownScript_0xa0a41

 JosePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, JOSE2
@@ -40,7 +40,7 @@ JosePhoneCallerScript:
 .Generic:
 	farscall PhoneScript_Random3
 	ifequal 0, JoseFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 JoseSaturdayNight:
 	setflag ENGINE_JOSE_SATURDAY_NIGHT
@@ -48,12 +48,12 @@ JoseSaturdayNight:
 JoseWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
 	setflag ENGINE_JOSE
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 JoseFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 JoseHasStarPiece:
 	setflag ENGINE_JOSE_HAS_STAR_PIECE
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male
--- a/engine/phone/scripts/kenji.asm
+++ b/engine/phone/scripts/kenji.asm
@@ -1,9 +1,9 @@
 KenjiPhoneCalleeScript:
 	gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
 	farscall PhoneScript_AnswerPhone_Male
-	farjump KenjiAnswerPhoneScript
+	farsjump KenjiAnswerPhoneScript

 KenjiPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BLACKBELT_T, KENJI3
 	farscall PhoneScript_GreetPhone_Male
-	farjump KenjiCallingPhoneScript
+	farsjump KenjiCallingPhoneScript
--- a/engine/phone/scripts/liz.asm
+++ b/engine/phone/scripts/liz.asm
@@ -12,11 +12,11 @@ LizPhoneCalleeScript:

 .NotThursday:
 	special RandomPhoneMon
-	farjump UnknownScript_0xa0948
+	farsjump UnknownScript_0xa0948

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
-	farjump UnknownScript_0xa0a5a
+	farsjump UnknownScript_0xa0a5a

 LizPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, LIZ1
@@ -37,7 +37,7 @@ LizPhoneCallerScript:
 	ifequal 0, LizWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 LizThursdayAfternoon:
 	setflag ENGINE_LIZ_THURSDAY_AFTERNOON
@@ -45,10 +45,10 @@ LizThursdayAfternoon:
 LizWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
 	setflag ENGINE_LIZ
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female

 LizWrongNumber:
-	farjump LizWrongNumberScript
+	farsjump LizWrongNumberScript

 LizGossip:
 	random 9
@@ -64,39 +64,39 @@ LizGossip:

 .CoolTrainerM:
 	gettrainerclassname STRING_BUFFER_4, COOLTRAINERM
-	jump LizGossipScript
+	sjump LizGossipScript

 .Beauty:
 	gettrainerclassname STRING_BUFFER_4, BEAUTY
-	jump LizGossipScript
+	sjump LizGossipScript

 .Grunt:
 	gettrainerclassname STRING_BUFFER_4, GRUNTM
-	jump LizGossipScript
+	sjump LizGossipScript

 .Teacher:
 	gettrainerclassname STRING_BUFFER_4, TEACHER
-	jump LizGossipScript
+	sjump LizGossipScript

 .SwimmerF:
 	gettrainerclassname STRING_BUFFER_4, SWIMMERF
-	jump LizGossipScript
+	sjump LizGossipScript

 .KimonoGirl:
 	gettrainerclassname STRING_BUFFER_4, KIMONO_GIRL
-	jump LizGossipScript
+	sjump LizGossipScript

 .Skier:
 	gettrainerclassname STRING_BUFFER_4, SKIER
-	jump LizGossipScript
+	sjump LizGossipScript

 .Medium:
 	gettrainerclassname STRING_BUFFER_4, MEDIUM
-	jump LizGossipScript
+	sjump LizGossipScript

 .PokefanM:
 	gettrainerclassname STRING_BUFFER_4, POKEFANM
-	jump LizGossipScript
+	sjump LizGossipScript

 LizGossipScript:
-	farjump UnknownScript_0xa06da
+	farsjump UnknownScript_0xa06da
--- a/engine/phone/scripts/liz_gossip.asm
+++ b/engine/phone/scripts/liz_gossip.asm
@@ -14,49 +14,49 @@ UnknownScript_0xa06da:
 .RuinsOfAlph:
 	farwritetext UnknownText_0x176223
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .Falkner:
 	farwritetext UnknownText_0x1762c3
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .Earl:
 	farwritetext UnknownText_0x17638a
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .SurfPikachu:
 	farwritetext UnknownText_0x176424
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .MooMooMilk:
 	farwritetext UnknownText_0x1764eb
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .Salon:
 	farwritetext UnknownText_0x176599
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .Whitney:
 	farwritetext UnknownText_0x1766ac
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .BugCatchingContest:
 	farwritetext UnknownText_0x17674f
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .BeautifulMon:
 	farwritetext UnknownText_0x176816
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female

 .Forgot:
 	farwritetext UnknownText_0x17686d
 	buttonsound
-	jump PhoneScript_HangupText_Female
+	sjump PhoneScript_HangupText_Female
--- a/engine/phone/scripts/mom.asm
+++ b/engine/phone/scripts/mom.asm
@@ -7,7 +7,7 @@ MomPhoneCalleeScript:
 	iftrue MomPhoneNoGymQuestScript
 	checkevent EVENT_GOT_A_POKEMON_FROM_ELM
 	iftrue MomPhoneNoPokedexScript
-	jump MomPhoneNoPokemonScript
+	sjump MomPhoneNoPokemonScript

 .bcec5
 	checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_8
@@ -18,12 +18,12 @@ MomPhoneCalleeScript:
 	readvar VAR_ROOFPALETTE
 	ifequal 1, MomPhonePalette1
 	ifequal 2, MomPhonePalette2
-	jump MomPhoneOther
+	sjump MomPhoneOther

 MomPhoneLandmark:
 	farwritetext MomPhoneLandmarkText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 MomPhonePalette1:
 	readvar VAR_MAPGROUP
@@ -34,87 +34,87 @@ MomPhonePalette1:
 	ifequal GROUP_GOLDENROD_CITY, .goldenrod
 	farwritetext MomPhoneGenericAreaText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 .newbark
 	farwritetext MomPhoneNewBarkText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 .cherrygrove
 	farwritetext MomPhoneCherrygroveText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 .violet
 	getlandmarkname STRING_BUFFER_4, SPROUT_TOWER
-	jump MomPhoneLandmark
+	sjump MomPhoneLandmark
 .azalea
 	getlandmarkname STRING_BUFFER_4, SLOWPOKE_WELL
-	jump MomPhoneLandmark
+	sjump MomPhoneLandmark
 .goldenrod
 	getlandmarkname STRING_BUFFER_4, RADIO_TOWER
-	jump MomPhoneLandmark
+	sjump MomPhoneLandmark

 MomPhonePalette2:
 	farwritetext MomOtherAreaText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 MomPhoneOther:
 	farwritetext MomDeterminedText
 	buttonsound
-	jump MomSavingMoney
+	sjump MomSavingMoney

 MomSavingMoney:
 	checkflag ENGINE_MOM_SAVING_MONEY
 	iffalse .NotSaving
 	checkmoney MOMS_MONEY, 0
 	ifequal HAVE_MORE, .SavingHasMoney
-	jump .SavingNoMoney
+	sjump .SavingNoMoney

 .NotSaving:
 	checkmoney MOMS_MONEY, 0
 	ifequal HAVE_MORE, .HasMoney
-	jump .NoMoney
+	sjump .NoMoney

 .SavingHasMoney:
 	getmoney STRING_BUFFER_3, MOMS_MONEY
 	farwritetext MomCheckBalanceText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
-	jump MomPhoneWontSaveMoneyScript
+	sjump MomPhoneWontSaveMoneyScript

 .SavingNoMoney:
 	farwritetext MomImportantToSaveText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
-	jump MomPhoneWontSaveMoneyScript
+	sjump MomPhoneWontSaveMoneyScript

 .NoMoney:
 	farwritetext MomYoureNotSavingText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
-	jump MomPhoneWontSaveMoneyScript
+	sjump MomPhoneWontSaveMoneyScript

 .HasMoney:
 	getmoney STRING_BUFFER_3, MOMS_MONEY
 	farwritetext MomYouveSavedText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
-	jump MomPhoneWontSaveMoneyScript
+	sjump MomPhoneWontSaveMoneyScript

 MomPhoneSaveMoneyScript:
 	setflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomOKIllSaveText
 	buttonsound
-	jump MomPhoneHangUpScript
+	sjump MomPhoneHangUpScript

 MomPhoneWontSaveMoneyScript:
 	clearflag ENGINE_MOM_SAVING_MONEY
 	farwritetext MomPhoneWontSaveMoneyText
 	buttonsound
-	jump MomPhoneHangUpScript
+	sjump MomPhoneHangUpScript

 MomPhoneHangUpScript:
 	farwritetext MomPhoneHangUpText
@@ -139,4 +139,4 @@ MomPhoneLectureScript:
 	farwritetext MomPhoneLectureText
 	yesorno
 	iftrue MomPhoneSaveMoneyScript
-	jump MomPhoneWontSaveMoneyScript
+	sjump MomPhoneWontSaveMoneyScript
--- a/engine/phone/scripts/parry.asm
+++ b/engine/phone/scripts/parry.asm
@@ -11,11 +11,11 @@ ParryPhoneCalleeScript:
 	iftrue ParryFridayDay

 .WantsRematch:
-	farjump ParryBattleWithMe
+	farsjump ParryBattleWithMe

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_45
-	farjump ParryHaventYouGottenTo
+	farsjump ParryHaventYouGottenTo

 ParryPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, HIKER, PARRY1
@@ -29,7 +29,7 @@ ParryPhoneCallerScript:
 	ifequal 1, ParryWantsBattle

 .GenericCall:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 ParryFridayDay:
 	setflag ENGINE_PARRY_FRIDAY_AFTERNOON
@@ -37,4 +37,4 @@ ParryFridayDay:
 ParryWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_45
 	setflag ENGINE_PARRY
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/ralph.asm
+++ b/engine/phone/scripts/ralph.asm
@@ -12,15 +12,15 @@ RalphPhoneCalleeScript:
 .CheckSwarm:
 	checkflag ENGINE_FISH_SWARM
 	iftrue .ReportSwarm
-	farjump UnknownScript_0xa0940
+	farsjump UnknownScript_0xa0940

 .Rematch:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
-	farjump UnknownScript_0xa0a55
+	farsjump UnknownScript_0xa0a55

 .ReportSwarm:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
-	farjump UnknownScript_0xa0af5
+	farsjump UnknownScript_0xa0af5

 RalphPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, FISHER, RALPH1
@@ -36,14 +36,14 @@ RalphPhoneCallerScript:
 .CheckSwarm:
 	farscall PhoneScript_Random5
 	ifequal 0, Ralph_SetUpSwarm
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 Ralph_WednesdayMorning:
 	setflag ENGINE_RALPH_WEDNESDAY_MORNING
 Ralph_FightMe:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
 	setflag ENGINE_RALPH
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 Ralph_SetUpSwarm:
 	checkflag ENGINE_FISH_SWARM
@@ -53,7 +53,7 @@ Ralph_SetUpSwarm:
 	getlandmarkname STRING_BUFFER_5, ROUTE_32
 	setval FISHSWARM_QWILFISH
 	special ActivateFishingSwarm
-	farjump UnknownScript_0xa05d6
+	farsjump UnknownScript_0xa05d6

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male
--- a/engine/phone/scripts/reena.asm
+++ b/engine/phone/scripts/reena.asm
@@ -11,11 +11,11 @@ ReenaPhoneCalleeScript:
 	iftrue ReenaSundayMorning

 .NotSunday:
-	farjump UnknownScript_0xa0928
+	farsjump UnknownScript_0xa0928

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
-	farjump UnknownScript_0xa0a46
+	farsjump UnknownScript_0xa0a46

 ReenaPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1
@@ -28,7 +28,7 @@ ReenaPhoneCallerScript:
 	ifequal 0, ReenaWantsBattle

 .Generic:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 ReenaSundayMorning:
 	setflag ENGINE_REENA_SUNDAY_MORNING
@@ -36,4 +36,4 @@ ReenaSundayMorning:
 ReenaWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_27
 	setflag ENGINE_REENA
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female
--- a/engine/phone/scripts/tiffany.asm
+++ b/engine/phone/scripts/tiffany.asm
@@ -13,15 +13,15 @@ TiffanyPhoneCalleeScript:
 	iftrue TiffanyTuesdayAfternoon

 .NotTuesday:
-	farjump UnknownScript_0xa09a0
+	farsjump UnknownScript_0xa09a0

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
-	farjump UnknownScript_0xa0a8c
+	farsjump UnknownScript_0xa0a8c

 .HasItem:
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
-	farjump UnknownScript_0xa0ae5
+	farsjump UnknownScript_0xa0ae5

 TiffanyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
@@ -46,7 +46,7 @@ TiffanyPhoneCallerScript:
 	ifequal 0, TiffanyHasPinkBow

 .Generic:
-	farjump Phone_GenericCall_Female
+	farsjump Phone_GenericCall_Female

 TiffanyTuesdayAfternoon:
 	setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
@@ -54,7 +54,7 @@ TiffanyTuesdayAfternoon:
 TiffanyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
 	setflag ENGINE_TIFFANY
-	farjump PhoneScript_WantsToBattle_Female
+	farsjump PhoneScript_WantsToBattle_Female

 TiffanysFamilyMembers:
 	random 6
@@ -67,32 +67,32 @@ TiffanysFamilyMembers:

 .Grandma:
 	getstring STRING_BUFFER_4, GrandmaString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .Grandpa:
 	getstring STRING_BUFFER_4, GrandpaString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .Mom:
 	getstring STRING_BUFFER_4, MomString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .Dad:
 	getstring STRING_BUFFER_4, DadString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .Sister:
 	getstring STRING_BUFFER_4, SisterString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .Brother:
 	getstring STRING_BUFFER_4, BrotherString
-	jump .PoorClefairy
+	sjump .PoorClefairy

 .PoorClefairy:
-	farjump TiffanyItsAwful
+	farsjump TiffanyItsAwful

 TiffanyHasPinkBow:
 	setflag ENGINE_TIFFANY_HAS_PINK_BOW
 	getlandmarkname STRING_BUFFER_5, ROUTE_43
-	farjump PhoneScript_FoundItem_Female
+	farsjump PhoneScript_FoundItem_Female
--- a/engine/phone/scripts/todd.asm
+++ b/engine/phone/scripts/todd.asm
@@ -13,14 +13,14 @@ ToddPhoneCalleeScript:
 .NotSaturday:
 	checkflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
 	iftrue .SaleOn
-	farjump UnknownScript_0xa0958
+	farsjump UnknownScript_0xa0958

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
-	farjump UnknownScript_0xa0a64
+	farsjump UnknownScript_0xa0a64

 .SaleOn:
-	farjump UnknownScript_0xa0b04
+	farsjump UnknownScript_0xa0b04

 ToddPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, CAMPER, TODD1
@@ -41,7 +41,7 @@ ToddPhoneCallerScript:
 .NoGoldenrod:
 	farscall PhoneScript_Random3
 	ifequal 0, ToddFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 ToddSaturdayMorning:
 	setflag ENGINE_TODD_SATURDAY_MORNING
@@ -49,11 +49,11 @@ ToddSaturdayMorning:
 ToddWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_34
 	setflag ENGINE_TODD
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 ToddFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 ToddDeptStoreSale:
 	setflag ENGINE_GOLDENROD_DEPT_STORE_SALE_IS_ON
-	farjump UnknownScript_0xa0644
+	farsjump UnknownScript_0xa0644
--- a/engine/phone/scripts/tully.asm
+++ b/engine/phone/scripts/tully.asm
@@ -13,15 +13,15 @@ TullyPhoneCalleeScript:
 	iftrue TullySundayNight

 .NotSunday:
-	farjump UnknownScript_0xa0990
+	farsjump UnknownScript_0xa0990

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_42
-	farjump UnknownScript_0xa0a82
+	farsjump UnknownScript_0xa0a82

 .WaterStone:
 	getlandmarkname STRING_BUFFER_5, ROUTE_42
-	farjump UnknownScript_0xa0add
+	farsjump UnknownScript_0xa0add

 TullyPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, FISHER, TULLY1
@@ -44,7 +44,7 @@ TullyPhoneCallerScript:
 	ifequal 0, TullyFoundWaterStone

 .Generic:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 TullySundayNight:
 	setflag ENGINE_TULLY_SUNDAY_NIGHT
@@ -52,9 +52,9 @@ TullySundayNight:
 TullyWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_42
 	setflag ENGINE_TULLY
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 TullyFoundWaterStone:
 	setflag ENGINE_TULLY_HAS_WATER_STONE
 	getlandmarkname STRING_BUFFER_5, ROUTE_42
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male
--- a/engine/phone/scripts/vance.asm
+++ b/engine/phone/scripts/vance.asm
@@ -11,11 +11,11 @@ VancePhoneCalleeScript:
 	iftrue VanceWednesdayNight

 .NotWednesday:
-	farjump VanceLookingForward
+	farsjump VanceLookingForward

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_44
-	farjump VanceHurryHurry
+	farsjump VanceHurryHurry

 VancePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
@@ -29,7 +29,7 @@ VancePhoneCallerScript:
 	ifequal 1, VanceWantsRematch

 .WantsBattle:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 VanceWednesdayNight:
 	setflag ENGINE_VANCE_WEDNESDAY_NIGHT
@@ -37,4 +37,4 @@ VanceWednesdayNight:
 VanceWantsRematch:
 	getlandmarkname STRING_BUFFER_5, ROUTE_44
 	setflag ENGINE_VANCE
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male
--- a/engine/phone/scripts/wade.asm
+++ b/engine/phone/scripts/wade.asm
@@ -23,18 +23,18 @@ WadePhoneCalleeScript:
 	ifequal SATURDAY, .ContestToday

 .NoContest:
-	farjump UnknownScript_0xa0938
+	farsjump UnknownScript_0xa0938

 .ContestToday:
-	farjump PhoneScript_BugCatchingContest
+	farsjump PhoneScript_BugCatchingContest

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_31
-	farjump UnknownScript_0xa0a50
+	farsjump UnknownScript_0xa0a50

 .HasItem:
 	getlandmarkname STRING_BUFFER_5, ROUTE_31
-	farjump UnknownScript_0xa0ab5
+	farsjump UnknownScript_0xa0ab5

 WadePhoneCallerScript:
 	gettrainername STRING_BUFFER_3, BUG_CATCHER, WADE1
@@ -65,10 +65,10 @@ WadePhoneCallerScript:
 .next:
 	farscall PhoneScript_Random3
 	ifequal 0, WadeFoundRare
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 .ContestToday:
-	farjump PhoneScript_BugCatchingContest
+	farsjump PhoneScript_BugCatchingContest

 WadeTuesdayNight:
 	setflag ENGINE_WADE_TUESDAY_NIGHT
@@ -76,10 +76,10 @@ WadeTuesdayNight:
 WadeWantsBattle2:
 	getlandmarkname STRING_BUFFER_5, ROUTE_31
 	setflag ENGINE_WADE
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 WadeFoundRare:
-	farjump Phone_CheckIfUnseenRare_Male
+	farsjump Phone_CheckIfUnseenRare_Male

 WadeHasItem2:
 	setflag ENGINE_WADE_HAS_ITEM
@@ -96,18 +96,18 @@ WadeHasItem2:

 .Berry:
 	setevent EVENT_WADE_HAS_BERRY
-	jump .FoundBerry
+	sjump .FoundBerry

 .PsnCureBerry:
 	setevent EVENT_WADE_HAS_PSNCUREBERRY
-	jump .FoundBerry
+	sjump .FoundBerry

 .PrzCureBerry:
 	setevent EVENT_WADE_HAS_PRZCUREBERRY
-	jump .FoundBerry
+	sjump .FoundBerry

 .Bitterberry:
 	setevent EVENT_WADE_HAS_BITTER_BERRY

 .FoundBerry:
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male
--- a/engine/phone/scripts/wilton.asm
+++ b/engine/phone/scripts/wilton.asm
@@ -13,15 +13,15 @@ WiltonPhoneCalleeScript:
 	iftrue WiltonThursdayMorning

 .NotThursday:
-	farjump WiltonHaventFoundAnything
+	farsjump WiltonHaventFoundAnything

 .WantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_44
-	farjump WiltonNotBiting
+	farsjump WiltonNotBiting

 .HasItem:
 	getlandmarkname STRING_BUFFER_5, ROUTE_44
-	farjump WiltonWantThis
+	farsjump WiltonWantThis

 WiltonPhoneCallerScript:
 	gettrainername STRING_BUFFER_3, FISHER, WILTON1
@@ -38,7 +38,7 @@ WiltonPhoneCallerScript:
 	ifequal 0, WiltonHasItem

 .GenericCall:
-	farjump Phone_GenericCall_Male
+	farsjump Phone_GenericCall_Male

 WiltonThursdayMorning:
 	setflag ENGINE_WILTON_THURSDAY_MORNING
@@ -46,7 +46,7 @@ WiltonThursdayMorning:
 WiltonWantsBattle:
 	getlandmarkname STRING_BUFFER_5, ROUTE_44
 	setflag ENGINE_WILTON
-	farjump PhoneScript_WantsToBattle_Male
+	farsjump PhoneScript_WantsToBattle_Male

 WiltonHasItem:
 	setflag ENGINE_WILTON_HAS_ITEM
@@ -58,18 +58,18 @@ WiltonHasItem:
 	ifequal 0, .UltraBall
 	random 3
 	ifequal 0, .GreatBall
-	jump .PokeBall
+	sjump .PokeBall

 .UltraBall:
 	setevent EVENT_WILTON_HAS_ULTRA_BALL
-	jump .FoundItem
+	sjump .FoundItem

 .GreatBall:
 	setevent EVENT_WILTON_HAS_GREAT_BALL
-	jump .FoundItem
+	sjump .FoundItem

 .PokeBall:
 	setevent EVENT_WILTON_HAS_POKE_BALL

 .FoundItem:
-	farjump PhoneScript_FoundItem_Male
+	farsjump PhoneScript_FoundItem_Male