aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapHeaders/CeruleanCity.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 15:25:43 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-03 15:49:12 -0400
commit710c3275fc6a4caeeff3ad89c029a05984cf8388 (patch)
tree1e2b6449134ef7766ee110af7f7382d9e1c04952 /data/mapHeaders/CeruleanCity.asm
parentSplit up engine/events/hidden_object_functions (diff)
downloadpokeyellow-710c3275fc6a4caeeff3ad89c029a05984cf8388.tar.gz
pokeyellow-710c3275fc6a4caeeff3ad89c029a05984cf8388.tar.xz
pokeyellow-710c3275fc6a4caeeff3ad89c029a05984cf8388.zip
Simplify map connections
To do: Polished Map support for detecting the tileset
Diffstat (limited to 'data/mapHeaders/CeruleanCity.asm')
-rwxr-xr-xdata/mapHeaders/CeruleanCity.asm19
1 files changed, 7 insertions, 12 deletions
diff --git a/data/mapHeaders/CeruleanCity.asm b/data/mapHeaders/CeruleanCity.asm
index 23206c0a..c925713c 100755
--- a/data/mapHeaders/CeruleanCity.asm
+++ b/data/mapHeaders/CeruleanCity.asm
@@ -1,12 +1,7 @@
-CeruleanCity_h::
- db OVERWORLD ; tileset
- db CERULEAN_CITY_HEIGHT, CERULEAN_CITY_WIDTH ; dimensions (y, x)
- dw CeruleanCity_Blocks ; blocks
- dw CeruleanCity_TextPointers ; texts
- dw CeruleanCity_Script ; scripts
- db NORTH | SOUTH | WEST | EAST ; connections
- NORTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_24, 5, 0, Route24_Blocks
- SOUTH_MAP_CONNECTION CERULEAN_CITY, ROUTE_5, 5, 0, Route5_Blocks, 1
- WEST_MAP_CONNECTION CERULEAN_CITY, ROUTE_4, 4, 0, Route4_Blocks
- EAST_MAP_CONNECTION CERULEAN_CITY, ROUTE_9, 4, 0, Route9_Blocks
- dw CeruleanCity_Object ; objects
+
+ map_header CeruleanCity, CERULEAN_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST
+ connection north, Route24, ROUTE_24, 5
+ connection south, Route5, ROUTE_5, 5
+ connection west, Route4, ROUTE_4, 4
+ connection east, Route9, ROUTE_9, 4
+ end_map_header