summaryrefslogtreecommitdiff
path: root/maps/Route35.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 /maps/Route35.asm
parente002b536af8423f420e13e93d6c0e59f94ee5044 (diff)
Rename some call/jump script commands to avoid confusion with jr/jp asm instructions
Fixes #580
Diffstat (limited to 'maps/Route35.asm')
-rw-r--r--maps/Route35.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route35.asm b/maps/Route35.asm
index dc3f17014..0ed21e0e5 100644
--- a/maps/Route35.asm
+++ b/maps/Route35.asm
@@ -42,7 +42,7 @@ TrainerJugglerIrwin:
buttonsound
setevent EVENT_IRWIN_ASKED_FOR_PHONE_NUMBER
scall Route35AskNumber1M
- jump .AskForNumber
+ sjump .AskForNumber
.AskedAlready:
scall Route35AskNumber2M
@@ -52,7 +52,7 @@ TrainerJugglerIrwin:
ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
gettrainername STRING_BUFFER_3, JUGGLER, IRWIN1
scall Route35RegisteredNumberM
- jump Route35NumberAcceptedM
+ sjump Route35NumberAcceptedM
Route35AskNumber1M:
jumpstd asknumber1m
@@ -145,7 +145,7 @@ TrainerBugCatcherArnie:
buttonsound
setevent EVENT_ARNIE_ASKED_FOR_PHONE_NUMBER
scall Route35AskNumber1M
- jump .AskForNumber
+ sjump .AskForNumber
.AskedAlready:
scall Route35AskNumber2M
@@ -155,7 +155,7 @@ TrainerBugCatcherArnie:
ifequal PHONE_CONTACT_REFUSED, Route35NumberDeclinedM
gettrainername STRING_BUFFER_3, BUG_CATCHER, ARNIE1
scall Route35RegisteredNumberM
- jump Route35NumberAcceptedM
+ sjump Route35NumberAcceptedM
.WantsBattle:
scall Route35RematchM