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/fuchsiacity.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/fuchsiacity.asm')
| -rwxr-xr-x | data/mapHeaders/fuchsiacity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/mapHeaders/fuchsiacity.asm b/data/mapHeaders/fuchsiacity.asm index 7a3e4f66..998f7bb4 100755 --- a/data/mapHeaders/fuchsiacity.asm +++ b/data/mapHeaders/fuchsiacity.asm @@ -3,7 +3,7 @@ FuchsiaCity_h: ; 0x18ba7 to 0x18bd4 (45 bytes) (bank=6) (id=7) db FUCHSIA_CITY_HEIGHT, FUCHSIA_CITY_WIDTH ; dimensions (y, x) dw FuchsiaCityBlocks, FuchsiaCityTextPointers, FuchsiaCityScript ; blocks, texts, scripts db SOUTH | WEST | EAST ; connections - SOUTH_MAP_CONNECTION ROUTE_19, ROUTE_19_WIDTH, 5, 0, ROUTE_19_WIDTH, Route19Blocks, FUCHSIA_CITY_WIDTH, FUCHSIA_CITY_HEIGHT - WEST_MAP_CONNECTION ROUTE_18, ROUTE_18_WIDTH, 4, 0, ROUTE_18_HEIGHT, Route18Blocks, FUCHSIA_CITY_WIDTH - EAST_MAP_CONNECTION ROUTE_15, ROUTE_15_WIDTH, 4, 0, ROUTE_15_HEIGHT, Route15Blocks, FUCHSIA_CITY_WIDTH + SOUTH_MAP_CONNECTION FUCHSIA_CITY, ROUTE_19, 5, 0, Route19Blocks + WEST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_18, 4, 0, Route18Blocks + EAST_MAP_CONNECTION FUCHSIA_CITY, ROUTE_15, 4, 0, Route15Blocks dw FuchsiaCityObject ; objects |