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 /data/maps/flypoints.asm | |
| parent | c87f8512a4d736a847dbc69e09c781a29eeaa638 (diff) | |
| parent | ad50e94b5029ce5a7d45fd3576f8f017eae6449c (diff) | |
Merge pull request #696 from Rangi42/master
Rename LANDMARK_* constants, and refactor flypoints
Diffstat (limited to 'data/maps/flypoints.asm')
| -rw-r--r-- | data/maps/flypoints.asm | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/data/maps/flypoints.asm b/data/maps/flypoints.asm index 007b59073..e3578daaa 100644 --- a/data/maps/flypoints.asm +++ b/data/maps/flypoints.asm @@ -1,37 +1,30 @@ -flypoint: MACRO - const FLY_\1 - db \2, SPAWN_\1 -ENDM - Flypoints: -; landmark, spawn point - const_def +; entries correspond to FLY_* constants ; Johto - flypoint NEW_BARK, NEW_BARK_TOWN - flypoint CHERRYGROVE, CHERRYGROVE_CITY - flypoint VIOLET, VIOLET_CITY - flypoint AZALEA, AZALEA_TOWN - flypoint GOLDENROD, GOLDENROD_CITY - flypoint ECRUTEAK, ECRUTEAK_CITY - flypoint OLIVINE, OLIVINE_CITY - flypoint CIANWOOD, CIANWOOD_CITY - flypoint MAHOGANY, MAHOGANY_TOWN - flypoint LAKE_OF_RAGE, LAKE_OF_RAGE - flypoint BLACKTHORN, BLACKTHORN_CITY - flypoint MT_SILVER, SILVER_CAVE - + ; landmark, spawn point + db LANDMARK_NEW_BARK_TOWN, SPAWN_NEW_BARK + db LANDMARK_CHERRYGROVE_CITY, SPAWN_CHERRYGROVE + db LANDMARK_VIOLET_CITY, SPAWN_VIOLET + db LANDMARK_AZALEA_TOWN, SPAWN_AZALEA + db LANDMARK_GOLDENROD_CITY, SPAWN_GOLDENROD + db LANDMARK_ECRUTEAK_CITY, SPAWN_ECRUTEAK + db LANDMARK_OLIVINE_CITY, SPAWN_OLIVINE + db LANDMARK_CIANWOOD_CITY, SPAWN_CIANWOOD + db LANDMARK_MAHOGANY_TOWN, SPAWN_MAHOGANY + db LANDMARK_LAKE_OF_RAGE, SPAWN_LAKE_OF_RAGE + db LANDMARK_BLACKTHORN_CITY, SPAWN_BLACKTHORN + db LANDMARK_SILVER_CAVE, SPAWN_MT_SILVER ; Kanto -KANTO_FLYPOINT EQU const_value - flypoint PALLET, PALLET_TOWN - flypoint VIRIDIAN, VIRIDIAN_CITY - flypoint PEWTER, PEWTER_CITY - flypoint CERULEAN, CERULEAN_CITY - flypoint VERMILION, VERMILION_CITY - flypoint ROCK_TUNNEL, ROCK_TUNNEL - flypoint LAVENDER, LAVENDER_TOWN - flypoint CELADON, CELADON_CITY - flypoint SAFFRON, SAFFRON_CITY - flypoint FUCHSIA, FUCHSIA_CITY - flypoint CINNABAR, CINNABAR_ISLAND - flypoint INDIGO, INDIGO_PLATEAU + db LANDMARK_PALLET_TOWN, SPAWN_PALLET + db LANDMARK_VIRIDIAN_CITY, SPAWN_VIRIDIAN + db LANDMARK_PEWTER_CITY, SPAWN_PEWTER + db LANDMARK_CERULEAN_CITY, SPAWN_CERULEAN + db LANDMARK_VERMILION_CITY, SPAWN_VERMILION + db LANDMARK_ROCK_TUNNEL, SPAWN_ROCK_TUNNEL + db LANDMARK_LAVENDER_TOWN, SPAWN_LAVENDER + db LANDMARK_CELADON_CITY, SPAWN_CELADON + db LANDMARK_SAFFRON_CITY, SPAWN_SAFFRON + db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA + db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR + db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO db -1 |