diff options
author | Pokeglitch <pokeglitchx@gmail.com> | 2018-07-28 15:51:17 -0400 |
---|---|---|
committer | Pokeglitch <pokeglitchx@gmail.com> | 2018-07-28 15:51:17 -0400 |
commit | ae2c1036ea1fa42d437f6291da673367b1f0ea4c (patch) | |
tree | 182286969197b469b4fccbc20fa5d96194c2de2a | |
parent | c9da8510c88524c3c50e33f41ea1881594898d36 (diff) |
Fixed some map header files
-rwxr-xr-x | data/mapHeaders/pewtercity.asm | 2 | ||||
-rwxr-xr-x | data/mapHeaders/route2.asm | 2 | ||||
-rwxr-xr-x | main.asm | 1 |
3 files changed, 2 insertions, 3 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 @@ -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" |