Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

8
maps/Route42.asm
View File

@@ -53,7 +53,7 @@ TrainerFisherTully:
buttonsound
setevent EVENT_TULLY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@@ -63,7 +63,7 @@ TrainerFisherTully:
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
gettrainername STRING_BUFFER_3, FISHER, TULLY1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@@ -119,10 +119,10 @@ TrainerFisherTully:
iffalse .NoRoom
clearflag ENGINE_TULLY_HAS_WATER_STONE
setevent EVENT_TULLY_GAVE_WATER_STONE
jump .NumberAccepted
sjump .NumberAccepted
.NoRoom:
jump .PackFull
sjump .PackFull
.AskNumber1:
jumpstd asknumber1m