Merge pull request #696 from Rangi42/master

Rename LANDMARK_* constants, and refactor flypoints

33 files changed, 115 insertions, 115 deletions

diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm
index f345c49ed..d674eebb1 100644
--- a/engine/events/map_name_sign.asm
+++ b/engine/events/map_name_sign.asm
@@ -63,24 +63,24 @@ InitMapNameSign::
 	ld a, [wPrevLandmark]
 	cp c
 	ret z
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	ret
 
 .CheckSpecialMap:
 ; These landmarks do not get pop-up signs.
 	cp -1
 	ret z
-	cp SPECIAL_MAP ; redundant check
+	cp LANDMARK_SPECIAL ; redundant check
 	ret z
-	cp RADIO_TOWER
+	cp LANDMARK_RADIO_TOWER
 	ret z
-	cp LAV_RADIO_TOWER
+	cp LANDMARK_LAV_RADIO_TOWER
 	ret z
-	cp UNDERGROUND_PATH
+	cp LANDMARK_UNDERGROUND_PATH
 	ret z
-	cp INDIGO_PLATEAU
+	cp LANDMARK_INDIGO_PLATEAU
 	ret z
-	cp POWER_PLANT
+	cp LANDMARK_POWER_PLANT
 	ret z
 	ld a, 1
 	and a
diff --git a/engine/events/poke_seer.asm b/engine/events/poke_seer.asm
index 9bca9d169..8e62d5ded 100644
--- a/engine/events/poke_seer.asm
+++ b/engine/events/poke_seer.asm
@@ -218,9 +218,9 @@ GetCaughtLocation:
 	ld a, [wSeerCaughtGender]
 	and CAUGHT_LOCATION_MASK
 	jr z, .Unknown
-	cp EVENT_LOCATION
+	cp LANDMARK_EVENT
 	jr z, .event
-	cp GIFT_LOCATION
+	cp LANDMARK_GIFT
 	jr z, .fail
 	ld e, a
 	farcall GetLandmarkName
@@ -390,7 +390,7 @@ GetCaughtGender:
 	ld a, [hl]
 	and CAUGHT_LOCATION_MASK
 	jr z, .genderless
-	cp EVENT_LOCATION
+	cp LANDMARK_EVENT
 	jr z, .genderless
 
 	ld a, [hl]
diff --git a/engine/overworld/landmarks.asm b/engine/overworld/landmarks.asm
index 9deafb8e6..bee64c757 100644
--- a/engine/overworld/landmarks.asm
+++ b/engine/overworld/landmarks.asm
@@ -54,9 +54,9 @@ RegionCheck:
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	cp FAST_SHIP ; S.S. Aqua
+	cp LANDMARK_FAST_SHIP ; S.S. Aqua
 	jr z, .johto
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	jr nz, .checkagain
 
 ; In a special map, get the backup map group / map id
@@ -71,7 +71,7 @@ RegionCheck:
 	jr c, .johto
 
 ; Victory Road area is considered to be Johto.
-	cp VICTORY_ROAD
+	cp LANDMARK_VICTORY_ROAD
 	jr c, .kanto
 
 .johto
diff --git a/engine/phone/scripts/alan.asm b/engine/phone/scripts/alan.asm
index 0f42e8558..6699d086f 100644
--- a/engine/phone/scripts/alan.asm
+++ b/engine/phone/scripts/alan.asm
@@ -16,11 +16,11 @@ AlanPhoneCalleeScript:
 	farsjump AlanHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_36
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
 	farsjump AlanReminderScript
 
 .FireStone:
-	getlandmarkname STRING_BUFFER_5, ROUTE_36
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
 	farsjump AlanComePickUpScript
 
 AlanPhoneCallerScript:
@@ -50,11 +50,11 @@ AlanWednesdayDay:
 	setflag ENGINE_ALAN_WEDNESDAY_AFTERNOON
 
 AlanWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_36
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
 	setflag ENGINE_ALAN
 	farsjump PhoneScript_WantsToBattle_Male
 
 AlanHasFireStone:
 	setflag ENGINE_ALAN_HAS_FIRE_STONE
-	getlandmarkname STRING_BUFFER_5, ROUTE_36
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_36
 	farsjump PhoneScript_FoundItem_Male
diff --git a/engine/phone/scripts/anthony.asm b/engine/phone/scripts/anthony.asm
index 55afd47f5..a4c2c95ee 100644
--- a/engine/phone/scripts/anthony.asm
+++ b/engine/phone/scripts/anthony.asm
@@ -16,11 +16,11 @@ AnthonyPhoneCalleeScript:
 	farsjump AnthonyHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_33
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
 	farsjump AnthonyReminderScript
 
 .AlreadySwarming:
-	getlandmarkname STRING_BUFFER_5, ROUTE_33
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
 	farsjump AnthonyHurryScript
 
 AnthonyPhoneCallerScript:
@@ -44,7 +44,7 @@ AnthonyFridayNight:
 	setflag ENGINE_ANTHONY_FRIDAY_NIGHT
 
 AnthonyWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_33
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_33
 	setflag ENGINE_ANTHONY
 	farsjump PhoneScript_WantsToBattle_Male
 
@@ -54,7 +54,7 @@ AnthonyTriesDunsparceSwarm:
 	setflag ENGINE_DUNSPARCE_SWARM
 	getmonname STRING_BUFFER_4, DUNSPARCE
 	swarm SWARM_DUNSPARCE, DARK_CAVE_VIOLET_ENTRANCE
-	getlandmarkname STRING_BUFFER_5, DARK_CAVE
+	getlandmarkname STRING_BUFFER_5, LANDMARK_DARK_CAVE
 	farsjump AnthonySwarmScript
 
 .Generic:
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:
diff --git a/engine/phone/scripts/beth.asm b/engine/phone/scripts/beth.asm
index c5854c747..2549160c8 100644
--- a/engine/phone/scripts/beth.asm
+++ b/engine/phone/scripts/beth.asm
@@ -14,7 +14,7 @@ BethPhoneCalleeScript:
 	farsjump BethHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_26
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
 	farsjump BethBattleReminderScript
 
 BethPhoneCallerScript:
@@ -34,6 +34,6 @@ BethFridayAfternoon:
 	setflag ENGINE_BETH_FRIDAY_AFTERNOON
 
 BethWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_26
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
 	setflag ENGINE_BETH
 	farsjump PhoneScript_WantsToBattle_Female
diff --git a/engine/phone/scripts/beverly.asm b/engine/phone/scripts/beverly.asm
index 77daa5d4b..247b69a62 100644
--- a/engine/phone/scripts/beverly.asm
+++ b/engine/phone/scripts/beverly.asm
@@ -6,7 +6,7 @@ BeverlyPhoneCalleeScript:
 	farsjump BeverlyHangUpScript
 
 .HasNugget:
-	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
+	getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
 	farsjump BeverlyComePickUpScript
 
 BeverlyPhoneCallerScript:
@@ -22,5 +22,5 @@ BeverlyPhoneCallerScript:
 
 .FoundNugget:
 	setflag ENGINE_BEVERLY_HAS_NUGGET
-	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
+	getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
 	farsjump PhoneScript_FoundItem_Female
diff --git a/engine/phone/scripts/brent.asm b/engine/phone/scripts/brent.asm
index 7187befee..1a4d954f9 100644
--- a/engine/phone/scripts/brent.asm
+++ b/engine/phone/scripts/brent.asm
@@ -14,7 +14,7 @@ BrentPhoneCalleeScript:
 	farsjump BrentHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	farsjump BrentReminderScript
 
 BrentPhoneCallerScript:
@@ -36,7 +36,7 @@ BrentMondayMorning:
 	setflag ENGINE_BRENT_MONDAY_MORNING
 
 BrentWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	setflag ENGINE_BRENT
 	farsjump PhoneScript_WantsToBattle_Male
 
diff --git a/engine/phone/scripts/chad.asm b/engine/phone/scripts/chad.asm
index 8af8e6eee..db24e0aa5 100644
--- a/engine/phone/scripts/chad.asm
+++ b/engine/phone/scripts/chad.asm
@@ -14,7 +14,7 @@ ChadPhoneCalleeScript:
 	farsjump ChadHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	farsjump ChadReminderScript
 
 ChadPhoneCallerScript:
@@ -38,7 +38,7 @@ ChadFridayMorning:
 	setflag ENGINE_CHAD_FRIDAY_MORNING
 
 ChadWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	setflag ENGINE_CHAD
 	farsjump PhoneScript_WantsToBattle_Male
 
diff --git a/engine/phone/scripts/dana.asm b/engine/phone/scripts/dana.asm
index c00607f41..4582db0c4 100644
--- a/engine/phone/scripts/dana.asm
+++ b/engine/phone/scripts/dana.asm
@@ -16,11 +16,11 @@ DanaPhoneCalleeScript:
 	farsjump DanaHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	farsjump DanaReminderScript
 
 .HasThunderstone:
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	farsjump DanaComePickUpScript
 
 DanaPhoneCallerScript:
@@ -52,7 +52,7 @@ DanaThursdayNight:
 	setflag ENGINE_DANA_THURSDAY_NIGHT
 
 DanaWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	setflag ENGINE_DANA
 	farsjump PhoneScript_WantsToBattle_Female
 
@@ -61,5 +61,5 @@ DanaFoundRare:
 
 DanaHasThunderstone:
 	setflag ENGINE_DANA_HAS_THUNDERSTONE
-	getlandmarkname STRING_BUFFER_5, ROUTE_38
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_38
 	farsjump PhoneScript_FoundItem_Female
diff --git a/engine/phone/scripts/derek.asm b/engine/phone/scripts/derek.asm
index 9a69e7701..3592b06d1 100644
--- a/engine/phone/scripts/derek.asm
+++ b/engine/phone/scripts/derek.asm
@@ -19,7 +19,7 @@ DerekPhoneCalleeScript:
 	farsjump PhoneScript_BugCatchingContest
 
 .Nugget:
-	getlandmarkname STRING_BUFFER_5, ROUTE_39
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_39
 	farsjump DerekComePickUpScript
 
 DerekPhoneCallerScript:
@@ -44,5 +44,5 @@ DerekPhoneCallerScript:
 
 .Nugget:
 	setflag ENGINE_DEREK_HAS_NUGGET
-	getlandmarkname STRING_BUFFER_5, ROUTE_39
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_39
 	farsjump PhoneScript_FoundItem_Male
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
diff --git a/engine/phone/scripts/gaven.asm b/engine/phone/scripts/gaven.asm
index 32e20db91..5006f3067 100644
--- a/engine/phone/scripts/gaven.asm
+++ b/engine/phone/scripts/gaven.asm
@@ -14,7 +14,7 @@ GavenPhoneCalleeScript:
 	farsjump GavenHangUpNotThursdayScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_26
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
 	farsjump GavenReminderScript
 
 GavenPhoneCallerScript:
@@ -36,7 +36,7 @@ GavenThursdayMorningScript:
 	setflag ENGINE_GAVEN_THURSDAY_MORNING
 
 GavenWantsRematch:
-	getlandmarkname STRING_BUFFER_5, ROUTE_26
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_26
 	setflag ENGINE_GAVEN
 	farsjump PhoneScript_WantsToBattle_Male
 
diff --git a/engine/phone/scripts/gina.asm b/engine/phone/scripts/gina.asm
index 3b9da6090..b001c94ae 100644
--- a/engine/phone/scripts/gina.asm
+++ b/engine/phone/scripts/gina.asm
@@ -21,11 +21,11 @@ GinaPhoneCalleeScript:
 	farsjump GinaRocketRumorScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	farsjump GinaReminderScript
 
 .HasLeafStone:
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	farsjump GinaComePickUpScript
 
 GinaPhoneCallerScript:
@@ -59,7 +59,7 @@ GinaSundayDay:
 	setflag ENGINE_GINA_SUNDAY_AFTERNOON
 
 GinaWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	setflag ENGINE_GINA
 	farsjump PhoneScript_WantsToBattle_Female
 
@@ -68,5 +68,5 @@ GinaRockets:
 
 GinaHasLeafStone:
 	setflag ENGINE_GINA_HAS_LEAF_STONE
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	farsjump PhoneScript_FoundItem_Female
diff --git a/engine/phone/scripts/huey.asm b/engine/phone/scripts/huey.asm
index cac966682..483ff6640 100644
--- a/engine/phone/scripts/huey.asm
+++ b/engine/phone/scripts/huey.asm
@@ -15,7 +15,7 @@ HueyPhoneCalleeScript:
 	farsjump HueyHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
+	getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
 	farsjump HueyWantsBattleScript
 
 HueyPhoneCallerScript:
@@ -36,6 +36,6 @@ HueyWednesdayNight:
 	setflag ENGINE_HUEY_WEDNESDAY_NIGHT
 
 HueyWantsBattle:
-	getlandmarkname STRING_BUFFER_5, LIGHTHOUSE
+	getlandmarkname STRING_BUFFER_5, LANDMARK_LIGHTHOUSE
 	setflag ENGINE_HUEY
 	farsjump PhoneScript_WantsToBattle_Male
diff --git a/engine/phone/scripts/jack.asm b/engine/phone/scripts/jack.asm
index f2de3689c..5fb9e048c 100644
--- a/engine/phone/scripts/jack.asm
+++ b/engine/phone/scripts/jack.asm
@@ -14,7 +14,7 @@ JackPhoneCalleeScript:
 	farsjump JackPhoneTipsScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
+	getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
 	farsjump JackWantsBattleScript
 
 JackPhoneCallerScript:
@@ -38,7 +38,7 @@ JackMondayMorning:
 	setflag ENGINE_JACK_MONDAY_MORNING
 
 JackWantsToBattle:
-	getlandmarkname STRING_BUFFER_5, NATIONAL_PARK
+	getlandmarkname STRING_BUFFER_5, LANDMARK_NATIONAL_PARK
 	setflag ENGINE_JACK
 	farsjump PhoneScript_WantsToBattle_Male
 
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
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
diff --git a/engine/phone/scripts/liz.asm b/engine/phone/scripts/liz.asm
index a2e5320cb..10ea1734e 100644
--- a/engine/phone/scripts/liz.asm
+++ b/engine/phone/scripts/liz.asm
@@ -15,7 +15,7 @@ LizPhoneCalleeScript:
 	farsjump LizHangUpScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	farsjump LizReminderScript
 
 LizPhoneCallerScript:
@@ -43,7 +43,7 @@ LizThursdayAfternoon:
 	setflag ENGINE_LIZ_THURSDAY_AFTERNOON
 
 LizWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	setflag ENGINE_LIZ
 	farsjump PhoneScript_WantsToBattle_Female
 
diff --git a/engine/phone/scripts/mom.asm b/engine/phone/scripts/mom.asm
index 900e48be6..db1f65d45 100644
--- a/engine/phone/scripts/mom.asm
+++ b/engine/phone/scripts/mom.asm
@@ -47,13 +47,13 @@ MomPhonePalette1:
 	sjump MomSavingMoney
 
 .violet
-	getlandmarkname STRING_BUFFER_4, SPROUT_TOWER
+	getlandmarkname STRING_BUFFER_4, LANDMARK_SPROUT_TOWER
 	sjump MomPhoneLandmark
 .azalea
-	getlandmarkname STRING_BUFFER_4, SLOWPOKE_WELL
+	getlandmarkname STRING_BUFFER_4, LANDMARK_SLOWPOKE_WELL
 	sjump MomPhoneLandmark
 .goldenrod
-	getlandmarkname STRING_BUFFER_4, RADIO_TOWER
+	getlandmarkname STRING_BUFFER_4, LANDMARK_RADIO_TOWER
 	sjump MomPhoneLandmark
 
 MomPhonePalette2:
diff --git a/engine/phone/scripts/parry.asm b/engine/phone/scripts/parry.asm
index e8628bcfd..eba6fbd23 100644
--- a/engine/phone/scripts/parry.asm
+++ b/engine/phone/scripts/parry.asm
@@ -14,7 +14,7 @@ ParryPhoneCalleeScript:
 	farsjump ParryBattleWithMeScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_45
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_45
 	farsjump ParryHaventYouGottenToScript
 
 ParryPhoneCallerScript:
@@ -35,6 +35,6 @@ ParryFridayDay:
 	setflag ENGINE_PARRY_FRIDAY_AFTERNOON
 
 ParryWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_45
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_45
 	setflag ENGINE_PARRY
 	farsjump PhoneScript_WantsToBattle_Male
diff --git a/engine/phone/scripts/ralph.asm b/engine/phone/scripts/ralph.asm
index 245cce175..ef0714de1 100644
--- a/engine/phone/scripts/ralph.asm
+++ b/engine/phone/scripts/ralph.asm
@@ -15,11 +15,11 @@ RalphPhoneCalleeScript:
 	farsjump RalphNoItemScript
 
 .Rematch:
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	farsjump RalphReminderScript
 
 .ReportSwarm:
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	farsjump RalphHurryScript
 
 RalphPhoneCallerScript:
@@ -41,7 +41,7 @@ RalphPhoneCallerScript:
 Ralph_WednesdayMorning:
 	setflag ENGINE_RALPH_WEDNESDAY_MORNING
 Ralph_FightMe:
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	setflag ENGINE_RALPH
 	farsjump PhoneScript_WantsToBattle_Male
 
@@ -50,7 +50,7 @@ Ralph_SetUpSwarm:
 	iftrue .Generic
 	setflag ENGINE_FISH_SWARM
 	getmonname STRING_BUFFER_4, QWILFISH
-	getlandmarkname STRING_BUFFER_5, ROUTE_32
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_32
 	setval FISHSWARM_QWILFISH
 	special ActivateFishingSwarm
 	farsjump RalphItemScript
diff --git a/engine/phone/scripts/reena.asm b/engine/phone/scripts/reena.asm
index 4800eb441..9425d4379 100644
--- a/engine/phone/scripts/reena.asm
+++ b/engine/phone/scripts/reena.asm
@@ -14,7 +14,7 @@ ReenaPhoneCalleeScript:
 	farsjump ReenaForwardScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_27
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
 	farsjump ReenaHurryScript
 
 ReenaPhoneCallerScript:
@@ -34,6 +34,6 @@ ReenaSundayMorning:
 	setflag ENGINE_REENA_SUNDAY_MORNING
 
 ReenaWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_27
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_27
 	setflag ENGINE_REENA
 	farsjump PhoneScript_WantsToBattle_Female
diff --git a/engine/phone/scripts/tiffany.asm b/engine/phone/scripts/tiffany.asm
index 394361999..c088a5345 100644
--- a/engine/phone/scripts/tiffany.asm
+++ b/engine/phone/scripts/tiffany.asm
@@ -16,11 +16,11 @@ TiffanyPhoneCalleeScript:
 	farsjump TiffanyNoItemScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	farsjump TiffanyAsleepScript
 
 .HasItem:
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	farsjump TiffanyHurryScript
 
 TiffanyPhoneCallerScript:
@@ -52,7 +52,7 @@ TiffanyTuesdayAfternoon:
 	setflag ENGINE_TIFFANY_TUESDAY_AFTERNOON
 
 TiffanyWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	setflag ENGINE_TIFFANY
 	farsjump PhoneScript_WantsToBattle_Female
 
@@ -94,5 +94,5 @@ TiffanysFamilyMembers:
 
 TiffanyHasPinkBow:
 	setflag ENGINE_TIFFANY_HAS_PINK_BOW
-	getlandmarkname STRING_BUFFER_5, ROUTE_43
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_43
 	farsjump PhoneScript_FoundItem_Female
diff --git a/engine/phone/scripts/todd.asm b/engine/phone/scripts/todd.asm
index 5f73c97d6..b5b83cb05 100644
--- a/engine/phone/scripts/todd.asm
+++ b/engine/phone/scripts/todd.asm
@@ -16,7 +16,7 @@ ToddPhoneCalleeScript:
 	farsjump ToddNoItemScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	farsjump ToddForwardScript
 
 .SaleOn:
@@ -47,7 +47,7 @@ ToddSaturdayMorning:
 	setflag ENGINE_TODD_SATURDAY_MORNING
 
 ToddWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_34
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_34
 	setflag ENGINE_TODD
 	farsjump PhoneScript_WantsToBattle_Male
 
diff --git a/engine/phone/scripts/tully.asm b/engine/phone/scripts/tully.asm
index c02931831..995355485 100644
--- a/engine/phone/scripts/tully.asm
+++ b/engine/phone/scripts/tully.asm
@@ -16,11 +16,11 @@ TullyPhoneCalleeScript:
 	farsjump TullyNoItemScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_42
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42
 	farsjump TullyForwardScript
 
 .WaterStone:
-	getlandmarkname STRING_BUFFER_5, ROUTE_42
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42
 	farsjump TullyHurryScript
 
 TullyPhoneCallerScript:
@@ -50,11 +50,11 @@ TullySundayNight:
 	setflag ENGINE_TULLY_SUNDAY_NIGHT
 
 TullyWantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_42
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42
 	setflag ENGINE_TULLY
 	farsjump PhoneScript_WantsToBattle_Male
 
 TullyFoundWaterStone:
 	setflag ENGINE_TULLY_HAS_WATER_STONE
-	getlandmarkname STRING_BUFFER_5, ROUTE_42
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_42
 	farsjump PhoneScript_FoundItem_Male
diff --git a/engine/phone/scripts/vance.asm b/engine/phone/scripts/vance.asm
index 7f01f27d6..39cd333eb 100644
--- a/engine/phone/scripts/vance.asm
+++ b/engine/phone/scripts/vance.asm
@@ -14,7 +14,7 @@ VancePhoneCalleeScript:
 	farsjump VanceLookingForwardScript
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_44
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44
 	farsjump VanceHurryHurryScript
 
 VancePhoneCallerScript:
@@ -35,6 +35,6 @@ VanceWednesdayNight:
 	setflag ENGINE_VANCE_WEDNESDAY_NIGHT
 
 VanceWantsRematch:
-	getlandmarkname STRING_BUFFER_5, ROUTE_44
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_44
 	setflag ENGINE_VANCE
 	farsjump PhoneScript_WantsToBattle_Male
diff --git a/engine/phone/scripts/wade.asm b/engine/phone/scripts/wade.asm
index 298468de1..9d044d38b 100644
--- a/engine/phone/scripts/wade.asm
+++ b/engine/phone/scripts/wade.asm
@@ -29,11 +29,11 @@ WadePhoneCalleeScript:
 	farsjump PhoneScript_BugCatchingContest
 
 .WantsBattle:
-	getlandmarkname STRING_BUFFER_5, ROUTE_31
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31
 	farsjump WadeQuickBattleScript
 
 .HasItem:
-	getlandmarkname STRING_BUFFER_5, ROUTE_31
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31
 	farsjump WadeComeQuickScript
 
 WadePhoneCallerScript:
@@ -74,7 +74,7 @@ WadeTuesdayNight:
 	setflag ENGINE_WADE_TUESDAY_NIGHT
 
 WadeWantsBattle2:
-	getlandmarkname STRING_BUFFER_5, ROUTE_31
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31
 	setflag ENGINE_WADE
 	farsjump PhoneScript_WantsToBattle_Male
 
@@ -83,7 +83,7 @@ WadeFoundRare:
 
 WadeHasItem2:
 	setflag ENGINE_WADE_HAS_ITEM
-	getlandmarkname STRING_BUFFER_5, ROUTE_31
+	getlandmarkname STRING_BUFFER_5, LANDMARK_ROUTE_31
 	clearevent EVENT_WADE_HAS_BERRY
 	clearevent EVENT_WADE_HAS_PSNCUREBERRY
 	clearevent EVENT_WADE_HAS_PRZCUREBERRY
diff --git a/engine/phone/scripts/wilton.asm b/engine/phone/scripts/wilton.asm
index b9e014ecb..bf7849011 100644
--- a/engine/phone/scripts/wilton.asm
+++ b/engine/phone/scripts/wilton.asm
@@ -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
diff --git a/engine/pokedex/pokedex.asm b/engine/pokedex/pokedex.asm
index 7a97d57cf..53bd89499 100644
--- a/engine/pokedex/pokedex.asm
+++ b/engine/pokedex/pokedex.asm
@@ -168,7 +168,7 @@ Pokedex_GetLandmark:
 	ld c, a
 	call GetWorldMapLocation
 
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	jr nz, .load
 
 	ld a, [wBackupMapGroup]
diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm
index 3c74d3f59..fd82bb1c3 100644
--- a/engine/pokegear/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
@@ -130,7 +130,7 @@ Pokegear_LoadGFX:
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .ssaqua
 	farcall GetPlayerIcon
 	push de
@@ -195,7 +195,7 @@ TownMap_GetCurrentLandmark:
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	ret nz
 	ld a, [wBackupMapGroup]
 	ld b, a
@@ -210,9 +210,9 @@ TownMap_InitCursorAndPlayerIconPositions:
 	ld a, [wMapNumber]
 	ld c, a
 	call GetWorldMapLocation
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .FastShip
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	jr nz, .LoadLandmark
 	ld a, [wBackupMapGroup]
 	ld b, a
@@ -226,7 +226,7 @@ TownMap_InitCursorAndPlayerIconPositions:
 
 .FastShip:
 	ld [wPokegearMapPlayerIconLandmark], a
-	ld a, NEW_BARK_TOWN
+	ld a, LANDMARK_NEW_BARK_TOWN
 	ld [wPokegearMapCursorLandmark], a
 	ret
 
@@ -324,7 +324,7 @@ InitPokegearTilemap:
 
 .Map:
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr nc, .kanto
@@ -539,7 +539,7 @@ Pokegear_UpdateClock:
 
 PokegearMap_CheckRegion:
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr nc, .kanto
@@ -574,8 +574,8 @@ PokegearMap_KantoMap:
 	jr PokegearMap_ContinueMap
 
 PokegearMap_JohtoMap:
-	ld d, SILVER_CAVE
-	ld e, NEW_BARK_TOWN
+	ld d, LANDMARK_SILVER_CAVE
+	ld e, LANDMARK_NEW_BARK_TOWN
 PokegearMap_ContinueMap:
 	ld hl, hJoyLast
 	ld a, [hl]
@@ -737,13 +737,13 @@ TownMap_GetKantoLandmarkLimits:
 	ld a, [wStatusFlags]
 	bit STATUSFLAGS_HALL_OF_FAME_F, a
 	jr z, .not_hof
-	ld d, ROUTE_28
-	ld e, PALLET_TOWN
+	ld d, LANDMARK_ROUTE_28
+	ld e, LANDMARK_PALLET_TOWN
 	ret
 
 .not_hof
-	ld d, ROUTE_28
-	ld e, VICTORY_ROAD
+	ld d, LANDMARK_ROUTE_28
+	ld e, LANDMARK_VICTORY_ROAD
 	ret
 
 PokegearRadio_Init:
@@ -1502,7 +1502,7 @@ RadioChannels:
 
 .RuinsOfAlphRadio:
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp RUINS_OF_ALPH
+	cp LANDMARK_RUINS_OF_ALPH
 	jr nz, .NoSignal
 	jp LoadStation_UnownRadio
 
@@ -1536,11 +1536,11 @@ RadioChannels:
 	bit STATUSFLAGS_ROCKET_SIGNAL_F, a
 	jr z, .NoSignal
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp MAHOGANY_TOWN
+	cp LANDMARK_MAHOGANY_TOWN
 	jr z, .ok
-	cp ROUTE_43
+	cp LANDMARK_ROUTE_43
 	jr z, .ok
-	cp LAKE_OF_RAGE
+	cp LANDMARK_LAKE_OF_RAGE
 	jr nz, .NoSignal
 .ok
 	jp LoadStation_EvolutionRadio
@@ -1554,7 +1554,7 @@ RadioChannels:
 
 ; otherwise clear carry
 	ld a, [wPokegearMapPlayerIconLandmark]
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
@@ -2266,7 +2266,7 @@ FlyMap:
 	call GetWorldMapLocation
 ; If we're not in a valid location, i.e. Pokecenter floor 2F,
 ; the backup map information is used.
-	cp SPECIAL_MAP
+	cp LANDMARK_SPECIAL
 	jr nz, .CheckRegion
 	ld a, [wBackupMapGroup]
 	ld b, a
@@ -2589,7 +2589,7 @@ Pokedex_GetArea:
 ; not in the same region as what's currently
 ; on the screen.
 	ld a, [wTownMapPlayerIconLandmark]
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .johto
 	cp KANTO_LANDMARK
 	jr c, .johto
@@ -2617,7 +2617,7 @@ Pokedex_GetArea:
 
 .GetPlayerOrFastShipIcon:
 	ld a, [wTownMapPlayerIconLandmark]
-	cp FAST_SHIP
+	cp LANDMARK_FAST_SHIP
 	jr z, .FastShip
 	farcall GetPlayerIcon
 	ret
diff --git a/engine/pokemon/caught_data.asm b/engine/pokemon/caught_data.asm
index 0633b8e9a..7bf57cdc3 100644
--- a/engine/pokemon/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
@@ -76,7 +76,7 @@ CheckPartyFullAfterContest:
 	call GetPartyLocation
 	ld a, [hl]
 	and CAUGHT_GENDER_MASK
-	ld b, NATIONAL_PARK
+	ld b, LANDMARK_NATIONAL_PARK
 	or b
 	ld [hl], a
 	xor a
@@ -136,7 +136,7 @@ CheckPartyFullAfterContest:
 	ld hl, sBoxMon1CaughtLocation
 	ld a, [hl]
 	and CAUGHT_GENDER_MASK
-	ld b, NATIONAL_PARK
+	ld b, LANDMARK_NATIONAL_PARK
 	or b
 	ld [hl], a
 	call CloseSRAM
@@ -226,7 +226,7 @@ SetGiftPartyMonCaughtData:
 SetGiftMonCaughtData:
 	xor a
 	ld [hli], a
-	ld a, GIFT_LOCATION
+	ld a, LANDMARK_GIFT
 	rrc b
 	or b
 	ld [hl], a