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/tully.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/tully.asm')
| -rw-r--r-- | engine/phone/scripts/tully.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm index b6bf84ba7..12adc8f7d 100644 --- a/engine/phone/scripts/tully.asm +++ b/engine/phone/scripts/tully.asm @@ -1,5 +1,5 @@ TullyPhoneCalleeScript: - trainertotext FISHER, TULLY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, TULLY1 checkflag ENGINE_TULLY iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ TullyPhoneCalleeScript: iftrue .NotSunday checkflag ENGINE_TULLY_HAS_WATER_STONE iftrue .WaterStone - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal SUNDAY, .NotSunday checktime NITE iftrue TullySundayNight @@ -16,15 +16,15 @@ TullyPhoneCalleeScript: farjump UnknownScript_0xa0990 .WantsBattle: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump UnknownScript_0xa0a82 .WaterStone: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump UnknownScript_0xa0add TullyPhoneCallerScript: - trainertotext FISHER, TULLY1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, TULLY1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_TULLY iftrue .Generic @@ -50,11 +50,11 @@ TullySundayNight: setflag ENGINE_TULLY_SUNDAY_NIGHT TullyWantsBattle: - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 setflag ENGINE_TULLY farjump PhoneScript_WantsToBattle_Male TullyFoundWaterStone: setflag ENGINE_TULLY_HAS_WATER_STONE - landmarktotext ROUTE_42, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_42 farjump PhoneScript_FoundItem_Male |