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