Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a LANDMARK_ prefix to landmark constants

Browse Source 
Resolves #697
This commit is contained in:
Rangi
2020-03-15 17:26:10 -04:00
parent 65f22544e0
commit ad50e94b50
37 changed files with 630 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/phone/scripts/wilton.asm
View File

@@ -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