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/jose.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/jose.asm')
-rw-r--r-- | engine/phone/scripts/jose.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/phone/scripts/jose.asm b/engine/phone/scripts/jose.asm index acf2e3bbc..135403ab3 100644 --- a/engine/phone/scripts/jose.asm +++ b/engine/phone/scripts/jose.asm @@ -16,11 +16,11 @@ JosePhoneCalleeScript: farsjump JoseHangUpScript .WantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_27 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 farsjump JoseReminderScript .HasItem: - getlandmarkname STRING_BUFFER_5, ROUTE_27 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 farsjump JoseReminderScript JosePhoneCallerScript: @@ -46,7 +46,7 @@ JoseSaturdayNight: setflag ENGINE_JOSE_SATURDAY_NIGHT JoseWantsBattle: - getlandmarkname STRING_BUFFER_5, ROUTE_27 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 setflag ENGINE_JOSE farsjump PhoneScript_WantsToBattle_Male @@ -55,5 +55,5 @@ JoseFoundRare: JoseHasStarPiece: setflag ENGINE_JOSE_HAS_STAR_PIECE - getlandmarkname STRING_BUFFER_5, ROUTE_27 + getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27 farsjump PhoneScript_FoundItem_Male |