diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 15:25:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-03 15:49:12 -0400 |
| commit | 710c3275fc6a4caeeff3ad89c029a05984cf8388 (patch) | |
| tree | 1e2b6449134ef7766ee110af7f7382d9e1c04952 /data/mapHeaders/SaffronCity.asm | |
| parent | Split up engine/events/hidden_object_functions (diff) | |
| download | pokeyellow-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/SaffronCity.asm')
| -rwxr-xr-x | data/mapHeaders/SaffronCity.asm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/data/mapHeaders/SaffronCity.asm b/data/mapHeaders/SaffronCity.asm index c7a498de..ee1f71e4 100755 --- a/data/mapHeaders/SaffronCity.asm +++ b/data/mapHeaders/SaffronCity.asm @@ -1,12 +1,7 @@ -SaffronCity_h:: - db OVERWORLD ; tileset - db SAFFRON_CITY_HEIGHT, SAFFRON_CITY_WIDTH ; dimensions (y, x) - dw SaffronCity_Blocks ; blocks - dw SaffronCity_TextPointers ; texts - dw SaffronCity_Script ; scripts - db NORTH | SOUTH | WEST | EAST ; connections - NORTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_5, 5, 0, Route5_Blocks - SOUTH_MAP_CONNECTION SAFFRON_CITY, ROUTE_6, 5, 0, Route6_Blocks, 1 - WEST_MAP_CONNECTION SAFFRON_CITY, ROUTE_7, 4, 0, Route7_Blocks - EAST_MAP_CONNECTION SAFFRON_CITY, ROUTE_8, 4, 0, Route8_Blocks - dw SaffronCity_Object ; objects + + map_header SaffronCity, SAFFRON_CITY, OVERWORLD, NORTH | SOUTH | WEST | EAST + connection north, Route5, ROUTE_5, 5 + connection south, Route6, ROUTE_6, 5 + connection west, Route7, ROUTE_7, 4 + connection east, Route8, ROUTE_8, 4 + end_map_header |