Rock Tunnel 1

3 files changed, 11 insertions, 3 deletions

diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index 95279061..86e7e0e3 100644
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -82,7 +82,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4)
 	db BANK(Route8Gate_h)
 	db BANK(UndergroundPathEntranceRoute8_h)
 	db BANK(RockTunnelPokecenter_h)
-	db $11 ; db BANK(RockTunnel1_h)
+	db BANK(RockTunnel1_h)
 	db $07 ; db BANK(PowerPlant_h)
 	db $12 ; db BANK(Route11Gate_h)
 	db $07 ; db BANK(DiglettsCaveEntranceRoute11_h)
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 5f74b05a..28938fa4 100644
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -82,7 +82,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2)
 	dw Route8Gate_h
 	dw UndergroundPathEntranceRoute8_h ;id=80
 	dw RockTunnelPokecenter_h
-	dw $4571 ; dw RockTunnel1_h
+	dw RockTunnel1_h
 	dw $5bc4 ; dw PowerPlant_h
 	dw $5396 ; dw Route11Gate_h
 	dw $5eb8 ; dw DiglettsCaveEntranceRoute11_h
diff --git a/main.asm b/main.asm
index 4516a772..6f9a8568 100755
--- a/main.asm
+++ b/main.asm
@@ -806,7 +806,15 @@ INCLUDE "scripts/viridianpokecenter.asm"
 INCLUDE "data/mapObjects/viridianpokecenter.asm"
 	dr $442b7,$443b7
 Mansion1Script_Switches:
-	dr $443b7,$45077
+	dr $443b7,$44571
+
+INCLUDE "data/mapHeaders/rocktunnel1.asm"
+INCLUDE "scripts/rocktunnel1.asm"
+INCLUDE "data/mapObjects/rocktunnel1.asm"
+RockTunnel1Blocks:
+INCBIN "maps/rocktunnel1.blk"
+
+	dr $4487e,$45077
 LoadSpinnerArrowTiles: ; 45077 (11:5077)
 	dr $45077,$46bf3