pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename more script commands for consistency and predictability

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

20
maps/Route44.asm
View File

@@ -20,7 +20,7 @@ TrainerBirdKeeperVance1:
trainer BIRD_KEEPER, VANCE1, EVENT_BEAT_BIRD_KEEPER_VANCE, BirdKeeperVance1SeenText, BirdKeeperVance1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
loadvar VAR_CALLERID, PHONE_BIRDKEEPER_VANCE
endifjustbattled
opentext
checkflag ENGINE_VANCE
@@ -41,14 +41,14 @@ TrainerBirdKeeperVance1:
askforphonenumber PHONE_BIRDKEEPER_VANCE
ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext BIRD_KEEPER, VANCE1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, BIRD_KEEPER, VANCE1
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
.WantsBattle:
scall Route44RematchM
winlosstext BirdKeeperVance1BeatenText, 0
copybytetovar wVanceFightCount
readmem wVanceFightCount
ifequal 2, .Fight2
ifequal 1, .Fight1
ifequal 0, .LoadFight0
@@ -62,7 +62,7 @@ TrainerBirdKeeperVance1:
loadtrainer BIRD_KEEPER, VANCE1
startbattle
reloadmapafterbattle
loadvar wVanceFightCount, 1
loadmem wVanceFightCount, 1
clearflag ENGINE_VANCE
end
@@ -70,7 +70,7 @@ TrainerBirdKeeperVance1:
loadtrainer BIRD_KEEPER, VANCE2
startbattle
reloadmapafterbattle
loadvar wVanceFightCount, 2
loadmem wVanceFightCount, 2
clearflag ENGINE_VANCE
end
@@ -162,7 +162,7 @@ TrainerFisherWilton1:
trainer FISHER, WILTON1, EVENT_BEAT_FISHER_WILTON, FisherWilton1SeenText, FisherWilton1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_FISHER_WILTON
loadvar VAR_CALLERID, PHONE_FISHER_WILTON
endifjustbattled
opentext
checkflag ENGINE_WILTON
@@ -185,14 +185,14 @@ TrainerFisherWilton1:
askforphonenumber PHONE_FISHER_WILTON
ifequal PHONE_CONTACTS_FULL, Route44PhoneFullM
ifequal PHONE_CONTACT_REFUSED, Route44NumberDeclinedM
trainertotext FISHER, WILTON1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, FISHER, WILTON1
scall Route44RegisteredNumberM
jump Route44NumberAcceptedM
.WantsBattle:
scall Route44RematchM
winlosstext FisherWilton1BeatenText, 0
copybytetovar wWiltonFightCount
readmem wWiltonFightCount
ifequal 2, .Fight2
ifequal 1, .Fight1
ifequal 0, .LoadFight0
@@ -206,7 +206,7 @@ TrainerFisherWilton1:
loadtrainer FISHER, WILTON1
startbattle
reloadmapafterbattle
loadvar wWiltonFightCount, 1
loadmem wWiltonFightCount, 1
clearflag ENGINE_WILTON
end
@@ -214,7 +214,7 @@ TrainerFisherWilton1:
loadtrainer FISHER, WILTON2
startbattle
reloadmapafterbattle
loadvar wWiltonFightCount, 2
loadmem wWiltonFightCount, 2
clearflag ENGINE_WILTON
end