Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions 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/Route36.asm
View File

@@ -24,7 +24,7 @@ Route36_MapScripts:
end
.ArthurCallback:
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifequal THURSDAY, .ArthurAppears
disappear ROUTE36_ARTHUR
return
@@ -106,7 +106,7 @@ Route36FloriaScript:
waitbutton
closetext
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
checkcode VAR_FACING
readvar VAR_FACING
ifequal UP, .Up
applymovement ROUTE36_FLORIA, FloriaMovement1
disappear ROUTE36_FLORIA
@@ -168,7 +168,7 @@ TrainerSchoolboyAlan1:
trainer SCHOOLBOY, ALAN1, EVENT_BEAT_SCHOOLBOY_ALAN, SchoolboyAlan1SeenText, SchoolboyAlan1BeatenText, 0, .Script
.Script:
writecode VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
loadvar VAR_CALLERID, PHONE_SCHOOLBOY_ALAN
endifjustbattled
opentext
checkflag ENGINE_ALAN
@@ -191,14 +191,14 @@ TrainerSchoolboyAlan1:
askforphonenumber PHONE_SCHOOLBOY_ALAN
ifequal PHONE_CONTACTS_FULL, .PhoneFull
ifequal PHONE_CONTACT_REFUSED, .NumberDeclined
trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1
scall .RegisteredNumber
jump .NumberAccepted
.ChooseRematch:
scall .Rematch
winlosstext SchoolboyAlan1BeatenText, 0
copybytetovar wAlanFightCount
readmem wAlanFightCount
ifequal 4, .Fight4
ifequal 3, .Fight3
ifequal 2, .Fight2
@@ -220,7 +220,7 @@ TrainerSchoolboyAlan1:
loadtrainer SCHOOLBOY, ALAN1
startbattle
reloadmapafterbattle
loadvar wAlanFightCount, 1
loadmem wAlanFightCount, 1
clearflag ENGINE_ALAN
end
@@ -228,7 +228,7 @@ TrainerSchoolboyAlan1:
loadtrainer SCHOOLBOY, ALAN2
startbattle
reloadmapafterbattle
loadvar wAlanFightCount, 2
loadmem wAlanFightCount, 2
clearflag ENGINE_ALAN
end
@@ -236,7 +236,7 @@ TrainerSchoolboyAlan1:
loadtrainer SCHOOLBOY, ALAN3
startbattle
reloadmapafterbattle
loadvar wAlanFightCount, 3
loadmem wAlanFightCount, 3
clearflag ENGINE_ALAN
end
@@ -244,7 +244,7 @@ TrainerSchoolboyAlan1:
loadtrainer SCHOOLBOY, ALAN4
startbattle
reloadmapafterbattle
loadvar wAlanFightCount, 4
loadmem wAlanFightCount, 4
clearflag ENGINE_ALAN
end
@@ -318,7 +318,7 @@ ArthurScript:
opentext
checkevent EVENT_GOT_HARD_STONE_FROM_ARTHUR
iftrue .AlreadyGotStone
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal THURSDAY, ArthurNotThursdayScript
checkevent EVENT_MET_ARTHUR_OF_THURSDAY
iftrue .MetArthur