Rename some call/jump script commands to avoid confusion with jr/jp asm instructions

Fixes #580
This commit is contained in:
Rangi
2019-03-10 16:39:31 -04:00
parent e002b536af
commit f5c9958aea
164 changed files with 840 additions and 832 deletions

View File

@@ -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