This commit is contained in:
pikalaxalt 2016-05-27 19:18:01 -04:00
parent 78c0b78c55
commit d4a0fe908f
4 changed files with 11 additions and 8 deletions

View File

@ -3,13 +3,13 @@ Route16Object: ; 0x58afc (size=136)
db $9 ; warps
db $a, $11, $0, ROUTE_16_GATE_1F
db $b, $11, $1, ROUTE_16_GATE_1F
db $b, $11, $0, ROUTE_16_GATE_1F
db $a, $18, $2, ROUTE_16_GATE_1F
db $b, $18, $3, ROUTE_16_GATE_1F
db $b, $18, $2, ROUTE_16_GATE_1F
db $4, $11, $4, ROUTE_16_GATE_1F
db $5, $11, $5, ROUTE_16_GATE_1F
db $5, $11, $4, ROUTE_16_GATE_1F
db $4, $18, $6, ROUTE_16_GATE_1F
db $5, $18, $7, ROUTE_16_GATE_1F
db $5, $18, $6, ROUTE_16_GATE_1F
db $5, $7, $0, ROUTE_16_HOUSE
db $2 ; signs

View File

@ -27,7 +27,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db $15 ; db BANK(Route13_h) ; ROUTE_13
db $15 ; db BANK(Route14_h) ; ROUTE_14
db $16 ; db BANK(Route15_h) ; ROUTE_15
db $16 ; db BANK(Route16_h) ; ROUTE_16
db BANK(Route16_h) ; ROUTE_16
db BANK(Route17_h) ; ROUTE_17
db BANK(Route18_h) ; ROUTE_18
db BANK(Route19_h) ; ROUTE_19

View File

@ -27,7 +27,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw $4814 ; dw Route13_h
dw $49a1 ; dw Route14_h
dw $492c ; dw Route15_h
dw $4ada ; dw Route16_h
dw Route16_h
dw Route17_h
dw Route18_h
dw Route19_h

View File

@ -903,7 +903,9 @@ INCBIN "maps/route11.blk"
dr $5866d,$589cc
Route15Blocks:
INCBIN "maps/route15.blk"
dr $58ada,$58b84
INCLUDE "data/mapHeaders/route16.asm"
INCLUDE "data/mapObjects/route16.asm"
Route16Blocks: ; 58b84
INCBIN "maps/route16.blk"
@ -920,7 +922,8 @@ INCLUDE "engine/status_ailments.asm"
INCLUDE "engine/overworld/oaks_aide.asm"
INCLUDE "scripts/route6.asm"
dr $59052,$59963
dr $59052,$597cf
INCLUDE "scripts/route16.asm"
INCLUDE "scripts/route18.asm"
dr $59a00,$5a53a