Various interior maps on route 2

5 files changed, 51 insertions, 17 deletions

diff --git a/data/mapObjects/viridianforestentrance.asm b/data/mapObjects/viridianforestentrance.asm
index fc676a6d..891c0636 100755
--- a/data/mapObjects/viridianforestentrance.asm
+++ b/data/mapObjects/viridianforestentrance.asm
@@ -3,7 +3,7 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
 
 	db $4 ; warps
 	db $0, $4, $3, VIRIDIAN_FOREST
-	db $0, $5, $4, VIRIDIAN_FOREST
+	db $0, $5, $3, VIRIDIAN_FOREST
 	db $7, $4, $5, $ff
 	db $7, $5, $5, $ff
 
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 501b3730..2d57ccff 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -46,11 +46,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(School_h)
 	db BANK(ViridianHouse_h)
 	db BANK(ViridianGym_h)
-	db $07 ; db BANK(DiglettsCaveRoute2_h)
-	db $17 ; db BANK(ViridianForestExit_h)
-	db $07 ; db BANK(Route2House_h)
-	db $17 ; db BANK(Route2Gate_h)
-	db $17 ; db BANK(ViridianForestEntrance_h)
+	db BANK(DiglettsCaveRoute2_h)
+	db BANK(ViridianForestExit_h)
+	db BANK(Route2House_h)
+	db BANK(Route2Gate_h)
+	db BANK(ViridianForestEntrance_h)
 	db $18 ; db BANK(ViridianForest_h)
 	db $17 ; db BANK(Museum1F_h)
 	db $17 ; db BANK(Museum2F_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 48702db9..1c151398 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -46,11 +46,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw School_h
 	dw ViridianHouse_h
 	dw ViridianGym_h
-	dw $57ae ; dw DiglettsCaveRoute2_h
-	dw $5485 ; dw ViridianForestExit_h
-	dw $57eb ; dw Route2House_h
-	dw $54d2 ; dw Route2Gate_h
-	dw $555a ; dw ViridianForestEntrance_h ;id=50
+	dw DiglettsCaveRoute2_h
+	dw ViridianForestExit_h
+	dw Route2House_h
+	dw Route2Gate_h
+	dw ViridianForestEntrance_h ;id=50
 	dw $50ed ; dw ViridianForest_h
 	dw $40e3 ; dw Museum1F_h
 	dw $41b4 ; dw Museum2F_h
diff --git a/main.asm b/main.asm
index 4e07b604..457c0e23 100755
--- a/main.asm
+++ b/main.asm
@@ -289,14 +289,19 @@ INCLUDE "data/mapHeaders/route1.asm"
 INCLUDE "data/mapObjects/route1.asm"
 Route1Blocks: ; 1c0fc
 INCBIN "maps/route1.blk"
-	dr $1c1b0,$1c1c0 ; headers, objects, blocks
+UndergroundPathEntranceRoute8Blocks:
+INCBIN "maps/undergroundpathentranceroute8.blk"
 OaksLabBlocks:
 INCBIN "maps/oakslab.blk"
 ViridianHouseBlocks:
+Route2HouseBlocks:
 INCBIN "maps/viridianhouse.blk"
 SchoolBlocks:
 INCBIN "maps/school.blk"
-	dr $1c1fe,$1c21e ; headers, objects, blocks
+CeruleanHouseTrashedBlocks:
+INCBIN "maps/ceruleanhousetrashed.blk"
+DiglettsCaveRoute2Blocks:
+INCBIN "maps/diglettscaveroute2.blk"
 
 INCLUDE "engine/clear_save.asm"
 INCLUDE "engine/predefs7.asm"
@@ -329,7 +334,16 @@ INCLUDE "data/mapObjects/school.asm"
 INCLUDE "data/mapHeaders/viridianhouse.asm"
 INCLUDE "scripts/viridianhouse.asm"
 INCLUDE "data/mapObjects/viridianhouse.asm"
-	dr $1ce30,$1e2ae ; map scripts
+	dr $1ce30,$1d7ae ; map scripts
+
+INCLUDE "data/mapHeaders/diglettscaveroute2.asm"
+INCLUDE "scripts/diglettscaveroute2.asm"
+INCLUDE "data/mapObjects/diglettscaveroute2.asm"
+
+INCLUDE "data/mapHeaders/route2house.asm"
+INCLUDE "scripts/route2house.asm"
+INCLUDE "data/mapObjects/route2house.asm"
+	dr $1d831,$1e2ae ; map scripts
 
 INCLUDE "engine/menu/oaks_pc.asm"
 
@@ -1031,11 +1045,30 @@ SECTION "bank17",ROMX,BANK[$17]
 	dr $5c000,$5c010
 RedsHouse2FBlocks:
 INCBIN "maps/redshouse2f.blk"
-	dr $5c020,$5c0a4
+	dr $5c020,$5c090
+ViridianForestEntranceBlocks:
+ViridianForestExitBlocks:
+Route2GateBlocks:
+INCBIN "maps/viridianforestentrance.blk"
+
 INCLUDE "data/mapHeaders/redshouse2f.asm"
 INCLUDE "scripts/redshouse2f.asm"
 INCLUDE "data/mapObjects/redshouse2f.asm"
-	dr $5c0d4,$5da70
+	dr $5c0d4,$5d485
+
+INCLUDE "data/mapHeaders/viridianforestexit.asm"
+INCLUDE "scripts/viridianforestexit.asm"
+INCLUDE "data/mapObjects/viridianforestexit.asm"
+
+INCLUDE "data/mapHeaders/route2gate.asm"
+INCLUDE "scripts/route2gate.asm"
+INCLUDE "data/mapObjects/route2gate.asm"
+
+INCLUDE "data/mapHeaders/viridianforestentrance.asm"
+INCLUDE "scripts/viridianforestentrance.asm"
+INCLUDE "data/mapObjects/viridianforestentrance.asm"
+
+	dr $5d5a8,$5da70
 
 INCLUDE "engine/evolution.asm"
 
diff --git a/scripts/viridianforestentrance.asm b/scripts/viridianforestentrance.asm
index 14b6cf49..dcfa03ba 100755
--- a/scripts/viridianforestentrance.asm
+++ b/scripts/viridianforestentrance.asm
@@ -1,5 +1,6 @@
 ViridianForestEntranceScript: ; 5d65c (17:565c)
-	jp EnableAutoTextBoxDrawing
+	call EnableAutoTextBoxDrawing
+	ret
 
 ViridianForestEntranceTextPointers: ; 5d65f (17:565f)
 	dw ViridianForestEntranceText1