Merge pull request #190 from Pokeglitch/master

Fixed some map header files

4 files changed, 3 insertions, 5 deletions

diff --git a/data/mapHeaders/pewtercity.asm b/data/mapHeaders/pewtercity.asm
index ff5bd7b9..88faaacc 100755
--- a/data/mapHeaders/pewtercity.asm
+++ b/data/mapHeaders/pewtercity.asm
@@ -6,5 +6,3 @@ PewterCity_h:
 	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
diff --git a/data/mapHeaders/route2.asm b/data/mapHeaders/route2.asm
index 2476d0a5..550cd702 100755
--- a/data/mapHeaders/route2.asm
+++ b/data/mapHeaders/route2.asm
@@ -1,5 +1,5 @@
 Route2_h:
-	db 00 ; tileset
+	db OVERWORLD ; tileset
 	db ROUTE_2_HEIGHT, ROUTE_2_WIDTH ; dimensions (y, x)
 	dw Route2Blocks, Route2TextPointers, Route2Script ; blocks, texts, scripts
 	db NORTH | SOUTH ; connections
diff --git a/data/mapHeaders/viridianhouse.asm b/data/mapHeaders/viridianhouse.asm
index a80953f9..9b2c73de 100755
--- a/data/mapHeaders/viridianhouse.asm
+++ b/data/mapHeaders/viridianhouse.asm
@@ -4,5 +4,3 @@ ViridianHouse_h:
 	dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
 	db 0 ; connections
 	dw ViridianHouseObject ; objects
-
-	db $0
diff --git a/main.asm b/main.asm
index 065700da..72cd7210 100755
--- a/main.asm
+++ b/main.asm
@@ -275,6 +275,7 @@ INCLUDE "data/mapObjects/viridiancity.asm"
 ViridianCityBlocks: INCBIN "maps/viridiancity.blk"
 
 INCLUDE "data/mapHeaders/pewtercity.asm"
+	db $0
 INCLUDE "data/mapObjects/pewtercity.asm"
 PewterCityBlocks: INCBIN "maps/pewtercity.blk"
 
@@ -394,6 +395,7 @@ INCLUDE "scripts/school.asm"
 INCLUDE "data/mapObjects/school.asm"
 
 INCLUDE "data/mapHeaders/viridianhouse.asm"
+	db $0
 INCLUDE "scripts/viridianhouse.asm"
 INCLUDE "data/mapObjects/viridianhouse.asm"