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/alan.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/alan.asm')
| -rw-r--r-- | engine/phone/scripts/alan.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm index e5f7680f7..a8e40532f 100644 --- a/engine/phone/scripts/alan.asm +++ b/engine/phone/scripts/alan.asm @@ -1,5 +1,5 @@ AlanPhoneCalleeScript: - trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 checkflag ENGINE_ALAN iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ AlanPhoneCalleeScript: iftrue .NotWednesday checkflag ENGINE_ALAN_HAS_FIRE_STONE iftrue .FireStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal WEDNESDAY, .NotWednesday checktime DAY iftrue AlanWednesdayDay @@ -16,15 +16,15 @@ AlanPhoneCalleeScript: farjump UnknownScript_0xa0970 .WantsBattle: - landmarktotext ROUTE_36, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_36 farjump UnknownScript_0xa0a73 .FireStone: - landmarktotext ROUTE_36, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_36 farjump UnknownScript_0xa0ac5 AlanPhoneCallerScript: - trainertotext SCHOOLBOY, ALAN1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, SCHOOLBOY, ALAN1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_ALAN iftrue .Generic @@ -50,11 +50,11 @@ AlanWednesdayDay: setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON AlanWantsBattle: - landmarktotext ROUTE_36, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_36 setflag ENGINE_ALAN farjump PhoneScript_WantsToBattle_Male AlanHasFireStone: setflag ENGINE_ALAN_HAS_FIRE_STONE - landmarktotext ROUTE_36, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_36 farjump PhoneScript_FoundItem_Male |