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/wilton.asm | |
| parent | 6393ecb7e5d1f105db65cb831964b925db2bb2e8 (diff) | |
Rename more script commands for consistency and predictability
Fixes #540
Diffstat (limited to 'engine/phone/scripts/wilton.asm')
| -rw-r--r-- | engine/phone/scripts/wilton.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index 9d2f0e906..6bc09685c 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -1,5 +1,5 @@ WiltonPhoneCalleeScript: - trainertotext FISHER, WILTON1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, WILTON1 checkflag ENGINE_WILTON iftrue .WantsBattle farscall PhoneScript_AnswerPhone_Male @@ -7,7 +7,7 @@ WiltonPhoneCalleeScript: iftrue .NotThursday checkflag ENGINE_WILTON_HAS_ITEM iftrue .HasItem - checkcode VAR_WEEKDAY + readvar VAR_WEEKDAY ifnotequal THURSDAY, .NotThursday checktime MORN iftrue WiltonThursdayMorning @@ -16,15 +16,15 @@ WiltonPhoneCalleeScript: farjump WiltonHaventFoundAnything .WantsBattle: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 farjump WiltonNotBiting .HasItem: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 farjump WiltonWantThis WiltonPhoneCallerScript: - trainertotext FISHER, WILTON1, MEM_BUFFER_0 + gettrainername STRING_BUFFER_3, FISHER, WILTON1 farscall PhoneScript_GreetPhone_Male checkflag ENGINE_WILTON iftrue .GenericCall @@ -44,13 +44,13 @@ WiltonThursdayMorning: setflag ENGINE_WILTON_THURSDAY_MORNING WiltonWantsBattle: - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 setflag ENGINE_WILTON farjump PhoneScript_WantsToBattle_Male WiltonHasItem: setflag ENGINE_WILTON_HAS_ITEM - landmarktotext ROUTE_44, MEM_BUFFER_2 + getlandmarkname STRING_BUFFER_5, ROUTE_44 clearevent EVENT_WILTON_HAS_ULTRA_BALL clearevent EVENT_WILTON_HAS_GREAT_BALL clearevent EVENT_WILTON_HAS_POKE_BALL |