summaryrefslogtreecommitdiff
path: root/engine/phone/scripts/gaven.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/gaven.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/gaven.asm')
-rw-r--r--engine/phone/scripts/gaven.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm
index 4445d86c4..1c610e69d 100644
--- a/engine/phone/scripts/gaven.asm
+++ b/engine/phone/scripts/gaven.asm
@@ -11,11 +11,11 @@ GavenPhoneCalleeScript:
iftrue GavenThursdayMorning
.NotThursday:
- farjump UnknownScript_0xa0910
+ farsjump UnknownScript_0xa0910
.WantsBattle:
getlandmarkname STRING_BUFFER_5, ROUTE_26
- farjump UnknownScript_0xa0a37
+ farsjump UnknownScript_0xa0a37
GavenPhoneCallerScript:
gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3
@@ -30,7 +30,7 @@ GavenPhoneCallerScript:
.WaitingForBattle:
farscall PhoneScript_Random3
ifequal 0, GavenFoundRare
- farjump Phone_GenericCall_Male
+ farsjump Phone_GenericCall_Male
GavenThursdayMorning:
setflag ENGINE_GAVEN_THURSDAY_MORNING
@@ -38,7 +38,7 @@ GavenThursdayMorning:
GavenWantsRematch:
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_GAVEN
- farjump PhoneScript_WantsToBattle_Male
+ farsjump PhoneScript_WantsToBattle_Male
GavenFoundRare:
- farjump Phone_CheckIfUnseenRare_Male
+ farsjump Phone_CheckIfUnseenRare_Male