ref: f386dea5d8cb816f3cbc941e81e8acdaae710a99
parent: b250e788bd343d40014100bcca32299093745e98
parent: 9b6f57832eac84e602d38179651027bae450b54f
author: luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>
date: Mon Nov 5 07:55:11 EST 2018
Merge pull request #190 from Pokeglitch/master Fixed some map header files
--- a/data/mapHeaders/pewtercity.asm
+++ b/data/mapHeaders/pewtercity.asm
@@ -6,5 +6,3 @@
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
--- 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
--- a/data/mapHeaders/viridianhouse.asm
+++ b/data/mapHeaders/viridianhouse.asm
@@ -4,5 +4,3 @@
dw ViridianHouseBlocks, ViridianHouseTextPointers, ViridianHouseScript ; blocks, texts, scripts
db 0 ; connections
dw ViridianHouseObject ; objects
-
- db $0
--- a/main.asm
+++ b/main.asm
@@ -275,6 +275,7 @@
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 "data/mapObjects/school.asm"
INCLUDE "data/mapHeaders/viridianhouse.asm"
+ db $0
INCLUDE "scripts/viridianhouse.asm"
INCLUDE "data/mapObjects/viridianhouse.asm"