From d9e7b91cb3a77891901974f65104dca2fc286ab7 Mon Sep 17 00:00:00 2001
From: pikalaxalt <PikalaxALT@gmail.com>
Date: Fri, 27 May 2016 18:13:32 -0400
Subject: Route 20 scripts and route 19 blocks

---
 constants/hide_show_constants.asm |  2 ++
 data/map_header_banks.asm         |  2 +-
 data/map_header_pointers.asm      |  2 +-
 main.asm                          | 12 ++++++------
 maps/route19.blk                  |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm
index db37b9d9..fc8ab90f 100755
--- a/constants/hide_show_constants.asm
+++ b/constants/hide_show_constants.asm
@@ -226,6 +226,8 @@ const_value SET $7c ; idk anymore lol
 	const HS_VICTORY_ROAD_1_ITEM_1        ; D6
 	const HS_VICTORY_ROAD_1_ITEM_2        ; D7
 	const HS_CHAMPIONS_ROOM_OAK           ; D8
+
+const_value SET $df
 	const HS_SEAFOAM_ISLANDS_1_BOULDER_1  ; D9
 	const HS_SEAFOAM_ISLANDS_1_BOULDER_2  ; DA
 	const HS_SEAFOAM_ISLANDS_2_BOULDER_1  ; DB
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index e75d32b5..a9de3dff 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -31,7 +31,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db $15 ; db BANK(Route17_h) ; ROUTE_17
 	db $16 ; db BANK(Route18_h) ; ROUTE_18
 	db $15 ; db BANK(Route19_h) ; ROUTE_19
-	db $14 ; db BANK(Route20_h) ; ROUTE_20
+	db BANK(Route20_h) ; ROUTE_20
 	db BANK(Route21_h) ; ROUTE_21
 	db BANK(Route22_h) ; ROUTE_22
 	db BANK(Route23_h) ; ROUTE_23
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 0de20020..d6672bbe 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -31,7 +31,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $4b28 ; dw Route17_h
 	dw $4c38 ; dw Route18_h
 	dw $4e80 ; dw Route19_h
-	dw $40f1 ; dw Route20_h
+	dw Route20_h
 	dw Route21_h
 	dw Route22_h
 	dw Route23_h
diff --git a/main.asm b/main.asm
index 5c85df92..b988997b 100755
--- a/main.asm
+++ b/main.asm
@@ -780,9 +780,8 @@ INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
 Route22Blocks:
 INCBIN "maps/route22.blk"
-; INCLUDE "data/mapHeaders/route20.asm"
-; INCLUDE "data/mapObjects/route20.asm"
-	dr $500f1,$5017d
+INCLUDE "data/mapHeaders/route20.asm"
+INCLUDE "data/mapObjects/route20.asm"
 Route20Blocks:
 INCBIN "maps/route20.blk"
 
@@ -813,8 +812,7 @@ INCLUDE "data/mapObjects/saffroncity.asm"
 SaffronCityBlocks: ; 50a98 (14:4a98)
 INCBIN "maps/saffroncity.blk"
 INCLUDE "scripts/saffroncity.asm"
-; INCLUDE "scripts/route20.asm"
-	dr $50ca9,$50eb2
+INCLUDE "scripts/route20.asm"
 INCLUDE "scripts/route22.asm"
 INCLUDE "scripts/route23.asm"
 INCLUDE "scripts/route24.asm"
@@ -858,7 +856,9 @@ INCBIN "maps/route5.blk"
 	dr $5468e,$54706
 Route9Blocks: ; 54706
 INCBIN "maps/route9.blk"
-	dr $54814,$5500f
+	dr $54814,$54f01
+Route19Blocks:
+INCBIN "maps/route19.blk"
 INCLUDE "data/mapHeaders/route21.asm"
 INCLUDE "data/mapObjects/route21.asm"
 Route21Blocks: ; 5507d
diff --git a/maps/route19.blk b/maps/route19.blk
index 0bd469e7..3fc58494 100644
--- a/maps/route19.blk
+++ b/maps/route19.blk
@@ -1 +1 @@
-(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk
\ No newline at end of file
+(,)(,)(,)$W%$W%CCC11111CCC111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk
\ No newline at end of file
-- 
cgit v1.3.1-sl0p