diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-03-15 19:53:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-15 19:53:14 -0400 |
| commit | 66b902f900c128d05940de45aca7130639ded0c0 (patch) | |
| tree | 5a81c2c1d2bfc29206d29ff3c107f784b0b18be4 /engine/phone/scripts/wilton.asm | |
| parent | c87f8512a4d736a847dbc69e09c781a29eeaa638 (diff) | |
| parent | ad50e94b5029ce5a7d45fd3576f8f017eae6449c (diff) | |
Merge pull request #696 from Rangi42/master
Rename LANDMARK_* constants, and refactor flypoints
Diffstat (limited to 'engine/phone/scripts/wilton.asm')
| -rw-r--r-- | engine/phone/scripts/wilton.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm index b9e014ecb..bf7849011 100644 --- a/engine/phone/scripts/wilton.asm +++ b/engine/phone/scripts/wilton.asm @@ -16,11 +16,11 @@ WiltonPhoneCalleeScript: farsjump WiltonHaventFoundAnythingScript .WantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_44 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 farsjump WiltonNotBitingScript .HasItem: - getlandmarkname STRING_BUFFER_5, ROUTE_44 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 farsjump WiltonWantThisScript WiltonPhoneCallerScript: @@ -44,13 +44,13 @@ WiltonThursdayMorning: setflag ENGINE_WILTON_THURSDAY_MORNING WiltonWantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_44 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 setflag ENGINE_WILTON farsjump PhoneScript_WantsToBattle_Male WiltonHasItem: setflag ENGINE_WILTON_HAS_ITEM - getlandmarkname STRING_BUFFER_5, ROUTE_44 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44 clearevent EVENT_WILTON_HAS_ULTRA_BALL clearevent EVENT_WILTON_HAS_GREAT_BALL clearevent EVENT_WILTON_HAS_POKE_BALL |