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/erin.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/erin.asm')
| -rw-r--r-- | engine/phone/scripts/erin.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 1bf6f2154..10cd903d9 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -1,11 +1,11 @@ ErinPhoneCalleeScript: - trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 checkflag ENGINE_ERIN iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Female checkflag ENGINE_ERIN_SATURDAY_NIGHT iftrue .NotSaturday - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SATURDAY, .NotSaturday checktime NITE iftrue ErinSaturdayNight @@ -14,11 +14,11 @@ ErinPhoneCalleeScript: farjump ErinWorkingHardScript .WantsBattle: - landmarktotext ROUTE_46, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_46 farjump ErinComeBattleScript ErinPhoneCallerScript: - trainertotext PICNICKER, ERIN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, PICNICKER, ERIN1 farscall PhoneScript_GreetPhone_Female checkflag ENGINE_ERIN iftrue .GenericCall @@ -35,6 +35,6 @@ ErinSaturdayNight: setflag ENGINE_ERIN_SATURDAY_NIGHT ErinWantsBattle: - landmarktotext ROUTE_46, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_46 setflag ENGINE_ERIN farjump PhoneScript_WantsToBattle_Female |