diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:39:40 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-27 19:39:40 -0400 |
| commit | 807323ed1cc2231d3df93edfaab22dde5de191ea (patch) | |
| tree | b0ffd26574a5b0796823c2e4a901e976fcd54cb9 | |
| parent | b580c4c90f243df34042803260161459a1bf4e6e (diff) | |
Route 12
| -rwxr-xr-x | data/mapObjects/route12.asm | 2 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 11 |
4 files changed, 11 insertions, 6 deletions
diff --git a/data/mapObjects/route12.asm b/data/mapObjects/route12.asm index 8ed43ff4..783fd49b 100755 --- a/data/mapObjects/route12.asm +++ b/data/mapObjects/route12.asm @@ -3,7 +3,7 @@ Route12Object: ; 0x5869a (size=118) db $4 ; warps db $f, $a, $0, ROUTE_12_GATE_1F - db $f, $b, $1, ROUTE_12_GATE_1F + db $f, $b, $0, ROUTE_12_GATE_1F db $15, $a, $2, ROUTE_12_GATE_1F db $4d, $b, $0, ROUTE_12_HOUSE diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index b4e65ab5..429cc87d 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -23,7 +23,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $15 ; db BANK(Route9_h) ; ROUTE_9 db $16 ; db BANK(Route10_h) ; ROUTE_10 db $16 ; db BANK(Route11_h) ; ROUTE_11 - db $16 ; db BANK(Route12_h) ; ROUTE_12 + db BANK(Route12_h) ; ROUTE_12 db BANK(Route13_h) ; ROUTE_13 db BANK(Route14_h) ; ROUTE_14 db BANK(Route15_h) ; ROUTE_15 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index be5c8127..9334f585 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -23,7 +23,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $468e ; dw Route9_h dw $42d4 ; dw Route10_h dw $44be ; dw Route11_h - dw $466d ; dw Route12_h + dw Route12_h dw Route13_h dw Route14_h dw Route15_h @@ -679,7 +679,10 @@ INCLUDE "engine/menu/options.asm" SECTION "bank11",ROMX,BANK[$11] - dr $44000,$44169 + dr $44000,$44085 +LavenderTownBlocks: +INCBIN "maps/lavendertown.blk" + dr $440df,$44169 INCLUDE "engine/pokedex_rating.asm" @@ -913,7 +916,8 @@ INCBIN "maps/route8.blk" Route11Blocks: ; 5854f INCBIN "maps/route11.blk" - dr $5866d,$58710 +INCLUDE "data/mapHeaders/route12.asm" +INCLUDE "data/mapObjects/route12.asm" Route12Blocks: INCBIN "maps/route12.blk" @@ -940,7 +944,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" INCLUDE "scripts/route6.asm" - dr $59052,$5964a + dr $59052,$5948f +INCLUDE "scripts/route12.asm" INCLUDE "scripts/route15.asm" INCLUDE "scripts/route16.asm" INCLUDE "scripts/route18.asm" |