diff --git a/docs/event_commands.md b/docs/event_commands.md
index cd18a1e2d..4947d0971 100644
--- a/docs/event_commands.md
+++ b/docs/event_commands.md
@@ -11,16 +11,16 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$01`: farscall script
-## `$02`: ptcall script
+## `$02`: memcall script
-## `$03`: jump script
+## `$03`: sjump script
-## `$04`: farjump script
+## `$04`: farsjump script
-## `$05`: ptjump script
+## `$05`: memjump script
## `$06`: ifequal byte, script
@@ -53,7 +53,7 @@ Until this document is filled out, the [G/S Scripting Compendium](https://hax.ii
## `$0F`: special special_pointer
-## `$10`: ptcallasm asm
+## `$10`: memcallasm asm
## `$11`: checkmapscene map
@@ -468,13 +468,13 @@ If item_id = `USE_SCRIPT_VAR`, then it uses `[wScriptVar]` i
## `$8C`: deactivatefacing length
-## `$8D`: priorityjump script
+## `$8D`: prioritysjump script
## `$8E`: `warpcheck`
-## `$8F`: ptpriorityjump script
+## `$8F`: stopandsjump script
## `$90`: `return`
diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm
index d30149fbe..ab8c39ceb 100644
--- a/engine/events/basement_key.asm
+++ b/engine/events/basement_key.asm
@@ -29,4 +29,4 @@ _BasementKey:
.BasementKeyScript:
closetext
- farjump BasementDoorScript
+ farsjump BasementDoorScript
diff --git a/engine/events/bug_contest/contest.asm b/engine/events/bug_contest/contest.asm
index cf8c284ae..3e8800739 100644
--- a/engine/events/bug_contest/contest.asm
+++ b/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
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm
index eb013cfa2..c15b1def5 100644
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
@@ -34,4 +34,4 @@ _CardKey:
.CardKeyScript:
closetext
- farjump CardKeySlotScript
+ farsjump CardKeySlotScript
diff --git a/engine/events/fruit_trees.asm b/engine/events/fruit_trees.asm
index af9c594bd..5401f76f9 100644
--- a/engine/events/fruit_trees.asm
+++ b/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
diff --git a/engine/events/misc_scripts_2.asm b/engine/events/misc_scripts_2.asm
index 514bb2790..515d8d396 100644
--- a/engine/events/misc_scripts_2.asm
+++ b/engine/events/misc_scripts_2.asm
@@ -20,7 +20,7 @@ HiddenItemScript::
callasm SetMemEvent
specialsound
itemnotify
- jump .finish
+ sjump .finish
.bag_full
buttonsound
diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm
index 0a8dbef29..48e879ed9 100644
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -26,7 +26,7 @@ MomTriesToBuySomething::
.Script:
callasm .ASMFunction
- farjump Script_ReceivePhoneCall
+ farsjump Script_ReceivePhoneCall
.ASMFunction:
call MomBuysItem_DeductFunds
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index f7d1f972e..2e98dcc6c 100644
--- a/engine/events/overworld.asm
+++ b/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
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index 8786ec758..6d4106a43 100644
--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
@@ -115,7 +115,7 @@ DoPoisonStep::
end
.whiteout
- farjump Script_OverworldWhiteout
+ farsjump Script_OverworldWhiteout
.CheckWhitedOut:
xor a
diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm
index 31638db40..a5b7fd866 100644
--- a/engine/events/squirtbottle.asm
+++ b/engine/events/squirtbottle.asm
@@ -10,7 +10,7 @@ _Squirtbottle:
special UpdateTimePals
callasm .CheckCanUseSquirtbottle
iffalse .NothingHappenedScript
- farjump WateredWeirdTreeScript
+ farsjump WateredWeirdTreeScript
.NothingHappenedScript:
jumptext .NothingHappenedText
diff --git a/engine/events/std_collision.asm b/engine/events/std_collision.asm
index 0e06b03c8..8c54c0414 100644
--- a/engine/events/std_collision.asm
+++ b/engine/events/std_collision.asm
@@ -26,4 +26,4 @@ CheckFacingTileForStdScript::
INCLUDE "data/events/collision_stdscripts.asm"
Script_JumpStdFromRAM:
- jump wJumpStdScriptBuffer
+ sjump wJumpStdScriptBuffer
diff --git a/engine/events/std_scripts.asm b/engine/events/std_scripts.asm
index f6860d654..39241d71c 100644
--- a/engine/events/std_scripts.asm
+++ b/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
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index ff65b2d7b..92060ea3f 100644
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
@@ -21,7 +21,7 @@ SweetScentFromMenu:
end
.BugCatchingContest:
- farjump BugCatchingContestBattleScript
+ farsjump BugCatchingContestBattleScript
SweetScentNothing:
writetext UnknownText_0x5072b
diff --git a/engine/events/trainer_scripts.asm b/engine/events/trainer_scripts.asm
index 5097f51b0..1fb0d2911 100644
--- a/engine/events/trainer_scripts.asm
+++ b/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
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 36295367c..4b3c3773a 100644
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
@@ -1,6 +1,6 @@
Script_BattleWhiteout::
callasm BattleBGMap
- jump Script_Whiteout
+ sjump Script_Whiteout
Script_OverworldWhiteout::
refreshscreen
diff --git a/engine/overworld/events.asm b/engine/overworld/events.asm
index 6cbfab329..a84d72db4 100644
--- a/engine/overworld/events.asm
+++ b/engine/overworld/events.asm
@@ -841,11 +841,11 @@ CheckMenuOW:
StartMenuScript:
callasm StartMenu
- jump StartMenuCallback
+ sjump StartMenuCallback
SelectMenuScript:
callasm SelectMenu
- jump SelectMenuCallback
+ sjump SelectMenuCallback
StartMenuCallback:
SelectMenuCallback:
@@ -855,10 +855,10 @@ SelectMenuCallback:
end
.Script:
- ptjump wQueuedScriptBank
+ memjump wQueuedScriptBank
.Asm:
- ptcallasm wQueuedScriptBank
+ memcallasm wQueuedScriptBank
end
CountStep:
diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm
index 1919a0ff1..a836bfe94 100644
--- a/engine/overworld/scripting.asm
+++ b/engine/overworld/scripting.asm
@@ -65,10 +65,10 @@ ScriptCommandTable:
; entries correspond to macros/scripts/events.asm enumeration
dw Script_scall ; 00
dw Script_farscall ; 01
- dw Script_ptcall ; 02
- dw Script_jump ; 03
- dw Script_farjump ; 04
- dw Script_ptjump ; 05
+ dw Script_memcall ; 02
+ dw Script_sjump ; 03
+ dw Script_farsjump ; 04
+ dw Script_memjump ; 05
dw Script_ifequal ; 06
dw Script_ifnotequal ; 07
dw Script_iffalse ; 08
@@ -79,7 +79,7 @@ ScriptCommandTable:
dw Script_callstd ; 0d
dw Script_callasm ; 0e
dw Script_special ; 0f
- dw Script_ptcallasm ; 10
+ dw Script_memcallasm ; 10
dw Script_checkmapscene ; 11
dw Script_setmapscene ; 12
dw Script_checkscene ; 13
@@ -206,9 +206,9 @@ endc
dw Script_newloadmap ; 8a
dw Script_pause ; 8b
dw Script_deactivatefacing ; 8c
- dw Script_priorityjump ; 8d
+ dw Script_prioritysjump ; 8d
dw Script_warpcheck ; 8e
- dw Script_ptpriorityjump ; 8f
+ dw Script_stopandsjump ; 8f
dw Script_return ; 90
dw Script_end ; 91
dw Script_reloadandreturn ; 92
@@ -276,7 +276,7 @@ Script_special:
farcall Special
ret
-Script_ptcallasm:
+Script_memcallasm:
; script command 0x10
; parameters: asm
@@ -1428,7 +1428,7 @@ Script_farscall:
ld d, a
jr ScriptCall
-Script_ptcall:
+Script_memcall:
; script command 0x2
; parameters: pointer
@@ -1480,7 +1480,7 @@ CallCallback::
ld [wScriptBank], a
jp ScriptCall
-Script_jump:
+Script_sjump:
; script command 0x3
; parameters: pointer
@@ -1492,7 +1492,7 @@ Script_jump:
ld b, a
jp ScriptJump
-Script_farjump:
+Script_farsjump:
; script command 0x4
; parameters: pointer
@@ -1504,7 +1504,7 @@ Script_farjump:
ld h, a
jp ScriptJump
-Script_ptjump:
+Script_memjump:
; script command 0x5
; parameters: pointer
@@ -1526,7 +1526,7 @@ Script_iffalse:
ld a, [wScriptVar]
and a
jp nz, SkipTwoScriptBytes
- jp Script_jump
+ jp Script_sjump
Script_iftrue:
; script command 0x9
@@ -1534,7 +1534,7 @@ Script_iftrue:
ld a, [wScriptVar]
and a
- jp nz, Script_jump
+ jp nz, Script_sjump
jp SkipTwoScriptBytes
Script_ifequal:
@@ -1544,7 +1544,7 @@ Script_ifequal:
call GetScriptByte
ld hl, wScriptVar
cp [hl]
- jr z, Script_jump
+ jr z, Script_sjump
jr SkipTwoScriptBytes
Script_ifnotequal:
@@ -1554,7 +1554,7 @@ Script_ifnotequal:
call GetScriptByte
ld hl, wScriptVar
cp [hl]
- jr nz, Script_jump
+ jr nz, Script_sjump
jr SkipTwoScriptBytes
Script_ifgreater:
@@ -1565,7 +1565,7 @@ Script_ifgreater:
ld b, a
call GetScriptByte
cp b
- jr c, Script_jump
+ jr c, Script_sjump
jr SkipTwoScriptBytes
Script_ifless:
@@ -1576,7 +1576,7 @@ Script_ifless:
ld b, a
ld a, [wScriptVar]
cp b
- jr c, Script_jump
+ jr c, Script_sjump
jr SkipTwoScriptBytes
Script_jumpstd:
@@ -1626,7 +1626,7 @@ ScriptJump:
ld [wScriptPos + 1], a
ret
-Script_priorityjump:
+Script_prioritysjump:
; script command 0x8d
; parameters: pointer
@@ -2697,12 +2697,12 @@ Script_deactivatefacing:
call StopScript
ret
-Script_ptpriorityjump:
+Script_stopandsjump:
; script command 0x8f
; parameters: pointer
call StopScript
- jp Script_jump
+ jp Script_sjump
Script_end:
; script command 0x91
diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm
index 380c25c70..c4c47d171 100644
--- a/engine/phone/phone.asm
+++ b/engine/phone/phone.asm
@@ -281,7 +281,7 @@ CheckSpecialPhoneCall::
.script
pause 30
- jump Script_ReceivePhoneCall
+ sjump Script_ReceivePhoneCall
.DoSpecialPhoneCall:
ld a, [wSpecialPhoneCallID]
@@ -378,7 +378,7 @@ Function90199:
ret
UnknownScript_0x90205:
- ptcall wd002
+ memcall wPhoneScriptBank
return
UnknownScript_0x90209:
@@ -422,7 +422,7 @@ WrongNumber:
Script_ReceivePhoneCall:
refreshscreen
callasm RingTwice_StartCall
- ptcall wPhoneScriptPointer
+ memcall wPhoneScriptPointer
waitbutton
callasm HangUp
closetext
@@ -431,7 +431,7 @@ Script_ReceivePhoneCall:
Script_SpecialBillCall::
callasm .LoadBillScript
- jump Script_ReceivePhoneCall
+ sjump Script_ReceivePhoneCall
.LoadBillScript:
ld e, PHONE_BILL
@@ -440,7 +440,7 @@ Script_SpecialBillCall::
UnknownScript_0x90261:
callasm .LoadElmScript
pause 30
- jump Script_ReceivePhoneCall
+ sjump Script_ReceivePhoneCall
.LoadElmScript:
ld e, PHONE_ELM
diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm
index a8e40532f..ad020f0ba 100644
--- 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
diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm
index df9297f83..4bd3278c3 100644
--- 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
diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm
index 7fdcad9d3..fda846e18 100644
--- 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
diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm
index 4c69e58e9..d4a15a8bd 100644
--- 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
diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm
index d930738f4..35db64918 100644
--- 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
diff --git a/engine/phone/scripts/bill.asm b/engine/phone/scripts/bill.asm
index 5683e4b27..ccc74dd73 100644
--- 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
diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm
index 63217a7b0..9fbdfde7d 100644
--- 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
diff --git a/engine/phone/scripts/brent_gossip.asm b/engine/phone/scripts/brent_gossip.asm
index 11a91fe8c..90054d0eb 100644
--- 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
diff --git a/engine/phone/scripts/buena.asm b/engine/phone/scripts/buena.asm
index 1a8868b6e..86c2a3243 100644
--- 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
diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm
index d3465699c..cd36bae37 100644
--- 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
diff --git a/engine/phone/scripts/chad_gossip.asm b/engine/phone/scripts/chad_gossip.asm
index e273e656d..e72fcd628 100644
--- 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
diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm
index 41d5d87ac..ca2613ef4 100644
--- 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
diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm
index 4f3f5d94e..817f2e13e 100644
--- 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
diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm
index 10cd903d9..41ebd89d4 100644
--- 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
diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm
index 4445d86c4..1c610e69d 100644
--- 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
diff --git a/engine/phone/scripts/generic_callee.asm b/engine/phone/scripts/generic_callee.asm
index d282aeb92..6afce4abe 100644
--- 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@"
diff --git a/engine/phone/scripts/generic_caller.asm b/engine/phone/scripts/generic_caller.asm
index a450a5407..636b7ab81 100644
--- 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
diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm
index c0d1016e9..d1953d3f7 100644
--- 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
diff --git a/engine/phone/scripts/hangups.asm b/engine/phone/scripts/hangups.asm
index 713f8eac9..55d2f8144 100644
--- 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
diff --git a/engine/phone/scripts/hangups_2.asm b/engine/phone/scripts/hangups_2.asm
index 9aff4267c..4518b2d99 100644
--- 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
diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm
index 49b09b62c..b5bf21b5b 100644
--- 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
diff --git a/engine/phone/scripts/irwin.asm b/engine/phone/scripts/irwin.asm
index b65986c82..c859aecf5 100644
--- 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
diff --git a/engine/phone/scripts/irwin_gossip.asm b/engine/phone/scripts/irwin_gossip.asm
index b7de916cd..038f094d6 100644
--- 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
diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm
index 61a30f96e..27287f310 100644
--- 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
diff --git a/engine/phone/scripts/jack_gossip.asm b/engine/phone/scripts/jack_gossip.asm
index 41a0ba4c2..72c0d71e1 100644
--- 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
diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm
index f5abce673..7a7fae956 100644
--- 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
diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm
index f1d8c9fa4..4dcf0f4de 100644
--- 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
diff --git a/engine/phone/scripts/kenji.asm b/engine/phone/scripts/kenji.asm
index 4b7f3bf85..807510df4 100644
--- 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
diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm
index 61efabd75..64719bb16 100644
--- 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
diff --git a/engine/phone/scripts/liz_gossip.asm b/engine/phone/scripts/liz_gossip.asm
index bb76813c1..738b61235 100644
--- 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
diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm
index 22887f3e9..5b5ca7982 100644
--- 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
diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm
index 55733b9b2..48a1aa1af 100644
--- 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
diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm
index ed23c69c3..c85e988db 100644
--- 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
diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm
index 56e576e07..5b2a06afe 100644
--- 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
diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm
index 91d56150c..6225f98c9 100644
--- 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
diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm
index f9a5357a9..1493aca34 100644
--- 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
diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm
index 12adc8f7d..4b5f138ee 100644
--- 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
diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm
index 8ef017e40..0de527673 100644
--- 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
diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm
index 557b7aac6..44d82ec01 100644
--- 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
diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm
index 6bc09685c..4605589f5 100644
--- 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
diff --git a/macros/legacy.asm b/macros/legacy.asm
index ce35cc48d..0f70f4d43 100644
--- a/macros/legacy.asm
+++ b/macros/legacy.asm
@@ -15,6 +15,14 @@ checkmorn EQUS "checktime MORN"
checkday EQUS "checktime DAY"
checknite EQUS "checktime NITE"
+jump EQUS "sjump"
+farjump EQUS "farsjump"
+priorityjump EQUS "prioritysjump"
+ptcall EQUS "memcall"
+ptjump EQUS "memjump"
+ptpriorityjump EQUS "stopandsjump"
+ptcallasm EQUS "memcallasm"
+
if_equal EQUS "ifequal"
if_not_equal EQUS "ifnotequal"
if_greater_than EQUS "ifgreater"
diff --git a/macros/scripts/events.asm b/macros/scripts/events.asm
index 7b4013a04..16b02446b 100644
--- a/macros/scripts/events.asm
+++ b/macros/scripts/events.asm
@@ -13,27 +13,27 @@ farscall: MACRO
dba \1
ENDM
- enum ptcall_command ; $02
-ptcall: MACRO
- db ptcall_command
+ enum memcall_command ; $02
+memcall: MACRO
+ db memcall_command
dw \1 ; pointer
ENDM
- enum jump_command ; $03
-jump: MACRO
- db jump_command
+ enum sjump_command ; $03
+sjump: MACRO
+ db sjump_command
dw \1 ; pointer
ENDM
- enum farjump_command ; $04
-farjump: MACRO
- db farjump_command
+ enum farsjump_command ; $04
+farsjump: MACRO
+ db farsjump_command
dba \1
ENDM
- enum ptjump_command ; $05
-ptjump: MACRO
- db ptjump_command
+ enum memjump_command ; $05
+memjump: MACRO
+ db memjump_command
dw \1 ; pointer
ENDM
@@ -101,9 +101,9 @@ special: MACRO
dw (\1Special - SpecialsPointers) / 3
ENDM
- enum ptcallasm_command ; $10
-ptcallasm: MACRO
- db ptcallasm_command
+ enum memcallasm_command ; $10
+memcallasm: MACRO
+ db memcallasm_command
dw \1 ; asm
ENDM
@@ -885,9 +885,9 @@ deactivatefacing: MACRO
db \1 ; time
ENDM
- enum priorityjump_command ; $8d
-priorityjump: MACRO
- db priorityjump_command
+ enum prioritysjump_command ; $8d
+prioritysjump: MACRO
+ db prioritysjump_command
dw \1 ; pointer
ENDM
@@ -896,9 +896,9 @@ warpcheck: MACRO
db warpcheck_command
ENDM
- enum ptpriorityjump_command ; $8f
-ptpriorityjump: MACRO
- db ptpriorityjump_command
+ enum stopandsjump_command ; $8f
+stopandsjump: MACRO
+ db stopandsjump_command
dw \1 ; pointer
ENDM
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: