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

@@ -61,7 +61,7 @@ PlateauRivalBattle1:
applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
playmusic MUSIC_RIVAL_ENCOUNTER
turnobject PLAYER, RIGHT
jump PlateauRivalBattleCommon
sjump PlateauRivalBattleCommon
PlateauRivalBattle2:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
@@ -99,7 +99,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
.Totodile:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
@@ -108,7 +108,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
.Chikorita:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
@@ -117,7 +117,7 @@ PlateauRivalBattleCommon:
startbattle
dontrestartmapmusic
reloadmapafterbattle
jump PlateauRivalPostBattle
sjump PlateauRivalPostBattle
PlateauRivalPostBattle:
playmusic MUSIC_RIVAL_AFTER