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

@@ -39,7 +39,7 @@ TrainerPicnickerErin1:
buttonsound
setevent EVENT_ERIN_ASKED_FOR_PHONE_NUMBER
scall Route46AskNumber1F
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall Route46AskNumber2F
@@ -49,7 +49,7 @@ TrainerPicnickerErin1:
ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
scall Route46RegisteredNumberF
jump Route46NumberAcceptedF
sjump Route46NumberAcceptedF
.WantsBattle:
scall Route46RematchF
@@ -93,7 +93,7 @@ TrainerPicnickerErin1:
verbosegiveitem CALCIUM
iffalse ErinNoRoomForCalcium
setevent EVENT_GOT_CALCIUM_FROM_ERIN
jump Route46NumberAcceptedF
sjump Route46NumberAcceptedF
.GotCalciumAlready:
end
@@ -106,7 +106,7 @@ TrainerPicnickerErin1:
iffalse ErinNoRoomForCalcium
clearevent EVENT_ERIN_CALCIUM
setevent EVENT_GOT_CALCIUM_FROM_ERIN
jump Route46NumberAcceptedF
sjump Route46NumberAcceptedF
Route46AskNumber1F:
jumpstd asknumber1f