Start reorganizing pokeyellow

11 files changed, 43 insertions, 22 deletions

diff --git a/data/maps/bit_5_maps.asm b/data/maps/bit_5_maps.asm
new file mode 100644
index 00000000..c32bb114
--- /dev/null
+++ b/data/maps/bit_5_maps.asm
@@ -0,0 +1,30 @@
+; SetMapSpecificScriptFlagsOnMapReload sets bit 5
+; of wCurrentMapScriptFlags for these maps.
+
+Bit5Maps:
+	db SILPH_CO_2F
+	db SILPH_CO_3F
+	db SILPH_CO_4F
+	db SILPH_CO_5F
+	db SILPH_CO_6F
+	db SILPH_CO_7F
+	db SILPH_CO_8F
+	db SILPH_CO_9F
+	db SILPH_CO_10F
+	db SILPH_CO_11F
+	db POKEMON_MANSION_2F
+	db POKEMON_MANSION_3F
+	db POKEMON_MANSION_B1F
+	db POKEMON_MANSION_1F
+	db CINNABAR_GYM
+	db GAME_CORNER
+	db ROCKET_HIDEOUT_B1F
+	db ROCKET_HIDEOUT_B4F
+	db VICTORY_ROAD_3F
+	db VICTORY_ROAD_1F
+	db VICTORY_ROAD_2F
+	db LANCES_ROOM
+	db LORELEIS_ROOM
+	db BRUNOS_ROOM
+	db AGATHAS_ROOM
+	db -1 ; end
diff --git a/data/maps/headers/BeachHouse.asm b/data/maps/headers/BeachHouse.asm
deleted file mode 100644
index b1b69e5a..00000000
--- a/data/maps/headers/BeachHouse.asm
+++ /dev/null
@@ -1,8 +0,0 @@
-BeachHouse_h:
-	db BEACH_HOUSE_TILESET
-	db BEACH_HOUSE_HEIGHT, BEACH_HOUSE_WIDTH ; dimensions (y, x)
-	dw BeachHouse_Blocks ; blocks
-	dw BeachHouse_TextPointers ; texts
-	dw BeachHouse_Script ; scripts
-	db 0 ; connections
-	dw BeachHouse_Object ; objects
diff --git a/data/maps/headers/SummerBeachHouse.asm b/data/maps/headers/SummerBeachHouse.asm
new file mode 100644
index 00000000..64f55acc
--- /dev/null
+++ b/data/maps/headers/SummerBeachHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header SummerBeachHouse, SUMMER_BEACH_HOUSE, BEACH_HOUSE, 0
+	end_map_header
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 0e26900f..74251978 100755
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -571,11 +571,8 @@ SeafoamIslandsB4FHS:
 	db SEAFOAM_ISLANDS_B4F, $01, HIDE
 	db SEAFOAM_ISLANDS_B4F, $02, HIDE
 	db SEAFOAM_ISLANDS_B4F, $03, SHOW
-
-BluesHouseHSCopy:
-; doesn't seem to be referenced
+BluesHouseHSCopy: ; unreferenced
 	db BLUES_HOUSE, $01, SHOW
 	db BLUES_HOUSE, $02, HIDE
 	db BLUES_HOUSE, $03, SHOW
-
-	db $FF, $01, SHOW
+	db $FF, $01, SHOW ; end
diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm
index 98e5b5f5..bbc7e13c 100644
--- a/data/maps/map_header_banks.asm
+++ b/data/maps/map_header_banks.asm
@@ -248,4 +248,4 @@ MapHeaderBanks::
 	db BANK(LoreleisRoom_h)
 	db BANK(BrunosRoom_h)
 	db BANK(AgathasRoom_h)
-	db BANK(BeachHouse_h)
+	db BANK(SummerBeachHouse_h)
diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm
index 6ea31795..25a814cf 100644
--- a/data/maps/map_header_pointers.asm
+++ b/data/maps/map_header_pointers.asm
@@ -248,4 +248,4 @@ MapHeaderPointers::
 	dw LoreleisRoom_h
 	dw BrunosRoom_h
 	dw AgathasRoom_h ;247
-	dw BeachHouse_h
+	dw SummerBeachHouse_h
diff --git a/data/maps/objects/Route19.asm b/data/maps/objects/Route19.asm
index 340c48f0..55511b21 100755
--- a/data/maps/objects/Route19.asm
+++ b/data/maps/objects/Route19.asm
@@ -2,7 +2,7 @@ Route19_Object:
 	db $43 ; border block
 
 	def_warps
-	warp  5,  9, 0, BEACH_HOUSE
+	warp  5,  9, 0, SUMMER_BEACH_HOUSE
 
 	def_signs
 	sign 11, 11, 11
diff --git a/data/maps/objects/Route2.asm b/data/maps/objects/Route2.asm
index e939b0dd..6977133b 100755
--- a/data/maps/objects/Route2.asm
+++ b/data/maps/objects/Route2.asm
@@ -22,8 +22,7 @@ Route2_Object:
 
 	; unused
 	warp_to 2, 7, 4
-	dw      $c712
-	db      $9, $7
+	db $12, $c7, $9, $7
 	warp_to 2, 7, 4
 	warp_to 2, 7, 4
 	warp_to 2, 7, 4
diff --git a/data/maps/objects/BeachHouse.asm b/data/maps/objects/SummerBeachHouse.asm
index 1ba99f87..c503b8a7 100644
--- a/data/maps/objects/BeachHouse.asm
+++ b/data/maps/objects/SummerBeachHouse.asm
@@ -1,4 +1,4 @@
-BeachHouse_Object:
+SummerBeachHouse_Object:
 	db $a ; border block
 
 	def_warps
@@ -15,4 +15,4 @@ BeachHouse_Object:
 	object SPRITE_FISHING_GURU, 2, 3, STAY, DOWN, 1 ; surfin' dude
 	object SPRITE_PIKACHU, 5, 3, WALK, 1, 2 ; pikachu
 
-	def_warps_to BEACH_HOUSE
+	def_warps_to SUMMER_BEACH_HOUSE
diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index 1b043bfa..afafe3b3 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -247,4 +247,4 @@ MapSongBanks::
 	db MUSIC_GYM, BANK(Music_Gym) ; LORELEIS_ROOM
 	db MUSIC_DUNGEON1, BANK(Music_Dungeon1) ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, BANK(Music_PokemonTower) ; AGATHAS_ROOM
-	db MUSIC_ROUTES3, BANK(Music_Routes3) ; BEACH_HOUSE
+	db MUSIC_ROUTES3, BANK(Music_Routes3) ; SUMMER_BEACH_HOUSE
diff --git a/data/maps/town_map_entries.asm b/data/maps/town_map_entries.asm
index 6e754558..8ad4bc28 100755
--- a/data/maps/town_map_entries.asm
+++ b/data/maps/town_map_entries.asm
@@ -114,5 +114,5 @@ InternalMapEntries:
 	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
-	internal_map BEACH_HOUSE,                    6, 15, Route19Name
+	internal_map SUMMER_BEACH_HOUSE,             6, 15, Route19Name
 	db -1 ; end