Route 18 scripts

5 files changed, 16 insertions, 7 deletions

diff --git a/data/mapObjects/route18.asm b/data/mapObjects/route18.asm
index 88547941..40b50b08 100755
--- a/data/mapObjects/route18.asm
+++ b/data/mapObjects/route18.asm
@@ -3,9 +3,9 @@ Route18Object: ; 0x58c5a (size=66)
 
 	db $4 ; warps
 	db $8, $21, $0, ROUTE_18_GATE_1F
-	db $9, $21, $1, ROUTE_18_GATE_1F
+	db $9, $21, $0, ROUTE_18_GATE_1F
 	db $8, $28, $2, ROUTE_18_GATE_1F
-	db $9, $28, $3, ROUTE_18_GATE_1F
+	db $9, $28, $2, ROUTE_18_GATE_1F
 
 	db $2 ; signs
 	db $7, $2b, $4 ; Route18Text4
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index cf1ca6cc..214f2466 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -29,7 +29,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $16 ; db BANK(Route15_h) ; ROUTE_15
 	db $16 ; db BANK(Route16_h) ; ROUTE_16
 	db $15 ; db BANK(Route17_h) ; ROUTE_17
-	db $16 ; db BANK(Route18_h) ; ROUTE_18
+	db BANK(Route18_h) ; ROUTE_18
 	db BANK(Route19_h) ; ROUTE_19
 	db BANK(Route20_h) ; ROUTE_20
 	db BANK(Route21_h) ; ROUTE_21
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index adec78bc..8418f195 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -29,7 +29,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $492c ; dw Route15_h
 	dw $4ada ; dw Route16_h
 	dw $4b28 ; dw Route17_h
-	dw $4c38 ; dw Route18_h
+	dw Route18_h
 	dw Route19_h
 	dw Route20_h
 	dw Route21_h
diff --git a/main.asm b/main.asm
index d5da1a30..2a6fac02 100755
--- a/main.asm
+++ b/main.asm
@@ -853,7 +853,11 @@ INCBIN "maps/route5.blk"
 	dr $5468e,$54706
 Route9Blocks: ; 54706
 INCBIN "maps/route9.blk"
-	dr $54814,$54e80
+
+	dr $54814,$54bb0
+Route17Blocks:
+INCBIN "maps/route17.blk"
+
 INCLUDE "data/mapHeaders/route19.asm"
 INCLUDE "data/mapObjects/route19.asm"
 Route19Blocks:
@@ -898,7 +902,9 @@ INCBIN "maps/route15.blk"
 	dr $58ada,$58b84
 Route16Blocks: ; 58b84
 INCBIN "maps/route16.blk"
-	dr $58c38,$58c9c
+
+INCLUDE "data/mapHeaders/route18.asm"
+INCLUDE "data/mapObjects/route18.asm"
 Route18Blocks:
 INCBIN "maps/route18.blk"
 	dr $58d7d,$58d99
@@ -910,7 +916,9 @@ INCLUDE "engine/status_ailments.asm"
 INCLUDE "engine/overworld/oaks_aide.asm"
 
 INCLUDE "scripts/route6.asm"
-	dr $59052,$5a53a
+	dr $59052,$59963
+INCLUDE "scripts/route18.asm"
+	dr $59a00,$5a53a
 	
 INCLUDE "engine/overworld/saffron_guards.asm"
 
diff --git a/scripts/route18.asm b/scripts/route18.asm
index 9a077faf..9544b1ec 100755
--- a/scripts/route18.asm
+++ b/scripts/route18.asm
@@ -110,3 +110,4 @@ Route18Text4: ; 59b5a (16:5b5a)
 Route18Text5: ; 59b5f (16:5b5f)
 	TX_FAR _Route18Text5
 	db "@"
+; 59b64