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

10
engine/phone/scripts/joey.asm
View File

@@ -1,11 +1,11 @@
JoeyPhoneCalleeScript:
trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
checkflag ENGINE_JOEY
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Male
checkflag ENGINE_JOEY_MONDAY_AFTERNOON
iftrue .NotMonday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal MONDAY, .NotMonday
checktime DAY
iftrue JoeyMondayAfternoon
@@ -15,11 +15,11 @@ JoeyPhoneCalleeScript:
farjump UnknownScript_0xa0930
.WantsBattle:
landmarktotext ROUTE_30, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_30
farjump UnknownScript_0xa0a4b
JoeyPhoneCallerScript:
trainertotext YOUNGSTER, JOEY1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, YOUNGSTER, JOEY1
farscall PhoneScript_GreetPhone_Male
checkflag ENGINE_JOEY
iftrue .Generic
@@ -36,6 +36,6 @@ JoeyMondayAfternoon:
setflag ENGINE_JOEY_MONDAY_AFTERNOON
JoeyWantsBattle:
landmarktotext ROUTE_30, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_30
setflag ENGINE_JOEY
farjump PhoneScript_WantsToBattle_Male