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/reena.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/reena.asm')
| -rw-r--r-- | engine/phone/scripts/reena.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm index a90f8e669..56e576e07 100644 --- a/engine/phone/scripts/reena.asm +++ b/engine/phone/scripts/reena.asm @@ -1,11 +1,11 @@ ReenaPhoneCalleeScript: - trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 checkflag ENGINE_REENA iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_REENA_SUNDAY_MORNING iftrue .NotSunday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime MORN iftrue ReenaSundayMorning @@ -14,11 +14,11 @@ ReenaPhoneCalleeScript: farjump UnknownScript_0xa0928 .WantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 farjump UnknownScript_0xa0a46 ReenaPhoneCallerScript: - trainertotext COOLTRAINERF, REENA1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, COOLTRAINERF, REENA1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_REENA iftrue .Generic @@ -34,6 +34,6 @@ ReenaSundayMorning: setflag ENGINE_REENA_SUNDAY_MORNING ReenaWantsBattle: - landmarktotext ROUTE_27, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_27 setflag ENGINE_REENA farjump PhoneScript_WantsToBattle_Female |