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/route21.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/route21.asm')
| -rwxr-xr-x | data/mapHeaders/route21.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapHeaders/route21.asm b/data/mapHeaders/route21.asm index f3160814..7f3e0a2f 100755 --- a/data/mapHeaders/route21.asm +++ b/data/mapHeaders/route21.asm @@ -3,6 +3,6 @@ Route21_h: ; 0x54fff to 0x55021 (34 bytes) (id=32) db ROUTE_21_HEIGHT, ROUTE_21_WIDTH ; dimensions (y, x) dw Route21Blocks, Route21TextPointers, Route21Script ; blocks, texts, scripts db NORTH | SOUTH ; connections - NORTH_MAP_CONNECTION PALLET_TOWN, PALLET_TOWN_WIDTH, PALLET_TOWN_HEIGHT, 0, 0, PALLET_TOWN_WIDTH, PalletTownBlocks - SOUTH_MAP_CONNECTION CINNABAR_ISLAND, CINNABAR_ISLAND_WIDTH, 0, 0, CINNABAR_ISLAND_WIDTH, CinnabarIslandBlocks, ROUTE_21_WIDTH, ROUTE_21_HEIGHT + NORTH_MAP_CONNECTION ROUTE_21, PALLET_TOWN, 0, 0, PalletTownBlocks + SOUTH_MAP_CONNECTION ROUTE_21, CINNABAR_ISLAND, 0, 0, CinnabarIslandBlocks, 1 dw Route21Object ; objects |