Cinnabar Volcano floors

This adds a map for Cinnabar Volcano's floors in the run-up to Moltres. I used a S.S. Anne style compression technique here, having 4 floors on a decently sized map that are just far enough apart for a player to never actually see them. This maintains their suspension of disbelief while giving us way more space to work with. I want to compress a lot of RBY maps like this if push comes to shove - there's a lot of places where this is possible.

In the interests of compression, I started using the Agatha bank again, as I removed a lot of maps from there when making bank 22. There's some space for maps.

Also I made 3 more blocks for cavern which caused it to overflow the bank it was in - fixed that by swapping with PreGym, which is probably much smaller.

Cinnabar Volcano hasn't been changed yet in the interest of Martha finishing that bit up.

data/maps/dungeon_maps.asm

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

data/maps/headers/CinnabarVolcanoFloors.asm

@@ -0,0 +1,2 @@
+	map_header CinnabarVolcanoFloors, CINNABAR_VOLCANO_FLOORS, CAVERN, 0
+	end_map_header

data/maps/hide_show_data.asm

@@ -251,6 +251,7 @@ MapHSPointers:
 	dw NoHS
 	dw NoHS
 	dw NoHS
+	dw NoHS
 	assert_table_length NUM_MAPS
 	dw -1 ; end
 

data/maps/map_header_banks.asm

@@ -249,4 +249,5 @@ MapHeaderBanks::
 	db BANK(LoreleisRoom_h)
 	db BANK(BrunosRoom_h)
 	db BANK(AgathasRoom_h)
+	db BANK(CinnabarVolcanoFloors_h)
 	assert_table_length NUM_MAPS

data/maps/map_header_pointers.asm

@@ -249,4 +249,5 @@ MapHeaderPointers::
 	dw LoreleisRoom_h
 	dw BrunosRoom_h
 	dw AgathasRoom_h
+	dw CinnabarVolcanoFloors_h
 	assert_table_length NUM_MAPS

data/maps/objects/CinnabarIsland.asm

@@ -2,12 +2,12 @@ CinnabarIsland_Object:
 	db $43 ; border block
 
 	def_warp_events
-	warp_event  6,  15, POKEMON_MANSION_1F, 2
+	warp_event  6, 15, POKEMON_MANSION_1F, 2
 	warp_event 20,  9, CINNABAR_GYM, 1
-	warp_event  6,  21, CINNABAR_LAB, 1
+	warp_event  6, 21, CINNABAR_LAB, 1
 	warp_event 15, 17, CINNABAR_POKECENTER, 1
 	warp_event 21, 19, CINNABAR_MART, 1
-	warp_event 14, 11, CINNABAR_VOLCANO, 1
+	warp_event 14, 11, CINNABAR_VOLCANO_FLOORS, 1
 
 	def_bg_events
 	bg_event 11,  15, 3 ; CinnabarIslandText3

data/maps/objects/CinnabarVolcanoFloors.asm

@@ -0,0 +1,19 @@
+CinnabarVolcanoFloors_Object:
+	db $03 ; border block
+
+	def_warp_events
+	warp_event  3, 15, LAST_MAP, 6
+	warp_event  2, 15, LAST_MAP, 6
+	warp_event  2,  2, CINNABAR_VOLCANO_FLOORS, 4
+	warp_event 25,  3, CINNABAR_VOLCANO_FLOORS, 5
+	warp_event 27, 12, CINNABAR_VOLCANO_FLOORS, 6
+	warp_event 25, 37, CINNABAR_VOLCANO_FLOORS, 7
+	warp_event 25, 25, CINNABAR_VOLCANO_FLOORS, 8
+	warp_event  3, 25, CINNABAR_VOLCANO_FLOORS, 9
+	warp_event 15, 25, CINNABAR_VOLCANO, 1
+
+	def_bg_events
+
+	def_object_events
+
+	def_warps_to CINNABAR_VOLCANO_FLOORS

data/maps/songs.asm

@@ -248,4 +248,5 @@ MapSongBanks::
 	db MUSIC_GYM, 0 ; LORELEIS_ROOM
 	db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
+	db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
 	assert_table_length NUM_MAPS

data/maps/town_map_entries.asm

@@ -125,4 +125,5 @@ InternalMapEntries:
 	internal_map CELADON_UNIVERSITY_POKECENTER,  7,  4, CeladonUniversityName
 	internal_map BILLS_GARDEN,                  12,  0, SeaCottageName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
+	internal_map CINNABAR_VOLCANO_FLOORS,  	     3, 14, CinnabarVolcanoName
 	db -1 ; end