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

@@ -40,7 +40,7 @@ BillsGrandpa:
ifnotequal LICKITUNG, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_LICKITUNG_TO_BILLS_GRANDPA
jump .ShowedLickitung
sjump .ShowedLickitung
.GotEverstone:
writetext BillsGrandpaOddishText
@@ -54,7 +54,7 @@ BillsGrandpa:
ifnotequal ODDISH, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_ODDISH_TO_BILLS_GRANDPA
jump .ShowedOddish
sjump .ShowedOddish
.GotLeafStone:
writetext BillsGrandpaStaryuText
@@ -68,7 +68,7 @@ BillsGrandpa:
ifnotequal STARYU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_STARYU_TO_BILLS_GRANDPA
jump .ShowedStaryu
sjump .ShowedStaryu
.GotWaterStone:
checkver
@@ -84,7 +84,7 @@ BillsGrandpa:
ifnotequal GROWLITHE, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.AskVulpix:
writetext BillsGrandpaVulpixText
@@ -98,7 +98,7 @@ BillsGrandpa:
ifnotequal VULPIX, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_GROWLITHE_VULPIX_TO_BILLS_GRANDPA
jump .ShowedGrowlitheVulpix
sjump .ShowedGrowlitheVulpix
.GotFireStone:
writetext BillsGrandpaPichuText
@@ -112,7 +112,7 @@ BillsGrandpa:
ifnotequal PICHU, .WrongPokemon
scall .CorrectPokemon
setevent EVENT_SHOWED_PICHU_TO_BILLS_GRANDPA
jump .ShowedPichu
sjump .ShowedPichu
.ShowedLickitung:
checkevent EVENT_GOT_EVERSTONE_FROM_BILLS_GRANDPA