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/joey.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/joey.asm')
| -rw-r--r-- | engine/phone/scripts/joey.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/phone/scripts/joey.asm b/engine/phone/scripts/joey.asm index 8b15b55cb..63dc1cdc3 100644 --- a/engine/phone/scripts/joey.asm +++ b/engine/phone/scripts/joey.asm @@ -15,7 +15,7 @@ JoeyPhoneCalleeScript: farsjump JoeyHangUpScript .WantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_30 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_30 farsjump JoeyReminderScript JoeyPhoneCallerScript: @@ -36,6 +36,6 @@ JoeyMondayAfternoon: setflag ENGINE_JOEY_MONDAY_AFTERNOON JoeyWantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_30 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_30 setflag ENGINE_JOEY farsjump PhoneScript_WantsToBattle_Male |