Merge pull request #696 from Rangi42/master

Rename LANDMARK_* constants, and refactor flypoints

constants/landmark_constants.asm

@@ -2,108 +2,108 @@
 	const_def
 
 ; Johto landmarks
-	const SPECIAL_MAP       ; 00
+	const LANDMARK_SPECIAL           ; 00
-	const NEW_BARK_TOWN     ; 01
+	const LANDMARK_NEW_BARK_TOWN     ; 01
-	const ROUTE_29          ; 02
+	const LANDMARK_ROUTE_29          ; 02
-	const CHERRYGROVE_CITY  ; 03
+	const LANDMARK_CHERRYGROVE_CITY  ; 03
-	const ROUTE_30          ; 04
+	const LANDMARK_ROUTE_30          ; 04
-	const ROUTE_31          ; 05
+	const LANDMARK_ROUTE_31          ; 05
-	const VIOLET_CITY       ; 06
+	const LANDMARK_VIOLET_CITY       ; 06
-	const SPROUT_TOWER      ; 07
+	const LANDMARK_SPROUT_TOWER      ; 07
-	const ROUTE_32          ; 08
+	const LANDMARK_ROUTE_32          ; 08
-	const RUINS_OF_ALPH     ; 09
+	const LANDMARK_RUINS_OF_ALPH     ; 09
-	const UNION_CAVE        ; 0a
+	const LANDMARK_UNION_CAVE        ; 0a
-	const ROUTE_33          ; 0b
+	const LANDMARK_ROUTE_33          ; 0b
-	const AZALEA_TOWN       ; 0c
+	const LANDMARK_AZALEA_TOWN       ; 0c
-	const SLOWPOKE_WELL     ; 0d
+	const LANDMARK_SLOWPOKE_WELL     ; 0d
-	const ILEX_FOREST       ; 0e
+	const LANDMARK_ILEX_FOREST       ; 0e
-	const ROUTE_34          ; 0f
+	const LANDMARK_ROUTE_34          ; 0f
-	const GOLDENROD_CITY    ; 10
+	const LANDMARK_GOLDENROD_CITY    ; 10
-	const RADIO_TOWER       ; 11
+	const LANDMARK_RADIO_TOWER       ; 11
-	const ROUTE_35          ; 12
+	const LANDMARK_ROUTE_35          ; 12
-	const NATIONAL_PARK     ; 13
+	const LANDMARK_NATIONAL_PARK     ; 13
-	const ROUTE_36          ; 14
+	const LANDMARK_ROUTE_36          ; 14
-	const ROUTE_37          ; 15
+	const LANDMARK_ROUTE_37          ; 15
-	const ECRUTEAK_CITY     ; 16
+	const LANDMARK_ECRUTEAK_CITY     ; 16
-	const TIN_TOWER         ; 17
+	const LANDMARK_TIN_TOWER         ; 17
-	const BURNED_TOWER      ; 18
+	const LANDMARK_BURNED_TOWER      ; 18
-	const ROUTE_38          ; 19
+	const LANDMARK_ROUTE_38          ; 19
-	const ROUTE_39          ; 1a
+	const LANDMARK_ROUTE_39          ; 1a
-	const OLIVINE_CITY      ; 1b
+	const LANDMARK_OLIVINE_CITY      ; 1b
-	const LIGHTHOUSE        ; 1c
+	const LANDMARK_LIGHTHOUSE        ; 1c
-	const BATTLE_TOWER      ; 1d
+	const LANDMARK_BATTLE_TOWER      ; 1d
-	const ROUTE_40          ; 1e
+	const LANDMARK_ROUTE_40          ; 1e
-	const WHIRL_ISLANDS     ; 1f
+	const LANDMARK_WHIRL_ISLANDS     ; 1f
-	const ROUTE_41          ; 20
+	const LANDMARK_ROUTE_41          ; 20
-	const CIANWOOD_CITY     ; 21
+	const LANDMARK_CIANWOOD_CITY     ; 21
-	const ROUTE_42          ; 22
+	const LANDMARK_ROUTE_42          ; 22
-	const MT_MORTAR         ; 23
+	const LANDMARK_MT_MORTAR         ; 23
-	const MAHOGANY_TOWN     ; 24
+	const LANDMARK_MAHOGANY_TOWN     ; 24
-	const ROUTE_43          ; 25
+	const LANDMARK_ROUTE_43          ; 25
-	const LAKE_OF_RAGE      ; 26
+	const LANDMARK_LAKE_OF_RAGE      ; 26
-	const ROUTE_44          ; 27
+	const LANDMARK_ROUTE_44          ; 27
-	const ICE_PATH          ; 28
+	const LANDMARK_ICE_PATH          ; 28
-	const BLACKTHORN_CITY   ; 29
+	const LANDMARK_BLACKTHORN_CITY   ; 29
-	const DRAGONS_DEN       ; 2a
+	const LANDMARK_DRAGONS_DEN       ; 2a
-	const ROUTE_45          ; 2b
+	const LANDMARK_ROUTE_45          ; 2b
-	const DARK_CAVE         ; 2c
+	const LANDMARK_DARK_CAVE         ; 2c
-	const ROUTE_46          ; 2d
+	const LANDMARK_ROUTE_46          ; 2d
-	const SILVER_CAVE       ; 2e
+	const LANDMARK_SILVER_CAVE       ; 2e
 
 KANTO_LANDMARK EQU const_value
-	const PALLET_TOWN       ; 2f
+	const LANDMARK_PALLET_TOWN       ; 2f
-	const ROUTE_1           ; 30
+	const LANDMARK_ROUTE_1           ; 30
-	const VIRIDIAN_CITY     ; 31
+	const LANDMARK_VIRIDIAN_CITY     ; 31
-	const ROUTE_2           ; 32
+	const LANDMARK_ROUTE_2           ; 32
-	const PEWTER_CITY       ; 33
+	const LANDMARK_PEWTER_CITY       ; 33
-	const ROUTE_3           ; 34
+	const LANDMARK_ROUTE_3           ; 34
-	const MT_MOON           ; 35
+	const LANDMARK_MT_MOON           ; 35
-	const ROUTE_4           ; 36
+	const LANDMARK_ROUTE_4           ; 36
-	const CERULEAN_CITY     ; 37
+	const LANDMARK_CERULEAN_CITY     ; 37
-	const ROUTE_24          ; 38
+	const LANDMARK_ROUTE_24          ; 38
-	const ROUTE_25          ; 39
+	const LANDMARK_ROUTE_25          ; 39
-	const ROUTE_5           ; 3a
+	const LANDMARK_ROUTE_5           ; 3a
-	const UNDERGROUND_PATH  ; 3b
+	const LANDMARK_UNDERGROUND_PATH  ; 3b
-	const ROUTE_6           ; 3c
+	const LANDMARK_ROUTE_6           ; 3c
-	const VERMILION_CITY    ; 3d
+	const LANDMARK_VERMILION_CITY    ; 3d
-	const DIGLETTS_CAVE     ; 3e
+	const LANDMARK_DIGLETTS_CAVE     ; 3e
-	const ROUTE_7           ; 3f
+	const LANDMARK_ROUTE_7           ; 3f
-	const ROUTE_8           ; 40
+	const LANDMARK_ROUTE_8           ; 40
-	const ROUTE_9           ; 41
+	const LANDMARK_ROUTE_9           ; 41
-	const ROCK_TUNNEL       ; 42
+	const LANDMARK_ROCK_TUNNEL       ; 42
-	const ROUTE_10          ; 43
+	const LANDMARK_ROUTE_10          ; 43
-	const POWER_PLANT       ; 44
+	const LANDMARK_POWER_PLANT       ; 44
-	const LAVENDER_TOWN     ; 45
+	const LANDMARK_LAVENDER_TOWN     ; 45
-	const LAV_RADIO_TOWER   ; 46
+	const LANDMARK_LAV_RADIO_TOWER   ; 46
-	const CELADON_CITY      ; 47
+	const LANDMARK_CELADON_CITY      ; 47
-	const SAFFRON_CITY      ; 48
+	const LANDMARK_SAFFRON_CITY      ; 48
-	const ROUTE_11          ; 49
+	const LANDMARK_ROUTE_11          ; 49
-	const ROUTE_12          ; 4a
+	const LANDMARK_ROUTE_12          ; 4a
-	const ROUTE_13          ; 4b
+	const LANDMARK_ROUTE_13          ; 4b
-	const ROUTE_14          ; 4c
+	const LANDMARK_ROUTE_14          ; 4c
-	const ROUTE_15          ; 4d
+	const LANDMARK_ROUTE_15          ; 4d
-	const ROUTE_16          ; 4e
+	const LANDMARK_ROUTE_16          ; 4e
-	const ROUTE_17          ; 4f
+	const LANDMARK_ROUTE_17          ; 4f
-	const ROUTE_18          ; 50
+	const LANDMARK_ROUTE_18          ; 50
-	const FUCHSIA_CITY      ; 51
+	const LANDMARK_FUCHSIA_CITY      ; 51
-	const ROUTE_19          ; 52
+	const LANDMARK_ROUTE_19          ; 52
-	const ROUTE_20          ; 53
+	const LANDMARK_ROUTE_20          ; 53
-	const SEAFOAM_ISLANDS   ; 54
+	const LANDMARK_SEAFOAM_ISLANDS   ; 54
-	const CINNABAR_ISLAND   ; 55
+	const LANDMARK_CINNABAR_ISLAND   ; 55
-	const ROUTE_21          ; 56
+	const LANDMARK_ROUTE_21          ; 56
-	const ROUTE_22          ; 57
+	const LANDMARK_ROUTE_22          ; 57
-	const VICTORY_ROAD      ; 58
+	const LANDMARK_VICTORY_ROAD      ; 58
-	const ROUTE_23          ; 59
+	const LANDMARK_ROUTE_23          ; 59
-	const INDIGO_PLATEAU    ; 5a
+	const LANDMARK_INDIGO_PLATEAU    ; 5a
-	const ROUTE_26          ; 5b
+	const LANDMARK_ROUTE_26          ; 5b
-	const ROUTE_27          ; 5c
+	const LANDMARK_ROUTE_27          ; 5c
-	const TOHJO_FALLS       ; 5d
+	const LANDMARK_TOHJO_FALLS       ; 5d
-	const ROUTE_28          ; 5e
+	const LANDMARK_ROUTE_28          ; 5e
-	const FAST_SHIP         ; 5f
+	const LANDMARK_FAST_SHIP         ; 5f
 
 ; used in CaughtData
-GIFT_LOCATION  EQU $7e
+LANDMARK_GIFT  EQU $7e
-EVENT_LOCATION EQU $7f
+LANDMARK_EVENT EQU $7f
 
 ; Regions
 	const_def

constants/map_data_constants.asm

@@ -99,4 +99,34 @@ const_value = -1
 	const SPAWN_FAST_SHIP
 NUM_SPAWNS EQU const_value
 
+; Flypoints indexes (see data/maps/flypoints.asm)
+	const_def
+; johto
+	const FLY_NEW_BARK
+	const FLY_CHERRYGROVE
+	const FLY_VIOLET
+	const FLY_AZALEA
+	const FLY_GOLDENROD
+	const FLY_ECRUTEAK
+	const FLY_OLIVINE
+	const FLY_CIANWOOD
+	const FLY_MAHOGANY
+	const FLY_LAKE_OF_RAGE
+	const FLY_BLACKTHORN
+	const FLY_MT_SILVER
+; kanto
+KANTO_FLYPOINT EQU const_value
+	const FLY_PALLET
+	const FLY_VIRIDIAN
+	const FLY_PEWTER
+	const FLY_CERULEAN
+	const FLY_VERMILION
+	const FLY_ROCK_TUNNEL
+	const FLY_LAVENDER
+	const FLY_CELADON
+	const FLY_SAFFRON
+	const FLY_FUCHSIA
+	const FLY_CINNABAR
+	const FLY_INDIGO
+
 MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

data/maps/flypoints.asm

@@ -1,37 +1,30 @@
-flypoint: MACRO
-	const FLY_\1
-	db \2, SPAWN_\1
-ENDM
-
 Flypoints:
-; landmark, spawn point
+; entries correspond to FLY_* constants
-	const_def
 ; Johto
-	flypoint NEW_BARK,     NEW_BARK_TOWN
+	; landmark, spawn point
-	flypoint CHERRYGROVE,  CHERRYGROVE_CITY
+	db LANDMARK_NEW_BARK_TOWN,    SPAWN_NEW_BARK
-	flypoint VIOLET,       VIOLET_CITY
+	db LANDMARK_CHERRYGROVE_CITY, SPAWN_CHERRYGROVE
-	flypoint AZALEA,       AZALEA_TOWN
+	db LANDMARK_VIOLET_CITY,      SPAWN_VIOLET
-	flypoint GOLDENROD,    GOLDENROD_CITY
+	db LANDMARK_AZALEA_TOWN,      SPAWN_AZALEA
-	flypoint ECRUTEAK,     ECRUTEAK_CITY
+	db LANDMARK_GOLDENROD_CITY,   SPAWN_GOLDENROD
-	flypoint OLIVINE,      OLIVINE_CITY
+	db LANDMARK_ECRUTEAK_CITY,    SPAWN_ECRUTEAK
-	flypoint CIANWOOD,     CIANWOOD_CITY
+	db LANDMARK_OLIVINE_CITY,     SPAWN_OLIVINE
-	flypoint MAHOGANY,     MAHOGANY_TOWN
+	db LANDMARK_CIANWOOD_CITY,    SPAWN_CIANWOOD
-	flypoint LAKE_OF_RAGE, LAKE_OF_RAGE
+	db LANDMARK_MAHOGANY_TOWN,    SPAWN_MAHOGANY
-	flypoint BLACKTHORN,   BLACKTHORN_CITY
+	db LANDMARK_LAKE_OF_RAGE,     SPAWN_LAKE_OF_RAGE
-	flypoint MT_SILVER,    SILVER_CAVE
+	db LANDMARK_BLACKTHORN_CITY,  SPAWN_BLACKTHORN
-
+	db LANDMARK_SILVER_CAVE,      SPAWN_MT_SILVER
 ; Kanto
-KANTO_FLYPOINT EQU const_value
+	db LANDMARK_PALLET_TOWN,      SPAWN_PALLET
-	flypoint PALLET,       PALLET_TOWN
+	db LANDMARK_VIRIDIAN_CITY,    SPAWN_VIRIDIAN
-	flypoint VIRIDIAN,     VIRIDIAN_CITY
+	db LANDMARK_PEWTER_CITY,      SPAWN_PEWTER
-	flypoint PEWTER,       PEWTER_CITY
+	db LANDMARK_CERULEAN_CITY,    SPAWN_CERULEAN
-	flypoint CERULEAN,     CERULEAN_CITY
+	db LANDMARK_VERMILION_CITY,   SPAWN_VERMILION
-	flypoint VERMILION,    VERMILION_CITY
+	db LANDMARK_ROCK_TUNNEL,      SPAWN_ROCK_TUNNEL
-	flypoint ROCK_TUNNEL,  ROCK_TUNNEL
+	db LANDMARK_LAVENDER_TOWN,    SPAWN_LAVENDER
-	flypoint LAVENDER,     LAVENDER_TOWN
+	db LANDMARK_CELADON_CITY,     SPAWN_CELADON
-	flypoint CELADON,      CELADON_CITY
+	db LANDMARK_SAFFRON_CITY,     SPAWN_SAFFRON
-	flypoint SAFFRON,      SAFFRON_CITY
+	db LANDMARK_FUCHSIA_CITY,     SPAWN_FUCHSIA
-	flypoint FUCHSIA,      FUCHSIA_CITY
+	db LANDMARK_CINNABAR_ISLAND,  SPAWN_CINNABAR
-	flypoint CINNABAR,     CINNABAR_ISLAND
+	db LANDMARK_INDIGO_PLATEAU,   SPAWN_INDIGO
-	flypoint INDIGO,       INDIGO_PLATEAU
 	db -1

data/maps/spawn_points.asm

@@ -37,4 +37,5 @@ SpawnPoints:
 	spawn BLACKTHORN_CITY,            21, 30
 	spawn SILVER_CAVE_OUTSIDE,        23, 20
 	spawn FAST_SHIP_CABINS_SW_SSW_NW,  6,  2
+
 	spawn N_A,                        -1, -1

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

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]

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

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

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:

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:

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

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

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
 

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
 

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

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

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

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
 

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