diff options
| author | luckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com> | 2018-11-05 12:55:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 12:55:11 -0500 |
| commit | f386dea5d8cb816f3cbc941e81e8acdaae710a99 (patch) | |
| tree | ec7bcfdc29df28728b4ed27da125dbffd8f2f9c1 /main.asm | |
| parent | Change Discord link. (diff) | |
| parent | Another map header fix (diff) | |
| download | pokeyellow-f386dea5d8cb816f3cbc941e81e8acdaae710a99.tar.gz pokeyellow-f386dea5d8cb816f3cbc941e81e8acdaae710a99.tar.xz pokeyellow-f386dea5d8cb816f3cbc941e81e8acdaae710a99.zip | |
Merge pull request #190 from Pokeglitch/master
Fixed some map header files
Diffstat (limited to 'main.asm')
| -rwxr-xr-x | main.asm | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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" |