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/route20.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/route20.asm')
| -rwxr-xr-x | data/mapHeaders/route20.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapHeaders/route20.asm b/data/mapHeaders/route20.asm index 71c6415e..d4f645d8 100755 --- a/data/mapHeaders/route20.asm +++ b/data/mapHeaders/route20.asm @@ -3,6 +3,6 @@ Route20_h: ; 0x500f1 to 0x50113 (34 bytes) (id=31) db ROUTE_20_HEIGHT, ROUTE_20_WIDTH ; dimensions (y, x) dw Route20Blocks, Route20TextPointers, Route20Script ; blocks, texts, scripts db WEST | EAST ; connections - WEST_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_HEIGHT, CinnabarIslandBlocks, ROUTE_20_WIDTH - EAST_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, -3, 15, ROUTE_20_HEIGHT + 3, Route19Blocks, ROUTE_20_WIDTH + WEST_MAP_CONNECTION ROUTE_20, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks + EAST_MAP_CONNECTION ROUTE_20, ROUTE_19, -3, 15, Route19Blocks dw Route20Object ; objects |