aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapHeaders/CeladonCity.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/CeladonCity.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/CeladonCity.asm')
-rwxr-xr-xdata/mapHeaders/CeladonCity.asm15
1 files changed, 5 insertions, 10 deletions
diff --git a/data/mapHeaders/CeladonCity.asm b/data/mapHeaders/CeladonCity.asm
index f2ce1831..6faa6f48 100755
--- a/data/mapHeaders/CeladonCity.asm
+++ b/data/mapHeaders/CeladonCity.asm
@@ -1,10 +1,5 @@
-CeladonCity_h::
- db OVERWORLD ; tileset
- db CELADON_CITY_HEIGHT, CELADON_CITY_WIDTH ; dimensions (y, x)
- dw CeladonCity_Blocks ; blocks
- dw CeladonCity_TextPointers ; texts
- dw CeladonCity_Script ; scripts
- db WEST | EAST ; connections
- WEST_MAP_CONNECTION CELADON_CITY, ROUTE_16, 4, 0, Route16_Blocks
- EAST_MAP_CONNECTION CELADON_CITY, ROUTE_7, 4, 0, Route7_Blocks, 1
- dw CeladonCity_Object ; objects
+
+ map_header CeladonCity, CELADON_CITY, OVERWORLD, WEST | EAST
+ connection west, Route16, ROUTE_16, 4
+ connection east, Route7, ROUTE_7, 4
+ end_map_header