Sync more with pokered

8 files changed, 12 insertions, 12 deletions

diff --git a/data/maps/headers/CeruleanMelaniesHouse.asm b/data/maps/headers/CeruleanMelaniesHouse.asm
new file mode 100755
index 00000000..7d7d2fd7
--- /dev/null
+++ b/data/maps/headers/CeruleanMelaniesHouse.asm
@@ -0,0 +1,3 @@
+
+	map_header CeruleanMelaniesHouse, CERULEAN_MELANIES_HOUSE, HOUSE, 0
+	end_map_header
diff --git a/data/maps/headers/CeruleanTradeHouse.asm b/data/maps/headers/CeruleanTradeHouse.asm
deleted file mode 100755
index 20970b77..00000000
--- a/data/maps/headers/CeruleanTradeHouse.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-
-	map_header CeruleanTradeHouse, CERULEAN_TRADE_HOUSE, HOUSE, 0
-	end_map_header
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 74251978..39e8cab4 100755
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -65,7 +65,7 @@ MapHSPointers:
 	dw NoHS
 	dw MtMoonB2FHS
 	dw NoHS
-	dw CeruleanTradeHouseHS
+	dw CeruleanMelaniesHouseHS
 	dw NoHS
 	dw NoHS
 	dw NoHS
@@ -330,8 +330,8 @@ ViridianGymHS:
 	db VIRIDIAN_GYM, $0B, SHOW
 Museum1FHS:
 	db MUSEUM_1F, $05, SHOW
-CeruleanTradeHouseHS: ; bulbasaur adoption house
-	db CERULEAN_TRADE_HOUSE, $02, SHOW
+CeruleanMelaniesHouseHS:
+	db CERULEAN_MELANIES_HOUSE, $02, SHOW
 CeruleanCaveHS:
 	db CERULEAN_CAVE_1F, $01, SHOW
 	db CERULEAN_CAVE_1F, $02, SHOW
diff --git a/data/maps/map_header_banks.asm b/data/maps/map_header_banks.asm
index bbc7e13c..f9a107e3 100644
--- a/data/maps/map_header_banks.asm
+++ b/data/maps/map_header_banks.asm
@@ -63,7 +63,7 @@ MapHeaderBanks::
 	db BANK(MtMoonB1F_h)
 	db BANK(MtMoonB2F_h)
 	db BANK(CeruleanTrashedHouse_h)
-	db BANK(CeruleanTradeHouse_h)
+	db BANK(CeruleanMelaniesHouse_h)
 	db BANK(CeruleanPokecenter_h)
 	db BANK(CeruleanGym_h)
 	db BANK(BikeShop_h)
diff --git a/data/maps/map_header_pointers.asm b/data/maps/map_header_pointers.asm
index 25a814cf..cf02e5cc 100644
--- a/data/maps/map_header_pointers.asm
+++ b/data/maps/map_header_pointers.asm
@@ -63,7 +63,7 @@ MapHeaderPointers::
 	dw MtMoonB1F_h
 	dw MtMoonB2F_h
 	dw CeruleanTrashedHouse_h
-	dw CeruleanTradeHouse_h
+	dw CeruleanMelaniesHouse_h
 	dw CeruleanPokecenter_h
 	dw CeruleanGym_h
 	dw BikeShop_h
diff --git a/data/maps/objects/CeruleanCity.asm b/data/maps/objects/CeruleanCity.asm
index fae56fc1..2d155e25 100755
--- a/data/maps/objects/CeruleanCity.asm
+++ b/data/maps/objects/CeruleanCity.asm
@@ -3,7 +3,7 @@ CeruleanCity_Object:
 
 	def_warps
 	warp 27, 11, 0, CERULEAN_TRASHED_HOUSE
-	warp 13, 15, 0, CERULEAN_TRADE_HOUSE
+	warp 13, 15, 0, CERULEAN_MELANIES_HOUSE
 	warp 19, 17, 0, CERULEAN_POKECENTER
 	warp 30, 19, 0, CERULEAN_GYM
 	warp 13, 25, 0, BIKE_SHOP
diff --git a/data/maps/objects/CeruleanTradeHouse.asm b/data/maps/objects/CeruleanMelaniesHouse.asm
index a52548fe..cbd25533 100755
--- a/data/maps/objects/CeruleanTradeHouse.asm
+++ b/data/maps/objects/CeruleanMelaniesHouse.asm
@@ -1,4 +1,4 @@
-CeruleanTradeHouse_Object:
+CeruleanMelaniesHouse_Object:
 	db $a ; border block
 
 	def_warps
@@ -13,4 +13,4 @@ CeruleanTradeHouse_Object:
 	object SPRITE_ODDISH, 1, 4, STAY, NONE, 3 ; person
 	object SPRITE_SANDSHREW, 5, 3, STAY, LEFT, 4 ; person
 
-	def_warps_to CERULEAN_TRADE_HOUSE
+	def_warps_to CERULEAN_MELANIES_HOUSE
diff --git a/data/maps/songs.asm b/data/maps/songs.asm
index afafe3b3..4305fc2f 100644
--- a/data/maps/songs.asm
+++ b/data/maps/songs.asm
@@ -62,7 +62,7 @@ MapSongBanks::
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B1F
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MT_MOON_B2F
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRASHED_HOUSE
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_TRADE_HOUSE
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; CERULEAN_MELANIES_HOUSE
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CERULEAN_POKECENTER
 	db MUSIC_GYM, BANK(Music_Gym) ; CERULEAN_GYM
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; BIKE_SHOP