diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:39:31 -0400 |
| commit | f5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch) | |
| tree | 2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /engine/phone/scripts/wilton.asm | |
| parent | e002b536af8423f420e13e93d6c0e59f94ee5044 (diff) | |
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'engine/phone/scripts/wilton.asm')
| -rw-r--r-- | engine/phone/scripts/wilton.asm | 18 |
1 files changed, 9 insertions, 9 deletions
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 |