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/route18.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/route18.asm')
| -rwxr-xr-x | data/mapHeaders/route18.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapHeaders/route18.asm b/data/mapHeaders/route18.asm index c8e988f1..8fb1b3bc 100755 --- a/data/mapHeaders/route18.asm +++ b/data/mapHeaders/route18.asm @@ -3,6 +3,6 @@ Route18_h: ; 0x58c38 to 0x58c5a (34 bytes) (id=29) db ROUTE_18_HEIGHT, ROUTE_18_WIDTH ; dimensions (y, x) dw Route18Blocks, Route18TextPointers, Route18Script ; blocks, texts, scripts db NORTH | EAST ; connections - NORTH_MAP_CONNECTION ROUTE_17, ROUTE_17_WIDTH, ROUTE_17_HEIGHT, 0, 0, ROUTE_17_WIDTH, Route17Blocks - EAST_MAP_CONNECTION FUCHSIA_CITY, FUCHSIA_CITY_WIDTH, -3, 1, ROUTE_18_HEIGHT + 6, FuchsiaCityBlocks, ROUTE_18_WIDTH + NORTH_MAP_CONNECTION ROUTE_18, ROUTE_17, 0, 0, Route17Blocks + EAST_MAP_CONNECTION ROUTE_18, FUCHSIA_CITY, -3, 1, FuchsiaCityBlocks, 1 dw Route18Object ; objects |