summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/joey.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2019-03-10 16:39:31 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2019-03-10 16:39:31 -0400
commitf5c9958aeaefde7f189402911f8ee1c54e6a2439 (patch)
tree2023784b811d49267fa9b1ac1f4e9d82c93c3d3d /engine/phone/scripts/joey.asm
parente002b536af8423f420e13e93d6c0e59f94ee5044 (diff)
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'engine/phone/scripts/joey.asm')
-rw-r--r--engine/phone/scripts/joey.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm
index f5abce673..7a7fae956 100644
--- a/engine/phone/scripts/joey.asm
+++ b/engine/phone/scripts/joey.asm
@@ -12,11 +12,11 @@ JoeyPhoneCalleeScript:
.NotMonday:
special RandomPhoneMon
- farjump UnknownScript_0xa0930
+ farsjump UnknownScript_0xa0930
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_30
- farjump UnknownScript_0xa0a4b
+ farsjump UnknownScript_0xa0a4b
JoeyPhoneCallerScript:
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
@@ -30,7 +30,7 @@ JoeyPhoneCallerScript:
ifequal 1, JoeyWantsBattle
.Generic:
- farjump Phone_GenericCall_Male
+ farsjump Phone_GenericCall_Male
JoeyMondayAfternoon:
setflag ENGINE_JOEY_MONDAY_AFTERNOON
@@ -38,4 +38,4 @@ JoeyMondayAfternoon:
JoeyWantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_30
setflag ENGINE_JOEY
- farjump PhoneScript_WantsToBattle_Male
+ farsjump PhoneScript_WantsToBattle_Male