aboutsummaryrefslogtreecommitdiffstats
path: root/data/mapHeaders/pewtercity.asm
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2015-07-18 15:20:07 -0500
committerdannye <corrnondacqb@yahoo.com>2015-07-18 15:20:07 -0500
commit0ad1153f165023220c7c2e3bb187ccc5d6ca75bd (patch)
tree3bf5ac6989cd90c87384ba00b8387e3398e2f37d /data/mapHeaders/pewtercity.asm
parentMerge pull request #104 from YamaArashi/master (diff)
downloadpokeyellow-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/pewtercity.asm')
-rwxr-xr-xdata/mapHeaders/pewtercity.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm
index b5e68adc..69c5d978 100755
--- a/data/mapHeaders/pewtercity.asm
+++ b/data/mapHeaders/pewtercity.asm
@@ -3,8 +3,8 @@ PewterCity_h: ; 0x18554 to 0x18576 (34 bytes) (bank=6) (id=2)
db PEWTER_CITY_HEIGHT, PEWTER_CITY_WIDTH ; dimensions (y, x)
dw PewterCityBlocks, PewterCityTextPointers, PewterCityScript ; blocks, texts, scripts
db SOUTH | EAST ; connections
- SOUTH_MAP_CONNECTION ROUTE_2, ROUTE_2_WIDTH, 5, 0, ROUTE_2_WIDTH, Route2Blocks, PEWTER_CITY_WIDTH, PEWTER_CITY_HEIGHT
- EAST_MAP_CONNECTION ROUTE_3, ROUTE_3_WIDTH, 4, 0, ROUTE_3_HEIGHT, Route3Blocks, PEWTER_CITY_WIDTH
+ SOUTH_MAP_CONNECTION PEWTER_CITY, ROUTE_2, 5, 0, Route2Blocks
+ EAST_MAP_CONNECTION PEWTER_CITY, ROUTE_3, 4, 0, Route3Blocks
dw PewterCityObject ; objects
db $0