diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-18 15:20:07 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-18 15:20:07 -0500 |
| commit | 0ad1153f165023220c7c2e3bb187ccc5d6ca75bd (patch) | |
| tree | 3bf5ac6989cd90c87384ba00b8387e3398e2f37d /data/mapHeaders/route2.asm | |
| parent | Merge pull request #104 from YamaArashi/master (diff) | |
| download | pokeyellow-0ad1153f165023220c7c2e3bb187ccc5d6ca75bd.tar.gz pokeyellow-0ad1153f165023220c7c2e3bb187ccc5d6ca75bd.tar.xz pokeyellow-0ad1153f165023220c7c2e3bb187ccc5d6ca75bd.zip | |
Simplify map connections
let the macros calculate the connection strip length instead of passing it as an arg
don't pass map dimensions since they can be inferred from map ids
todo: figure out why certain south and east connections get an extra 3
added to the connection strip length
Diffstat (limited to 'data/mapHeaders/route2.asm')
| -rwxr-xr-x | data/mapHeaders/route2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm index 1d720a6e..564f4a58 100755 --- a/data/mapHeaders/route2.asm +++ b/data/mapHeaders/route2.asm @@ -3,6 +3,6 @@ Route2_h: ; 54000 (15:4000) db ROUTE_2_HEIGHT,ROUTE_2_WIDTH ;Height,Width blocks (1 block = 4x4 tiles) dw Route2Blocks, Route2TextPointers, Route2Script db NORTH | SOUTH ;Connection Byte - NORTH_MAP_CONNECTION PEWTER_CITY, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT, -3, 2, ROUTE_2_WIDTH + 6, PewterCityBlocks - SOUTH_MAP_CONNECTION VIRIDIAN_CITY, VIRIDIAN_CITY_WIDTH, -3, 2, ROUTE_2_WIDTH + 6, ViridianCityBlocks, ROUTE_2_WIDTH, ROUTE_2_HEIGHT + NORTH_MAP_CONNECTION ROUTE_2, PEWTER_CITY, -3, 2, PewterCityBlocks + SOUTH_MAP_CONNECTION ROUTE_2, VIRIDIAN_CITY, -3, 2, ViridianCityBlocks, 1 dw Route2Object ;Object Data Pointer |