diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 15:31:59 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2019-03-10 16:00:19 -0400 |
| commit | e002b536af8423f420e13e93d6c0e59f94ee5044 (patch) | |
| tree | b5bd658c777fca9e7d464d776a7f438deed61386 /engine/phone/scripts/gaven.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/gaven.asm')
| -rw-r--r-- | engine/phone/scripts/gaven.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm index bf4804e4e..4445d86c4 100644 --- a/engine/phone/scripts/gaven.asm +++ b/engine/phone/scripts/gaven.asm @@ -1,11 +1,11 @@ GavenPhoneCalleeScript: - trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 checkflag ENGINE_GAVEN iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_GAVEN_THURSDAY_MORNING iftrue .NotThursday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN iftrue GavenThursdayMorning @@ -14,11 +14,11 @@ GavenPhoneCalleeScript: farjump UnknownScript_0xa0910 .WantsBattle: - landmarktotext ROUTE_26, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_26 farjump UnknownScript_0xa0a37 GavenPhoneCallerScript: - trainertotext COOLTRAINERM, GAVEN3, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERM, GAVEN3 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_GAVEN iftrue .WaitingForBattle @@ -36,7 +36,7 @@ GavenThursdayMorning: setflag ENGINE_GAVEN_THURSDAY_MORNING GavenWantsRematch: - landmarktotext ROUTE_26, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_26 setflag ENGINE_GAVEN farjump PhoneScript_WantsToBattle_Male |