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