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

12
maps/Route43.asm
View File

@@ -63,7 +63,7 @@ TrainerPokemaniacBrent:
buttonsound
setevent EVENT_BRENT_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@@ -73,7 +73,7 @@ TrainerPokemaniacBrent:
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
gettrainername STRING_BUFFER_3, POKEMANIAC, BRENT1
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@@ -194,7 +194,7 @@ TrainerPicnickerTiffany:
buttonsound
setevent EVENT_TIFFANY_ASKED_FOR_PHONE_NUMBER
scall .AskNumber1
jump .AskForNumber
sjump .AskForNumber
.AskedAlready:
scall .AskNumber2
@@ -204,7 +204,7 @@ TrainerPicnickerTiffany:
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
gettrainername STRING_BUFFER_3, PICNICKER, TIFFANY3
scall .RegisteredNumber
jump .NumberAccepted
sjump .NumberAccepted
.WantsBattle:
scall .Rematch
@@ -260,10 +260,10 @@ TrainerPicnickerTiffany:
iffalse .NoRoom
clearflag ENGINE_TIFFANY_HAS_PINK_BOW
setevent EVENT_TIFFANY_GAVE_PINK_BOW
jump .NumberAccepted
sjump .NumberAccepted
.NoRoom:
jump .PackFull
sjump .PackFull
.NoClefairy:
writetext PicnickerTiffanyClefairyText