diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 63802c23..9b66f8c9 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -4,7 +4,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY db BANK(CeruleanCity_h) ; CERULEAN_CITY - db $11 ; db BANK(LavenderTown_h) ; LAVENDER_TOWN + db BANK(LavenderTown_h) ; LAVENDER_TOWN db BANK(VermilionCity_h) ; VERMILION_CITY db BANK(CeladonCity_h) ; CELADON_CITY db BANK(FuchsiaCity_h) ; FUCHSIA_CITY diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index ad526ba8..03aa24f9 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -4,7 +4,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw ViridianCity_h dw PewterCity_h dw CeruleanCity_h - dw $4000 ; dw LavenderTown_h + dw LavenderTown_h dw VermilionCity_h dw CeladonCity_h dw FuchsiaCity_h @@ -679,10 +679,14 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$44085 +INCLUDE "data/mapHeaders/lavendertown.asm" +INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" - dr $440df,$44169 + dr $440df,$4410b + +INCLUDE "scripts/lavendertown.asm" + ; dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" @@ -912,7 +916,9 @@ INCBIN "maps/route6.blk" Route8Blocks: ; 581c6 INCBIN "maps/route8.blk" - dr $582d4,$584be + dr $582d4,$58356 +Route10Blocks: +INCBIN "maps/route10.blk" INCLUDE "data/mapHeaders/route11.asm" INCLUDE "data/mapObjects/route11.asm" |