Route 21 and Cinnabar Island

3 files changed, 20 insertions, 11 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 1dd37cd6..e75d32b5 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -8,7 +8,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(VermilionCity_h) ; VERMILION_CITY
 	db BANK(CeladonCity_h) ; CELADON_CITY
 	db $06 ; db BANK(FuchsiaCity_h) ; FUCHSIA_CITY
-	db $07 ; db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND
+	db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND
 	db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU
 	db BANK(SaffronCity_h) ; SAFFRON_CITY
 	db $01 ; unused
@@ -32,7 +32,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	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 $15 ; db BANK(Route21_h) ; ROUTE_21
+	db BANK(Route21_h) ; ROUTE_21
 	db BANK(Route22_h) ; ROUTE_22
 	db BANK(Route23_h) ; ROUTE_23
 	db BANK(Route24_h) ; ROUTE_24
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 7aed33ae..0de20020 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -8,7 +8,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw VermilionCity_h
 	dw CeladonCity_h
 	dw $4bb3 ; dw FuchsiaCity_h
-	dw $4000 ; dw CinnabarIsland_h
+	dw CinnabarIsland_h
 	dw IndigoPlateau_h
 	dw SaffronCity_h
 	dw SaffronCity_h
@@ -32,7 +32,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw $4c38 ; dw Route18_h
 	dw $4e80 ; dw Route19_h
 	dw $40f1 ; dw Route20_h
-	dw $500f ; dw Route21_h
+	dw Route21_h
 	dw Route22_h
 	dw Route23_h
 	dw Route24_h
diff --git a/main.asm b/main.asm
index cb5b2c45..5c85df92 100755
--- a/main.asm
+++ b/main.asm
@@ -277,9 +277,8 @@ INCLUDE "engine/overworld/doors.asm"
 INCLUDE "engine/overworld/ledges.asm"
 
 SECTION "bank07",ROMX,BANK[$07]
-; INCLUDE "data/mapHeaders/cinnabarisland.asm"
-; INCLUDE "data/mapObjects/cinnabarisland.asm"
-	dr $1c000,$1c069 ; headers, objects, blocks
+INCLUDE "data/mapHeaders/cinnabarisland.asm"
+INCLUDE "data/mapObjects/cinnabarisland.asm"
 CinnabarIslandBlocks:
 INCBIN "maps/cinnabarisland.blk"
 
@@ -292,7 +291,8 @@ INCBIN "maps/route1.blk"
 INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
 
-	dr $1c2c2,$1c358 ; map scripts
+INCLUDE "scripts/cinnabarisland.asm"
+	; dr $1c2c2,$1c358 ; map scripts
 INCLUDE "scripts/route1.asm"
 	dr $1c386,$1e2ae ; map scripts
 
@@ -780,7 +780,11 @@ INCLUDE "data/mapHeaders/route22.asm"
 INCLUDE "data/mapObjects/route22.asm"
 Route22Blocks:
 INCBIN "maps/route22.blk"
-	dr $500f1,$5033f
+; INCLUDE "data/mapHeaders/route20.asm"
+; INCLUDE "data/mapObjects/route20.asm"
+	dr $500f1,$5017d
+Route20Blocks:
+INCBIN "maps/route20.blk"
 
 INCLUDE "data/mapHeaders/route23.asm"
 INCLUDE "data/mapObjects/route23.asm"
@@ -809,6 +813,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/route22.asm"
 INCLUDE "scripts/route23.asm"
@@ -853,7 +858,9 @@ INCBIN "maps/route5.blk"
 	dr $5468e,$54706
 Route9Blocks: ; 54706
 INCBIN "maps/route9.blk"
-	dr $54814,$5507d
+	dr $54814,$5500f
+INCLUDE "data/mapHeaders/route21.asm"
+INCLUDE "data/mapObjects/route21.asm"
 Route21Blocks: ; 5507d
 INCBIN "maps/route21.blk"
 	dr $5523f,$5525f
@@ -864,7 +871,9 @@ INCLUDE "scripts/route2.asm"
 INCLUDE "scripts/route3.asm"
 INCLUDE "scripts/route4.asm"
 INCLUDE "scripts/route5.asm"
-	dr $556d0,$56714
+	dr $556d0,$55edb
+INCLUDE "scripts/route21.asm"
+	dr $56054,$56714
 
 INCLUDE "engine/menu/diploma_1.asm"