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