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/arnie.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/arnie.asm')
| -rw-r--r-- | engine/phone/scripts/arnie.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/phone/scripts/arnie.asm b/engine/phone/scripts/arnie.asm index a768d8b70..e21de9e04 100644 --- a/engine/phone/scripts/arnie.asm +++ b/engine/phone/scripts/arnie.asm @@ -16,11 +16,11 @@ ArniePhoneCalleeScript: farsjump ArnieHangUpScript .WantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_35 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35 farsjump ArnieReminderScript .AlreadySwarming: - getlandmarkname STRING_BUFFER_5, ROUTE_35 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35 farsjump ArnieHurryScript ArniePhoneCallerScript: @@ -44,7 +44,7 @@ ArnieTuesdayMorning: setflag ENGINE_ARNIE_TUESDAY_MORNING ArnieWantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_35 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35 setflag ENGINE_ARNIE farsjump PhoneScript_WantsToBattle_Male @@ -54,7 +54,7 @@ ArnieYanmaSwarm: ; start swarm setflag ENGINE_YANMA_SWARM getmonname STRING_BUFFER_4, YANMA swarm SWARM_YANMA, ROUTE_35 - getlandmarkname STRING_BUFFER_5, ROUTE_35 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_35 farsjump ArnieSwarmScript ArnieFoundRare: |