diff options
Diffstat (limited to 'engine')
57 files changed, 415 insertions, 415 deletions
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 |