summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:39:40 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:39:40 -0400
commit807323ed1cc2231d3df93edfaab22dde5de191ea (patch)
treeb0ffd26574a5b0796823c2e4a901e976fcd54cb9 /data
parentb580c4c90f243df34042803260161459a1bf4e6e (diff)
Route 12
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/route12.asm2
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 3 insertions, 3 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