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/jose.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/jose.asm')
| -rw-r--r-- | engine/phone/scripts/jose.asm | 14 |
1 files changed, 7 insertions, 7 deletions
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 |