redone landmarks, now with constants

constants.asm

@@ -15,6 +15,7 @@ INCLUDE "constants/pokemon_constants.asm"
 INCLUDE "constants/move_constants.asm"
 INCLUDE "constants/battle_constants.asm"
 INCLUDE "constants/map_constants.asm"
+INCLUDE "constants/landmark_constants.asm"
 INCLUDE "constants/item_constants.asm"
 INCLUDE "constants/trainer_constants.asm"
 INCLUDE "constants/script_constants.asm"

constants/landmark_constants.asm

@@ -0,0 +1,100 @@
+
+	const_def
+
+	const SPECIAL_MAP
+	const NEW_BARK_TOWN
+	const ROUTE_29
+	const CHERRYGROVE_CITY
+	const ROUTE_30
+	const ROUTE_31
+	const VIOLET_CITY
+	const SPROUT_TOWER
+	const ROUTE_32
+	const RUINS_OF_ALPH
+	const UNION_CAVE
+	const ROUTE_33
+	const AZALEA_TOWN
+	const SLOWPOKE_WELL
+	const ILEX_FOREST
+	const ROUTE_34
+	const GOLDENROD_CITY
+	const RADIO_TOWER
+	const ROUTE_35
+	const NATIONAL_PARK
+	const ROUTE_36
+	const ROUTE_37
+	const ECRUTEAK_CITY
+	const TIN_TOWER
+	const BURNED_TOWER
+	const ROUTE_38
+	const ROUTE_39
+	const OLIVINE_CITY
+	const LIGHTHOUSE
+	const BATTLE_TOWER
+	const ROUTE_40
+	const WHIRL_ISLANDS
+	const ROUTE_41
+	const CIANWOOD_CITY
+	const ROUTE_42
+	const MT_MORTAR
+	const MAHOGANY_TOWN
+	const ROUTE_43
+	const LAKE_OF_RAGE
+	const ROUTE_44
+	const ICE_PATH
+	const BLACKTHORN_CITY
+	const DRAGONS_DEN
+	const ROUTE_45
+	const DARK_CAVE
+	const ROUTE_46
+	const SILVER_CAVE
+	const PALLET_TOWN
+	const ROUTE_1
+	const VIRIDIAN_CITY
+	const ROUTE_2
+	const PEWTER_CITY
+	const ROUTE_3
+	const MT_MOON
+	const ROUTE_4
+	const CERULEAN_CITY
+	const ROUTE_24
+	const ROUTE_25
+	const ROUTE_5
+	const UNDERGROUND
+	const ROUTE_6
+	const VERMILION_CITY
+	const DIGLETTS_CAVE
+	const ROUTE_7
+	const ROUTE_8
+	const ROUTE_9
+	const ROCK_TUNNEL
+	const ROUTE_10
+	const POWER_PLANT
+	const LAVENDER_TOWN
+	const LAV_RADIO_TOWER
+	const CELADON_CITY
+	const SAFFRON_CITY
+	const ROUTE_11
+	const ROUTE_12
+	const ROUTE_13
+	const ROUTE_14
+	const ROUTE_15
+	const ROUTE_16
+	const ROUTE_17
+	const ROUTE_18
+	const FUCHSIA_CITY
+	const ROUTE_19
+	const ROUTE_20
+	const SEAFOAM_ISLANDS
+	const CINNABAR_ISLAND
+	const ROUTE_21
+	const ROUTE_22
+	const VICTORY_ROAD
+	const ROUTE_23
+	const INDIGO_PLATEAU
+	const ROUTE_26
+	const ROUTE_27
+	const TOHJO_FALLS
+	const ROUTE_28
+	const FAST_SHIP
+

engine/landmarks.asm

@@ -1,8 +1,8 @@
 GetLandmarkCoords: ; 0x1ca896
-; given a landmark id in e, return the y coord in d, and the x coord in e.
+; Return coordinates (d, e) of landmark e.
 	push hl
 	ld l, e
-	ld h, $0
+	ld h, 0
 	add hl, hl
 	add hl, hl
 	ld de, Landmarks
@@ -12,528 +12,246 @@ GetLandmarkCoords: ; 0x1ca896
 	ld d, [hl]
 	pop hl
 	ret
+; 0x1ca8a5
 
 
 GetLandmarkName: ; 0x1ca8a5
-; given a landmark id in e, copy its name to $d073.
+; Copy the name of landmark e to StringBuffer1.
 	push hl
 	push de
 	push bc
+
 	ld l, e
-	ld h, $0
+	ld h, 0
 	add hl, hl
 	add hl, hl
-	ld de, Landmarks + 2 ; skip the coordinates, we only want the string
+	ld de, Landmarks + 2
 	add hl, de
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld de, $d073
+
+	ld de, StringBuffer1
 	ld c, 18
-.loop
+.copy
 	ld a, [hli]
 	ld [de], a
 	inc de
 	dec c
-	jr nz, .loop
+	jr nz, .copy
+
 	pop bc
 	pop de
 	pop hl
 	ret
+; 0x1ca8c3
+
 
 Landmarks: ; 0x1ca8c3
-;db x coord, y coord
-;dw pointer to name 
-	db 0,0
-	dw SpecialMapString
 
-	db 148,116
+landmark: MACRO
-	dw NewBarkString
+	db \1, \2
-
+	dw \3
-	db 136,116
+ENDM
-	dw Route29String
+
-
+	landmark   0,   0, SpecialMapName
-	db 108,116
+	landmark 148, 116, NewBarkTownName
-	dw CherrygroveString
+	landmark 136, 116, Route29Name
-
+	landmark 108, 116, CherrygroveCityName
-	db 108,96
+	landmark 108,  96, Route30Name
-	dw Route30String
+	landmark 104,  76, Route31Name
-
+	landmark  92,  76, VioletCityName
-	db 104,76
+	landmark  93,  74, SproutTowerName
-	dw Route31String
+	landmark  92, 108, Route32Name
-
+	landmark  84,  92, RuinsOfAlphName
-	db 92,76
+	landmark  92, 140, UnionCaveName
-	dw VioletString
+	landmark  90, 140, Route33Name
-
+	landmark  76, 140, AzaleaTownName
-	db 93,74
+	landmark  78, 138, SlowpokeWellName
-	dw SproutString
+	landmark  60, 136, IlexForestName
-
+	landmark  60, 128, Route34Name
-	db 92,108
+	landmark  60, 108, GoldenrodCityName
-	dw Route32String
+	landmark  58, 108, RadioTowerName
-
+	landmark  60,  92, Route35Name
-	db 84,92
+	landmark  60,  76, NationalParkName
-	dw RuinsString
+	landmark  72,  76, Route36Name
-
+	landmark  76,  68, Route37Name
-	db 92,140
+	landmark  76,  60, EcruteakCityName
-	dw UnionString
+	landmark  78,  58, TinTowerName
-
+	landmark  74,  58, BurnedTowerName
-	db 90,140
+	landmark  60,  60, Route38Name
-	dw Route33String
+	landmark  44,  64, Route39Name
-
+	landmark  44,  76, OlivineCityName
-	db 76,140
+	landmark  46,  78, LighthouseName
-	dw AzaleaString
+	landmark  36,  72, BattleTowerName
-
+	landmark  36,  80, Route40Name
-	db 78,138
+	landmark  36, 108, WhirlIslandsName
-	dw WellString
+	landmark  36, 116, Route41Name
-
+	landmark  28, 116, CianwoodCityName
-	db 60,136
+	landmark 100,  60, Route42Name
-	dw IlexString
+	landmark  92,  60, MtMortarName
-
+	landmark 116,  60, MahoganyTownName
-	db 60,128
+	landmark 116,  52, Route43Name
-	dw Route34String
+	landmark 116,  44, LakeOfRageName
-
+	landmark 128,  60, Route44Name
-	db 60,108
+	landmark 138,  54, IcePathName
-	dw GoldenrodString
+	landmark 140,  60, BlackthornCityName
-
+	landmark 140,  52, DragonsDenName
-	db 58,108
+	landmark 140,  80, Route45Name
-	dw RadioTowerString
+	landmark 120,  88, DarkCaveName
-
+	landmark 132, 104, Route46Name
-	db 60,92
+	landmark 156,  84, SilverCaveName
-	dw Route35String
+	landmark  60, 124, PalletTownName
-
+	landmark  60, 108, Route1Name
-	db 60,76
+	landmark  60,  92, ViridianCityName
-	dw ParkString
+	landmark  60,  80, Route2Name
-
+	landmark  60,  68, PewterCityName
-	db 72,76
+	landmark  72,  68, Route3Name
-	dw Route36String
+	landmark  84,  68, MtMoonName
-
+	landmark  96,  68, Route4Name
-	db 76,68
+	landmark 108,  68, CeruleanCityName
-	dw Route37String
+	landmark 108,  60, Route24Name
-
+	landmark 116,  52, Route25Name
-	db 76,60
+	landmark 108,  76, Route5Name
-	dw EcruteakString
+	landmark 116,  92, UndergroundName
-
+	landmark 108,  92, Route6Name
-	db 78,58
+	landmark 108, 100, VermilionCityName
-	dw TinString
+	landmark  96,  76, DiglettsCaveName
-
+	landmark  96,  84, Route7Name
-	db 74,58
+	landmark 124,  84, Route8Name
-	dw BurnedTowerString
+	landmark 124,  68, Route9Name
-
+	landmark 140,  68, RockTunnelName
-	db 60,60
+	landmark 140,  72, Route10Name
-	dw Route38String
+	landmark 140,  76, PowerPlantName
-
+	landmark 140,  84, LavenderTownName
-	db 44,64
+	landmark 148,  84, LavRadioTowerName
-	dw Route39String
+	landmark  84,  84, CeladonCityName
-
+	landmark 108,  84, SaffronCityName
-	db 44,76
+	landmark 124, 100, Route11Name
-	dw OlivineString
+	landmark 140,  96, Route12Name
-
+	landmark 132, 116, Route13Name
-	db 46,78
+	landmark 124, 128, Route14Name
-	dw LighthouseString
+	landmark 112, 132, Route15Name
-
+	landmark  76,  84, Route16Name
-	db 36,72
+	landmark  76, 108, Route17Name
-	dw BattleTowerString
+	landmark  88, 132, Route18Name
-
+	landmark 100, 132, FuchsiaCityName
-	db 36,80
+	landmark 100, 144, Route19Name
-	dw Route40String
+	landmark  84, 148, Route20Name
-
+	landmark  76, 148, SeafoamIslandsName
-	db 36,108
+	landmark  60, 148, CinnabarIslandName
-	dw WhirlString
+	landmark  60, 136, Route21Name
-
+	landmark  44,  84, Route22Name
-	db 36,116
+	landmark  36,  68, VictoryRoadName
-	dw Route41String
+	landmark  36,  60, Route23Name
-
+	landmark  36,  52, IndigoPlateauName
-	db 28,116
+	landmark  36, 108, Route26Name
-	dw CianwoodString
+	landmark  28, 116, Route27Name
-
+	landmark  20, 116, TohjoFallsName
-	db 100,60
+	landmark  28,  84, Route28Name
-	dw Route42String
+	landmark 148, 132, FastShipName
-
+
-	db 92,60
+
-	dw MortarString
+NewBarkTownName:     db "NEW BARK", $1f, "TOWN@"
-
+CherrygroveCityName: db "CHERRYGROVE", $1f, "CITY@"
-	db 116,60
+VioletCityName:      db "VIOLET CITY@"
-	dw MahoganyString
+AzaleaTownName:      db "AZALEA TOWN@"
-
+GoldenrodCityName:   db "GOLDENROD", $1f, "CITY@"
-	db 116,52
+EcruteakCityName:    db "ECRUTEAK", $1f, "CITY@"
-	dw Route43String
+OlivineCityName:     db "OLIVINE", $1f, "CITY@"
-
+CianwoodCityName:    db "CIANWOOD", $1f, "CITY@"
-	db 116,44
+MahoganyTownName:    db "MAHOGANY", $1f, "TOWN@"
-	dw LakeString
+BlackthornCityName:  db "BLACKTHORN", $1f, "CITY@"
-
+LakeOfRageName:      db "LAKE OF", $1f, "RAGE@"
-	db 128,60
+SilverCaveName:      db "SILVER CAVE@"
-	dw Route44String
+SproutTowerName:     db "SPROUT", $1f, "TOWER@"
-
+RuinsOfAlphName:     db "RUINS", $1f, "OF ALPH@"
-	db 138,54
+UnionCaveName:       db "UNION CAVE@"
-	dw PathString
+SlowpokeWellName:    db "SLOWPOKE", $1f, "WELL@"
-
+RadioTowerName:      db "RADIO TOWER@"
-	db 140,60
+PowerPlantName:      db "POWER PLANT@"
-	dw BlackthornString
+NationalParkName:    db "NATIONAL", $1f, "PARK@"
-
+TinTowerName:        db "TIN TOWER@"
-	db 140,52
+LighthouseName:      db "LIGHTHOUSE@"
-	dw DenString
+WhirlIslandsName:    db "WHIRL", $1f, "ISLANDS@"
-
+MtMortarName:        db "MT.MORTAR@"
-	db 140,80
+DragonsDenName:      db "DRAGON'S", $1f, "DEN@"
-	dw Route45String
+IcePathName:         db "ICE PATH@"
-
+NotApplicableName:   db "N/A@"
-	db 120,88
+PalletTownName:      db "PALLET TOWN@"
-	dw DarkString
+ViridianCityName:    db "VIRIDIAN", $1f, "CITY@"
-
+PewterCityName:      db "PEWTER CITY@"
-	db 132,104
+CeruleanCityName:    db "CERULEAN", $1f, "CITY@"
-	dw Route46String
+LavenderTownName:    db "LAVENDER", $1f, "TOWN@"
-
+VermilionCityName:   db "VERMILION", $1f, "CITY@"
-	db 156,84
+CeladonCityName:     db "CELADON", $1f, "CITY@"
-	dw SilverCaveString
+SaffronCityName:     db "SAFFRON", $1f, "CITY@"
-
+FuchsiaCityName:     db "FUCHSIA", $1f, "CITY@"
-	db 60,124
+CinnabarIslandName:  db "CINNABAR", $1f, "ISLAND@"
-	dw PalletString
+IndigoPlateauName:   db "INDIGO", $1f, "PLATEAU@"
-
+VictoryRoadName:     db "VICTORY", $1f, "ROAD@"
-	db 60,108
+MtMoonName:          db "MT.MOON@"
-	dw Route1String
+RockTunnelName:      db "ROCK TUNNEL@"
-
+LavRadioTowerName:   db "LAV", $1f, "RADIO TOWER@"
-	db 60,92
+SilphCoName:         db "SILPH CO.@"
-	dw ViridianString
+SafariZoneName:      db "SAFARI ZONE@"
-
+SeafoamIslandsName:  db "SEAFOAM", $1f, "ISLANDS@"
-	db 60,80
+PokemonMansionName:  db "#MON", $1f, "MANSION@"
-	dw Route2String
+CeruleanCaveNane:    db "CERULEAN", $1f, "CAVE@"
-
+Route1Name:          db "ROUTE 1@"
-	db 60,68
+Route2Name:          db "ROUTE 2@"
-	dw PewterString
+Route3Name:          db "ROUTE 3@"
-
+Route4Name:          db "ROUTE 4@"
-	db 72,68
+Route5Name:          db "ROUTE 5@"
-	dw Route3String
+Route6Name:          db "ROUTE 6@"
-
+Route7Name:          db "ROUTE 7@"
-	db 84,68
+Route8Name:          db "ROUTE 8@"
-	dw MoonString
+Route9Name:          db "ROUTE 9@"
-
+Route10Name:         db "ROUTE 10@"
-	db 96,68
+Route11Name:         db "ROUTE 11@"
-	dw Route4String
+Route12Name:         db "ROUTE 12@"
-
+Route13Name:         db "ROUTE 13@"
-	db 108,68
+Route14Name:         db "ROUTE 14@"
-	dw CeruleanString
+Route15Name:         db "ROUTE 15@"
-
+Route16Name:         db "ROUTE 16@"
-	db 108,60
+Route17Name:         db "ROUTE 17@"
-	dw Route24String
+Route18Name:         db "ROUTE 18@"
-
+Route19Name:         db "ROUTE 19@"
-	db 116,52
+Route20Name:         db "ROUTE 20@"
-	dw Route25String
+Route21Name:         db "ROUTE 21@"
-
+Route22Name:         db "ROUTE 22@"
-	db 108,76
+Route23Name:         db "ROUTE 23@"
-	dw Route5String
+Route24Name:         db "ROUTE 24@"
-
+Route25Name:         db "ROUTE 25@"
-	db 116,92
+Route26Name:         db "ROUTE 26@"
-	dw UndergroundString
+Route27Name:         db "ROUTE 27@"
-
+Route28Name:         db "ROUTE 28@"
-	db 108,92
+Route29Name:         db "ROUTE 29@"
-	dw Route6String
+Route30Name:         db "ROUTE 30@"
-
+Route31Name:         db "ROUTE 31@"
-	db 108,100
+Route32Name:         db "ROUTE 32@"
-	dw VermilionString
+Route33Name:         db "ROUTE 33@"
-
+Route34Name:         db "ROUTE 34@"
-	db 96,76
+Route35Name:         db "ROUTE 35@"
-	dw DiglettsCaveString
+Route36Name:         db "ROUTE 36@"
-
+Route37Name:         db "ROUTE 37@"
-	db 96,84
+Route38Name:         db "ROUTE 38@"
-	dw Route7String
+Route39Name:         db "ROUTE 39@"
-
+Route40Name:         db "ROUTE 40@"
-	db 124,84
+Route41Name:         db "ROUTE 41@"
-	dw Route8String
+Route42Name:         db "ROUTE 42@"
-
+Route43Name:         db "ROUTE 43@"
-	db 124,68
+Route44Name:         db "ROUTE 44@"
-	dw Route9String
+Route45Name:         db "ROUTE 45@"
-
+Route46Name:         db "ROUTE 46@"
-	db 140,68
+DarkCaveName:        db "DARK CAVE@"
-	dw TunnelString
+IlexForestName:      db "ILEX", $1f, "FOREST@"
-
+BurnedTowerName:     db "BURNED", $1f, "TOWER@"
-	db 140,72
+FastShipName:        db "FAST SHIP@"
-	dw Route10String
+ViridianForestName:  db "VIRIDIAN", $1f, "FOREST@"
-
+DiglettsCaveName:    db "DIGLETT'S", $1f, "CAVE@"
-	db 140,76
+TohjoFallsName:      db "TOHJO FALLS@"
-	dw PlantString
+UndergroundName:     db "UNDERGROUND@"
-
+BattleTowerName:     db "BATTLE", $1f, "TOWER@"
-	db 140,84
+SpecialMapName:      db "SPECIAL@"
-	dw LavenderString
-
-	db 148,84
-	dw LavTowerString
-
-	db 84,84
-	dw CeladonString
-
-	db 108,84
-	dw SaffronString
-
-	db 124,100
-	dw Route11String
-
-	db 140,96
-	dw Route12String
-
-	db 132,116
-	dw Route13String
-
-	db 124,128
-	dw Route14String
-
-	db 112,132
-	dw Route15String
-
-	db 76,84
-	dw Route16String
-
-	db 76,108
-	dw Route17String
-
-	db 88,132
-	dw Route18String
-
-	db 100,132
-	dw FuchsiaString
-
-	db 100,144
-	dw Route19String
-
-	db 84,148
-	dw Route20String
-
-	db 76,148
-	dw SeafoamString
-
-	db 60,148
-	dw CinnabarString
-
-	db 60,136
-	dw Route21String
-
-	db 44,84
-	dw Route22String
-
-	db 36,68
-	dw RoadString
-
-	db 36,60
-	dw Route23String
-
-	db 36,52
-	dw IndigoString
-
-	db 36,108
-	dw Route26String
-
-	db 28,116
-	dw Route27String
-
-	db 20,116
-	dw FallsString
-
-	db 28,84
-	dw Route28String
-
-	db 148,132
-	dw AquaString
-
-NewBarkString:
-	db "NEW BARK",$1F,"TOWN@"
-CherrygroveString:
-	db "CHERRYGROVE",$1F,"CITY@"
-VioletString:
-	db "VIOLET CITY@"
-AzaleaString:
-	db "AZALEA TOWN@"
-GoldenrodString:
-	db "GOLDENROD",$1F,"CITY@"
-EcruteakString:
-	db "ECRUTEAK",$1F,"CITY@"
-OlivineString:
-	db "OLIVINE",$1F,"CITY@"
-CianwoodString:
-	db "CIANWOOD",$1F,"CITY@"
-MahoganyString:
-	db "MAHOGANY",$1F,"TOWN@"
-BlackthornString:
-	db "BLACKTHORN",$1F,"CITY@"
-LakeString:
-	db "LAKE OF",$1F,"RAGE@"
-SilverCaveString:
-	db "SILVER CAVE@"
-SproutString:
-	db "SPROUT",$1F,"TOWER@"
-RuinsString:
-	db "RUINS",$1F,"OF ALPH@"
-UnionString:
-	db "UNION CAVE@"
-WellString:
-	db "SLOWPOKE",$1F,"WELL@"
-RadioTowerString:
-	db "RADIO TOWER@"
-PlantString:
-	db "POWER PLANT@"
-ParkString:
-	db "NATIONAL",$1F,"PARK@"
-TinString:
-	db "TIN TOWER@"
-LighthouseString:
-	db "LIGHTHOUSE@"
-WhirlString:
-	db "WHIRL",$1F,"ISLANDS@"
-MortarString:
-	db "MT.MORTAR@"
-DenString:
-	db "DRAGON'S",$1F,"DEN@"
-PathString:
-	db "ICE PATH@"
-NotApplicableString:
-	db "N/A@"
-PalletString:
-	db "PALLET TOWN@"
-ViridianString:
-	db "VIRIDIAN",$1F,"CITY@"
-PewterString:
-	db "PEWTER CITY@"
-CeruleanString:
-	db "CERULEAN",$1F,"CITY@"
-LavenderString:
-	db "LAVENDER",$1F,"TOWN@"
-VermilionString:
-	db "VERMILION",$1F,"CITY@"
-CeladonString:
-	db "CELADON",$1F,"CITY@"
-SaffronString:
-	db "SAFFRON",$1F,"CITY@"
-FuchsiaString:
-	db "FUCHSIA",$1F,"CITY@"
-CinnabarString:
-	db "CINNABAR",$1F,"ISLAND@"
-IndigoString:
-	db "INDIGO",$1F,"PLATEAU@"
-RoadString:
-	db "VICTORY",$1F,"ROAD@"
-MoonString:
-	db "MT.MOON@"
-TunnelString:
-	db "ROCK TUNNEL@"
-LavTowerString:
-	db "LAV",$1F,"RADIO TOWER@"
-SilphString:
-	db "SILPH CO.@"
-ZoneString:
-	db "SAFARI ZONE@"
-SeafoamString:
-	db "SEAFOAM",$1F,"ISLANDS@"
-MansionString:
-	db "#MON",$1F,"MANSION@"
-DungeonString:
-	db "CERULEAN",$1F,"CAVE@"
-Route1String:
-	db "ROUTE 1@"
-Route2String:
-	db "ROUTE 2@"
-Route3String:
-	db "ROUTE 3@"
-Route4String:
-	db "ROUTE 4@"
-Route5String:
-	db "ROUTE 5@"
-Route6String:
-	db "ROUTE 6@"
-Route7String:
-	db "ROUTE 7@"
-Route8String:
-	db "ROUTE 8@"
-Route9String:
-	db "ROUTE 9@"
-Route10String:
-	db "ROUTE 10@"
-Route11String:
-	db "ROUTE 11@"
-Route12String:
-	db "ROUTE 12@"
-Route13String:
-	db "ROUTE 13@"
-Route14String:
-	db "ROUTE 14@"
-Route15String:
-	db "ROUTE 15@"
-Route16String:
-	db "ROUTE 16@"
-Route17String:
-	db "ROUTE 17@"
-Route18String:
-	db "ROUTE 18@"
-Route19String:
-	db "ROUTE 19@"
-Route20String:
-	db "ROUTE 20@"
-Route21String:
-	db "ROUTE 21@"
-Route22String:
-	db "ROUTE 22@"
-Route23String:
-	db "ROUTE 23@"
-Route24String:
-	db "ROUTE 24@"
-Route25String:
-	db "ROUTE 25@"
-Route26String:
-	db "ROUTE 26@"
-Route27String:
-	db "ROUTE 27@"
-Route28String:
-	db "ROUTE 28@"
-Route29String:
-	db "ROUTE 29@"
-Route30String:
-	db "ROUTE 30@"
-Route31String:
-	db "ROUTE 31@"
-Route32String:
-	db "ROUTE 32@"
-Route33String:
-	db "ROUTE 33@"
-Route34String:
-	db "ROUTE 34@"
-Route35String:
-	db "ROUTE 35@"
-Route36String:
-	db "ROUTE 36@"
-Route37String:
-	db "ROUTE 37@"
-Route38String:
-	db "ROUTE 38@"
-Route39String:
-	db "ROUTE 39@"
-Route40String:
-	db "ROUTE 40@"
-Route41String:
-	db "ROUTE 41@"
-Route42String:
-	db "ROUTE 42@"
-Route43String:
-	db "ROUTE 43@"
-Route44String:
-	db "ROUTE 44@"
-Route45String:
-	db "ROUTE 45@"
-Route46String:
-	db "ROUTE 46@"
-DarkString:
-	db "DARK CAVE@"
-IlexString:
-	db "ILEX",$1F,"FOREST@"
-BurnedTowerString:
-	db "BURNED",$1F,"TOWER@"
-AquaString:
-	db "FAST SHIP@"
-ViridianForestString:
-	db "VIRIDIAN",$1F,"FOREST@"
-DiglettsCaveString:
-	db "DIGLETT'S",$1F,"CAVE@"
-FallsString:
-	db "TOHJO FALLS@"
-UndergroundString:
-	db "UNDERGROUND@"
-BattleTowerString:
-	db "BATTLE",$1F,"TOWER@"
-SpecialMapString:
-	db "SPECIAL@"
 

main.asm

@@ -83070,35 +83070,35 @@ GetFlyPermission: ; 91c50
 ; 91c5e
 
 Flypoints: ; 91c5e
-; location id, blackout id
+; landmark, blackout point
 
 ; Johto
-	db 01, 14 ; New Bark Town
+	db NEW_BARK_TOWN,    14
-	db 03, 15 ; Cherrygrove City
+	db CHERRYGROVE_CITY, 15
-	db 06, 16 ; Violet City
+	db VIOLET_CITY,      16
-	db 12, 18 ; Azalea Town
+	db AZALEA_TOWN,      18
-	db 16, 20 ; Goldenrod City
+	db GOLDENROD_CITY,   20
-	db 22, 22 ; Ecruteak City
+	db ECRUTEAK_CITY,    22
-	db 27, 21 ; Olivine City
+	db OLIVINE_CITY,     21
-	db 33, 19 ; Cianwood City
+	db CIANWOOD_CITY,    19
-	db 36, 23 ; Mahogany Town
+	db MAHOGANY_TOWN,    23
-	db 38, 24 ; Lake of Rage
+	db LAKE_OF_RAGE,     24
-	db 41, 25 ; Blackthorn City
+	db BLACKTHORN_CITY,  25
-	db 46, 26 ; Silver Cave
+	db SILVER_CAVE,      26
 
 ; Kanto
-	db 47, 02 ; Pallet Town
+	db PALLET_TOWN,      02
-	db 49, 03 ; Viridian City
+	db VIRIDIAN_CITY,    03
-	db 51, 04 ; Pewter City
+	db PEWTER_CITY,      04
-	db 55, 05 ; Cerulean City
+	db CERULEAN_CITY,    05
-	db 61, 07 ; Vermilion City
+	db VERMILION_CITY,   07
-	db 66, 06 ; Rock Tunnel
+	db ROCK_TUNNEL,      06
-	db 69, 08 ; Lavender Town
+	db LAVENDER_TOWN,    08
-	db 71, 10 ; Celadon City
+	db CELADON_CITY,     10
-	db 72, 09 ; Saffron City
+	db SAFFRON_CITY,     09
-	db 81, 11 ; Fuchsia City
+	db FUCHSIA_CITY,     11
-	db 85, 12 ; Cinnabar Island
+	db CINNABAR_ISLAND,  12
-	db 90, 13 ; Indigo Plateau
+	db INDIGO_PLATEAU,   13
 
 ; 91c8e