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/erin.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/erin.asm')
| -rw-r--r-- | engine/phone/scripts/erin.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/phone/scripts/erin.asm b/engine/phone/scripts/erin.asm index 41ebd89d4..70efc38b4 100644 --- a/engine/phone/scripts/erin.asm +++ b/engine/phone/scripts/erin.asm @@ -14,7 +14,7 @@ ErinPhoneCalleeScript: farsjump ErinWorkingHardScript .WantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_46 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46 farsjump ErinComeBattleScript ErinPhoneCallerScript: @@ -35,6 +35,6 @@ ErinSaturdayNight: setflag ENGINE_ERIN_SATURDAY_NIGHT ErinWantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_46 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_46 setflag ENGINE_ERIN farsjump PhoneScript_WantsToBattle_Female |