summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:29:01 -0400
committerpikalaxalt <PikalaxALT@gmail.com>2016-05-27 19:29:01 -0400
commit02fc3889b255aece1c02a673f7239a03e7a2396f (patch)
treeb817480cfebd32f7ddb5809c3feb95eab3d72ca0 /data
parentd4a0fe908ffae83fd0be6f820df0780f727f2e4b (diff)
Route 15
Diffstat (limited to 'data')
-rwxr-xr-xdata/mapObjects/route15.asm4
-rw-r--r--data/map_header_banks.asm2
-rw-r--r--data/map_header_pointers.asm2
3 files changed, 4 insertions, 4 deletions
diff --git a/data/mapObjects/route15.asm b/data/mapObjects/route15.asm
index e0d19e5c..bd6283b0 100755
--- a/data/mapObjects/route15.asm
+++ b/data/mapObjects/route15.asm
@@ -3,9 +3,9 @@ Route15Object: ; 0x5894e (size=126)
db $4 ; warps
db $8, $7, $0, ROUTE_15_GATE_1F
- db $9, $7, $1, ROUTE_15_GATE_1F
+ db $9, $7, $0, ROUTE_15_GATE_1F
db $8, $e, $2, ROUTE_15_GATE_1F
- db $9, $e, $3, ROUTE_15_GATE_1F
+ db $9, $e, $2, ROUTE_15_GATE_1F
db $1 ; signs
db $9, $27, $c ; Route15Text12
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index b47d5d8c..69852516 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -26,7 +26,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
db $16 ; db BANK(Route12_h) ; ROUTE_12
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 BANK(Route15_h) ; ROUTE_15
db BANK(Route16_h) ; ROUTE_16
db BANK(Route17_h) ; ROUTE_17
db BANK(Route18_h) ; ROUTE_18
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 413616d9..ff68b4fb 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -26,7 +26,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
dw $466d ; dw Route12_h
dw $4814 ; dw Route13_h
dw $49a1 ; dw Route14_h
- dw $492c ; dw Route15_h
+ dw Route15_h
dw Route16_h
dw Route17_h
dw Route18_h