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/jack.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/jack.asm')
| -rw-r--r-- | engine/phone/scripts/jack.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm index a02c3c36a..61a30f96e 100644 --- a/engine/phone/scripts/jack.asm +++ b/engine/phone/scripts/jack.asm @@ -1,11 +1,11 @@ JackPhoneCalleeScript: - trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 checkflag ENGINE_JACK iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male checkflag ENGINE_JACK_MONDAY_MORNING iftrue .NotMonday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal MONDAY, .NotMonday checktime MORN iftrue JackMondayMorning @@ -14,11 +14,11 @@ JackPhoneCalleeScript: farjump JackPhoneTips .WantsBattle: - landmarktotext NATIONAL_PARK, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, NATIONAL_PARK farjump JackWantsBattleScript JackPhoneCallerScript: - trainertotext SCHOOLBOY, JACK1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, JACK1 farscall PhoneScript_GreetPhone_Male farscall PhoneScript_Random2 ifequal 0, JackBattleTrivia @@ -38,7 +38,7 @@ JackMondayMorning: setflag ENGINE_JACK_MONDAY_MORNING JackWantsToBattle: - landmarktotext NATIONAL_PARK, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, NATIONAL_PARK setflag ENGINE_JACK farjump PhoneScript_WantsToBattle_Male |