Rename more script commands for consistency and predictability

Fixes #540
This commit is contained in:
Rangi
2019-03-10 15:31:59 -04:00
parent 6393ecb7e5
commit e002b536af
157 changed files with 1494 additions and 1004 deletions

View File

@@ -26,7 +26,7 @@ TrainerPicnickerErin1:
trainer PICNICKER, ERIN1, EVENT_BEAT_PICNICKER_ERIN, PicnickerErin1SeenText, PicnickerErin1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_PICNICKER_ERIN
loadvar VAR_CALLERID, PHONE_PICNICKER_ERIN
endifjustbattled
opentext
checkflag ENGINE_ERIN
@@ -47,14 +47,14 @@ TrainerPicnickerErin1:
askforphonenumber PHONE_PICNICKER_ERIN
ifequal PHONE_CONTACTS_FULL, Route46PhoneFullF
ifequal PHONE_CONTACT_REFUSED, Route46NumberDeclinedF
trainertotext PICNICKER, ERIN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, PICNICKER, ERIN1
scall Route46RegisteredNumberF
jump Route46NumberAcceptedF
.WantsBattle:
scall Route46RematchF
winlosstext PicnickerErin1BeatenText, 0
copybytetovar wErinFightCount
readmem wErinFightCount
ifequal 2, .Fight2
ifequal 1, .Fight1
ifequal 0, .LoadFight0
@@ -68,7 +68,7 @@ TrainerPicnickerErin1:
loadtrainer PICNICKER, ERIN1
startbattle
reloadmapafterbattle
loadvar wErinFightCount, 1
loadmem wErinFightCount, 1
clearflag ENGINE_ERIN
end
@@ -76,7 +76,7 @@ TrainerPicnickerErin1:
loadtrainer PICNICKER, ERIN2
startbattle
reloadmapafterbattle
loadvar wErinFightCount, 2
loadmem wErinFightCount, 2
clearflag ENGINE_ERIN
end