Added Underwater Tunnel!

This is a cave that connects Bill's Lighthouse and Route 10, only accessible after Surf is obtained. Contains a static Dragonite as a reference to the anime!

data/maps/dungeon_maps.asm

@@ -11,6 +11,7 @@ DungeonMaps1:
 	db VICTORY_ROAD_3F
 	db POWER_PLANT
 	db DIGLETTS_CAVE
+	db UNDERWATER_TUNNEL
 	db -1 ; end
 
 ; GetBattleTransitionID_IsDungeonMap checks if wCurMap

data/maps/headers/UnderwaterTunnel.asm

@@ -0,0 +1,2 @@
+	map_header UnderwaterTunnel, UNDERWATER_TUNNEL, CAVERN, 0
+	end_map_header

data/maps/hide_show_data.asm

@@ -242,7 +242,7 @@ MapHSPointers:
 	dw SilphCo11FHS
 	dw NoHS
 	dw NoHS
-	dw NoHS
+	dw UnderwaterTunnelHS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -585,6 +585,8 @@ MtMoonCraterHS:
 ViridianPreGymHS:
 	db VIRIDIAN_PRE_GYM, $01, SHOW ; Initial Yujirou
 	db VIRIDIAN_PRE_GYM, $02, HIDE ; Yujirou Rematch
+UnderwaterTunnelHS:
+	db UNDERWATER_TUNNEL, $01, SHOW
 
 	db $FF, $01, SHOW ; end
 

data/maps/map_header_banks.asm

@@ -240,7 +240,7 @@ MapHeaderBanks::
 	db BANK(SilphCo11F_h)
 	db BANK(SilphCoElevator_h)
 	db $11 ; UNUSED_MAP_ED
-	db $11 ; UNUSED_MAP_EE
+	db BANK(UnderwaterTunnel_h) ; UNUSED_MAP_EE
 	db BANK(TradeCenter_h)
 	db BANK(Colosseum_h)
 	db BANK(CeladonUniversityInside_h) ; $11 UNUSED_MAP_F1

data/maps/map_header_pointers.asm

@@ -240,7 +240,7 @@ MapHeaderPointers::
 	dw SilphCo11F_h
 	dw SilphCoElevator_h
 	dw SilphCo2F_h ; UNUSED_MAP_ED
-	dw SilphCo2F_h ; UNUSED_MAP_EE
+	dw UnderwaterTunnel_h ; UNUSED_MAP_EE
 	dw TradeCenter_h
 	dw Colosseum_h
 	dw CeladonUniversityInside_h ; UNUSED_MAP_F1

data/maps/names.asm

@@ -55,3 +55,4 @@ SafariZoneName:      db "SAFARI ZONE@"
 CeruleanCaveName:    db "CERULEAN CAVE@"
 PowerPlantName:      db "POWER PLANT@"
 FarawayIslandName:	 db "FARAWAY ISLAND@"
+UnderwaterTunnelName: db "UNDERWATER TUNNEL@"

data/maps/objects/Route10.asm

@@ -6,6 +6,7 @@ Route10_Object:
 	warp_event  8, 25, ROCK_TUNNEL_1F, 1
 	warp_event  8, 61, ROCK_TUNNEL_1F, 3
 	warp_event  6, 47, POWER_PLANT, 1
+	warp_event  6,  3, UNDERWATER_TUNNEL, 2
 
 	def_bg_events
 	bg_event  7, 27, 7 ; Route10Text7

data/maps/objects/Route25.asm

@@ -3,6 +3,7 @@ Route25_Object:
 
 	def_warp_events
 	warp_event 49,  11, BILLS_HOUSE, 1
+	warp_event 60,   1, UNDERWATER_TUNNEL, 1
 
 	def_bg_events
 	bg_event 53, 11, 11 ; Route25Text11

data/maps/objects/UnderwaterTunnel.asm

@@ -0,0 +1,13 @@
+UnderwaterTunnel_Object:
+	db $7d ; border block
+
+	def_warp_events
+	warp_event  9,  1, ROUTE_25, 2
+	warp_event 27, 13, ROUTE_10, 5
+
+	def_bg_events
+
+	def_object_events
+	object_event 19,  4, SPRITE_MONSTER, STAY, DOWN, 1, DRAGONITE, 55 | OW_POKEMON
+
+	def_warps_to UNDERWATER_TUNNEL

data/maps/songs.asm

@@ -239,7 +239,7 @@ MapSongBanks::
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_11F
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SILPH_CO_ELEVATOR
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_ED
-	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; UNUSED_MAP_EE
+	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; UNUSED_MAP_EE / Underwater Tunnel
 	db MUSIC_CELADON, BANK(Music_Celadon) ; TRADE_CENTER
 	db MUSIC_CELADON, BANK(Music_Celadon) ; COLOSSEUM
 	db MUSIC_OAKS_LAB, BANK(Music_OaksLab) ; UNUSED_MAP_F1 / Celadon University Outside

data/maps/town_map_entries.asm

@@ -123,6 +123,7 @@ InternalMapEntries:
 	internal_map CINNABAR_VOLCANO, 	             3, 14, CinnabarVolcanoName
 	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
+	internal_map UNDERWATER_TUNNEL,             14,  1, UnderwaterTunnelName
 	internal_map CELADON_UNIVERSITY_POKECENTER,   7, 4, CeladonCityName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
 	db -1 ; end

data/maps/town_map_order.asm

@@ -13,6 +13,7 @@ TownMapOrder:
 	db ROUTE_24
 	db ROUTE_25
 	db BILLS_HOUSE
+	db UNDERWATER_TUNNEL
 	db ROUTE_5
 	db ROUTE_6
 	db VERMILION_CITY