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

@@ -1,11 +1,11 @@
BethPhoneCalleeScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
checkflag ENGINE_BETH
iftrue .WantsBattle
farscall PhoneScript_AnswerPhone_Female
checkflag ENGINE_BETH_FRIDAY_AFTERNOON
iftrue .NotFriday
checkcode VAR_WEEKDAY
readvar VAR_WEEKDAY
ifnotequal FRIDAY, .NotFriday
checktime DAY
iftrue BethFridayAfternoon
@@ -14,11 +14,11 @@ BethPhoneCalleeScript:
farjump UnknownScript_0xa0918
.WantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
farjump BethBattleReminderScript
BethPhoneCallerScript:
trainertotext COOLTRAINERF, BETH1, MEM_BUFFER_0
gettrainername STRING_BUFFER_3, COOLTRAINERF, BETH1
farscall PhoneScript_GreetPhone_Female
checkflag ENGINE_BETH
iftrue .Generic
@@ -34,6 +34,6 @@ BethFridayAfternoon:
setflag ENGINE_BETH_FRIDAY_AFTERNOON
BethWantsBattle:
landmarktotext ROUTE_26, MEM_BUFFER_2
getlandmarkname STRING_BUFFER_5, ROUTE_26
setflag ENGINE_BETH
farjump PhoneScript_WantsToBattle_Female