"Speech" houses just have dialog NPCs

14 files changed, 54 insertions, 54 deletions

diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index f327cd407..4407bdd7f 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -365,7 +365,7 @@ ENDM
 	mapconst ROUTE_28,                                     9, 20 ;  1
 	mapconst SILVER_CAVE_OUTSIDE,                         18, 20 ;  2
 	mapconst SILVER_CAVE_POKECENTER_1F,                    4,  5 ;  3
-	mapconst ROUTE_28_FAMOUS_SPEECH_HOUSE,                 4,  4 ;  4
+	mapconst ROUTE_28_STEEL_WING_HOUSE,                    4,  4 ;  4
 
 	newgroup                                                     ; 20
 
@@ -436,7 +436,7 @@ ENDM
 	mapconst VIRIDIAN_MART,                                4,  6 ;  8
 	mapconst VIRIDIAN_POKECENTER_1F,                       4,  5 ;  9
 	mapconst VIRIDIAN_POKECENTER_2F_BETA,                  4,  8 ; 10
-	mapconst ROUTE_2_NUGGET_SPEECH_HOUSE,                  4,  4 ; 11
+	mapconst ROUTE_2_NUGGET_HOUSE,                         4,  4 ; 11
 	mapconst ROUTE_2_GATE,                                 4,  5 ; 12
 	mapconst VICTORY_ROAD_GATE,                            9, 10 ; 13
 
@@ -451,7 +451,7 @@ ENDM
 	mapconst PLAYERS_HOUSE_2F,                             3,  4 ;  7
 	mapconst PLAYERS_NEIGHBORS_HOUSE,                      4,  4 ;  8
 	mapconst ELMS_HOUSE,                                   4,  4 ;  9
-	mapconst ROUTE_26_HEAL_SPEECH_HOUSE,                   4,  4 ; 10
+	mapconst ROUTE_26_HEAL_HOUSE,                          4,  4 ; 10
 	mapconst DAY_OF_WEEK_SIBLINGS_HOUSE,                   4,  4 ; 11
 	mapconst ROUTE_27_SANDSTORM_HOUSE,                     4,  4 ; 12
 	mapconst ROUTE_29_ROUTE_46_GATE,                       4,  5 ; 13
@@ -472,7 +472,7 @@ ENDM
 	mapconst COPYCATS_HOUSE_2F,                            3,  5 ; 12
 	mapconst ROUTE_5_UNDERGROUND_PATH_ENTRANCE,            4,  4 ; 13
 	mapconst ROUTE_5_SAFFRON_GATE,                         4,  5 ; 14
-	mapconst ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE,             4,  4 ; 15
+	mapconst ROUTE_5_CLEANSE_TAG_HOUSE,                    4,  4 ; 15
 
 	newgroup                                                     ; 26
 
@@ -484,6 +484,6 @@ ENDM
 	mapconst CHERRYGROVE_GYM_SPEECH_HOUSE,                 4,  4 ;  6
 	mapconst GUIDE_GENTS_HOUSE,                            4,  4 ;  7
 	mapconst CHERRYGROVE_EVOLUTION_SPEECH_HOUSE,           4,  4 ;  8
-	mapconst ROUTE_30_BERRY_SPEECH_HOUSE,                  4,  4 ;  9
+	mapconst ROUTE_30_BERRY_HOUSE,                         4,  4 ;  9
 	mapconst MR_POKEMONS_HOUSE,                            4,  4 ; 10
 	mapconst ROUTE_31_VIOLET_GATE,                         4,  5 ; 11
diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm
index 1b3eda585..dbfa49b5a 100644
--- a/data/maps/blocks.asm
+++ b/data/maps/blocks.asm
@@ -178,7 +178,7 @@ BillsBrothersHouse_Blocks:
 LavenderSpeechHouse_Blocks:
 LavenderNameRater_Blocks:
 Route12SuperRodHouse_Blocks:
-Route28FamousSpeechHouse_Blocks:
+Route28SteelWingHouse_Blocks:
 CeladonMansionRoofHouse_Blocks:
 Route16FuchsiaSpeechHouse_Blocks:
 ManiasHouse_Blocks:
@@ -187,17 +187,17 @@ CianwoodPhotoStudio_Blocks:
 CianwoodLugiaSpeechHouse_Blocks:
 PokeSeersHouse_Blocks:
 ViridianNicknameSpeechHouse_Blocks:
-Route2NuggetSpeechHouse_Blocks:
+Route2NuggetHouse_Blocks:
 PlayersNeighborsHouse_Blocks:
-Route26HealSpeechHouse_Blocks:
+Route26HealHouse_Blocks:
 DayOfWeekSiblingsHouse_Blocks:
 Route27SandstormHouse_Blocks:
 MrPsychicsHouse_Blocks:
-Route5CleanseTagSpeechHouse_Blocks:
+Route5CleanseTagHouse_Blocks:
 CherrygroveGymSpeechHouse_Blocks:
 GuideGentsHouse_Blocks:
 CherrygroveEvolutionSpeechHouse_Blocks:
-Route30BerrySpeechHouse_Blocks:
+Route30BerryHouse_Blocks:
 	INCBIN "maps/House1.blk"
 
 SafariZoneFuchsiaGateBeta_Blocks:
diff --git a/data/maps/data.asm b/data/maps/data.asm
index 16a972437..ef8c4996c 100644
--- a/data/maps/data.asm
+++ b/data/maps/data.asm
@@ -601,7 +601,7 @@ ENDM
 	map_data Route8SaffronGate, ROUTE_8_SAFFRON_GATE, $00, 0
 	map_data Route12SuperRodHouse, ROUTE_12_SUPER_ROD_HOUSE, $00, 0
 	map_data SilverCavePokecenter1F, SILVER_CAVE_POKECENTER_1F, $00, 0
-	map_data Route28FamousSpeechHouse, ROUTE_28_FAMOUS_SPEECH_HOUSE, $00, 0
+	map_data Route28SteelWingHouse, ROUTE_28_STEEL_WING_HOUSE, $00, 0
 	map_data Pokecenter2F, POKECENTER_2F, $00, 0
 	map_data TradeCenter, TRADE_CENTER, $00, 0
 	map_data Colosseum, COLOSSEUM, $00, 0
@@ -650,7 +650,7 @@ ENDM
 	map_data ViridianMart, VIRIDIAN_MART, $00, 0
 	map_data ViridianPokecenter1F, VIRIDIAN_POKECENTER_1F, $00, 0
 	map_data ViridianPokecenter2FBeta, VIRIDIAN_POKECENTER_2F_BETA, $00, 0
-	map_data Route2NuggetSpeechHouse, ROUTE_2_NUGGET_SPEECH_HOUSE, $00, 0
+	map_data Route2NuggetHouse, ROUTE_2_NUGGET_HOUSE, $00, 0
 	map_data Route2Gate, ROUTE_2_GATE, $00, 0
 	map_data VictoryRoadGate, VICTORY_ROAD_GATE, $00, 0
 	map_data ElmsLab, ELMS_LAB, $00, 0
@@ -658,7 +658,7 @@ ENDM
 	map_data PlayersHouse2F, PLAYERS_HOUSE_2F, $00, 0
 	map_data PlayersNeighborsHouse, PLAYERS_NEIGHBORS_HOUSE, $00, 0
 	map_data ElmsHouse, ELMS_HOUSE, $00, 0
-	map_data Route26HealSpeechHouse, ROUTE_26_HEAL_SPEECH_HOUSE, $00, 0
+	map_data Route26HealHouse, ROUTE_26_HEAL_HOUSE, $00, 0
 	map_data DayOfWeekSiblingsHouse, DAY_OF_WEEK_SIBLINGS_HOUSE, $00, 0
 	map_data Route27SandstormHouse, ROUTE_27_SANDSTORM_HOUSE, $00, 0
 	map_data Route29Route46Gate, ROUTE_29_ROUTE_46_GATE, $00, 0
@@ -674,12 +674,12 @@ ENDM
 	map_data CopycatsHouse2F, COPYCATS_HOUSE_2F, $00, 0
 	map_data Route5UndergroundPathEntrance, ROUTE_5_UNDERGROUND_PATH_ENTRANCE, $00, 0
 	map_data Route5SaffronGate, ROUTE_5_SAFFRON_GATE, $00, 0
-	map_data Route5CleanseTagSpeechHouse, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE, $00, 0
+	map_data Route5CleanseTagHouse, ROUTE_5_CLEANSE_TAG_HOUSE, $00, 0
 	map_data CherrygroveMart, CHERRYGROVE_MART, $00, 0
 	map_data CherrygrovePokecenter1F, CHERRYGROVE_POKECENTER_1F, $00, 0
 	map_data CherrygroveGymSpeechHouse, CHERRYGROVE_GYM_SPEECH_HOUSE, $00, 0
 	map_data GuideGentsHouse, GUIDE_GENTS_HOUSE, $00, 0
 	map_data CherrygroveEvolutionSpeechHouse, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, $00, 0
-	map_data Route30BerrySpeechHouse, ROUTE_30_BERRY_SPEECH_HOUSE, $00, 0
+	map_data Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
 	map_data MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
 	map_data Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
diff --git a/data/maps/definitions.asm b/data/maps/definitions.asm
index e9afbf31c..6772ecc97 100644
--- a/data/maps/definitions.asm
+++ b/data/maps/definitions.asm
@@ -368,7 +368,7 @@ MapGroup_Silver:
 	map_def Route28, TILESET_KANTO, ROUTE, ROUTE_28, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
 	map_def SilverCaveOutside, TILESET_KANTO, TOWN, SILVER_CAVE, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_POND
 	map_def SilverCavePokecenter1F, TILESET_POKECENTER, INDOOR, SILVER_CAVE, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route28FamousSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route28SteelWingHouse, TILESET_HOUSE, INDOOR, ROUTE_28, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 
 MapGroup_CableClub:
 	map_def Pokecenter2F, TILESET_POKECENTER, INDOOR, SPECIAL_MAP, MUSIC_POKEMON_CENTER, TRUE, PALETTE_DAY, FISHGROUP_SHORE
@@ -435,7 +435,7 @@ MapGroup_Viridian:
 	map_def ViridianMart, TILESET_MART, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def ViridianPokecenter1F, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def ViridianPokecenter2FBeta, TILESET_POKECENTER, INDOOR, VIRIDIAN_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route2NuggetSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route2NuggetHouse, TILESET_HOUSE, INDOOR, ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route2Gate, TILESET_GATE, GATE, ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def VictoryRoadGate, TILESET_GATE, GATE, ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 
@@ -449,7 +449,7 @@ MapGroup_NewBark:
 	map_def PlayersHouse2F, TILESET_PLAYERS_ROOM, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def PlayersNeighborsHouse, TILESET_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def ElmsHouse, TILESET_PLAYERS_HOUSE, INDOOR, NEW_BARK_TOWN, MUSIC_NEW_BARK_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route26HealSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route26HealHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def DayOfWeekSiblingsHouse, TILESET_HOUSE, INDOOR, ROUTE_26, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route27SandstormHouse, TILESET_HOUSE, INDOOR, ROUTE_27, MUSIC_AZALEA_TOWN, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route29Route46Gate, TILESET_GATE, GATE, ROUTE_29, MUSIC_ROUTE_29, FALSE, PALETTE_DAY, FISHGROUP_SHORE
@@ -469,7 +469,7 @@ MapGroup_Saffron:
 	map_def CopycatsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, SAFFRON_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route5UndergroundPathEntrance, TILESET_GATE, GATE, ROUTE_5, MUSIC_ROUTE_3, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route5SaffronGate, TILESET_GATE, GATE, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route5CleanseTagSpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route5CleanseTagHouse, TILESET_HOUSE, INDOOR, ROUTE_5, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 
 MapGroup_Cherrygrove:
 	map_def Route30, TILESET_JOHTO, ROUTE, ROUTE_30, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_POND
@@ -480,6 +480,6 @@ MapGroup_Cherrygrove:
 	map_def CherrygroveGymSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def GuideGentsHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def CherrygroveEvolutionSpeechHouse, TILESET_HOUSE, INDOOR, CHERRYGROVE_CITY, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
-	map_def Route30BerrySpeechHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
+	map_def Route30BerryHouse, TILESET_HOUSE, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def MrPokemonsHouse, TILESET_FACILITY, INDOOR, ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
 	map_def Route31VioletGate, TILESET_GATE, GATE, ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm
index fd4288a57..331418d6c 100644
--- a/data/maps/scripts.asm
+++ b/data/maps/scripts.asm
@@ -155,7 +155,7 @@ INCLUDE "maps/PlayersHouse1F.asm"
 INCLUDE "maps/PlayersHouse2F.asm"
 INCLUDE "maps/PlayersNeighborsHouse.asm"
 INCLUDE "maps/ElmsHouse.asm"
-INCLUDE "maps/Route26HealSpeechHouse.asm"
+INCLUDE "maps/Route26HealHouse.asm"
 INCLUDE "maps/DayOfWeekSiblingsHouse.asm"
 INCLUDE "maps/Route27SandstormHouse.asm"
 INCLUDE "maps/Route29Route46Gate.asm"
@@ -206,7 +206,7 @@ INCLUDE "maps/TrainerHouseB1F.asm"
 INCLUDE "maps/ViridianMart.asm"
 INCLUDE "maps/ViridianPokecenter1F.asm"
 INCLUDE "maps/ViridianPokecenter2FBeta.asm"
-INCLUDE "maps/Route2NuggetSpeechHouse.asm"
+INCLUDE "maps/Route2NuggetHouse.asm"
 INCLUDE "maps/Route2Gate.asm"
 INCLUDE "maps/VictoryRoadGate.asm"
 
@@ -294,7 +294,7 @@ INCLUDE "maps/CopycatsHouse1F.asm"
 INCLUDE "maps/CopycatsHouse2F.asm"
 INCLUDE "maps/Route5UndergroundPathEntrance.asm"
 INCLUDE "maps/Route5SaffronGate.asm"
-INCLUDE "maps/Route5CleanseTagSpeechHouse.asm"
+INCLUDE "maps/Route5CleanseTagHouse.asm"
 
 
 SECTION "Map Scripts 16", ROMX
@@ -371,7 +371,7 @@ INCLUDE "maps/CherrygrovePokecenter1F.asm"
 INCLUDE "maps/CherrygroveGymSpeechHouse.asm"
 INCLUDE "maps/GuideGentsHouse.asm"
 INCLUDE "maps/CherrygroveEvolutionSpeechHouse.asm"
-INCLUDE "maps/Route30BerrySpeechHouse.asm"
+INCLUDE "maps/Route30BerryHouse.asm"
 INCLUDE "maps/MrPokemonsHouse.asm"
 INCLUDE "maps/Route31VioletGate.asm"
 
@@ -477,7 +477,7 @@ INCLUDE "maps/Route4.asm"
 INCLUDE "maps/Route10South.asm"
 INCLUDE "maps/Route23.asm"
 INCLUDE "maps/SilverCavePokecenter1F.asm"
-INCLUDE "maps/Route28FamousSpeechHouse.asm"
+INCLUDE "maps/Route28SteelWingHouse.asm"
 
 
 SECTION "Map Scripts 25", ROMX
diff --git a/maps/Route2.asm b/maps/Route2.asm
index 09b885df3..f4d910194 100644
--- a/maps/Route2.asm
+++ b/maps/Route2.asm
@@ -152,7 +152,7 @@ Route2_MapEvents:
 
 .Warps:
 	db 5
-	warp_def 15, 15, 1, ROUTE_2_NUGGET_SPEECH_HOUSE
+	warp_def 15, 15, 1, ROUTE_2_NUGGET_HOUSE
 	warp_def 15, 31, 3, ROUTE_2_GATE
 	warp_def 16, 27, 1, ROUTE_2_GATE
 	warp_def 17, 27, 2, ROUTE_2_GATE
diff --git a/maps/Route26.asm b/maps/Route26.asm
index 75599372b..1e3bbf59f 100644
--- a/maps/Route26.asm
+++ b/maps/Route26.asm
@@ -419,7 +419,7 @@ Route26_MapEvents:
 .Warps:
 	db 3
 	warp_def 7, 5, 3, VICTORY_ROAD_GATE
-	warp_def 15, 57, 1, ROUTE_26_HEAL_SPEECH_HOUSE
+	warp_def 15, 57, 1, ROUTE_26_HEAL_HOUSE
 	warp_def 5, 71, 1, DAY_OF_WEEK_SIBLINGS_HOUSE
 
 .CoordEvents:
diff --git a/maps/Route26HealSpeechHouse.asm b/maps/Route26HealHouse.asm
index d1759dc9d..e24f7dcc3 100644
--- a/maps/Route26HealSpeechHouse.asm
+++ b/maps/Route26HealHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
-	const ROUTE26HEALSPEECHHOUSE_TEACHER
+	const ROUTE26HEALHOUSE_TEACHER
 
-Route26HealSpeechHouse_MapScripts:
+Route26HealHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -48,7 +48,7 @@ UnknownText_0x7b18b:
 	para "Keep at it!"
 	done
 
-Route26HealSpeechHouse_MapEvents:
+Route26HealHouse_MapEvents:
 	; filler
 	db 0, 0
 
diff --git a/maps/Route28FamousSpeechHouse.asm b/maps/Route28SteelWingHouse.asm
index 662e7279b..8f9e3b39d 100644
--- a/maps/Route28FamousSpeechHouse.asm
+++ b/maps/Route28SteelWingHouse.asm
@@ -1,8 +1,8 @@
 const_value set 2
-	const ROUTE28FAMOUSSPEECHHOUSE_CELEBRITY
-	const ROUTE28FAMOUSSPEECHHOUSE_FEAROW
+	const ROUTE28STEELWINGHOUSE_CELEBRITY
+	const ROUTE28STEELWINGHOUSE_FEAROW
 
-Route28FamousSpeechHouse_MapScripts:
+Route28SteelWingHouse_MapScripts:
 .SceneScripts:
 	db 1
 	scene_script .DummyScene
@@ -70,7 +70,7 @@ CelebritysFearowText:
 	text "FEAROW: Feero!"
 	done
 
-Route28FamousSpeechHouse_MapEvents:
+Route28SteelWingHouse_MapEvents:
 	; filler
 	db 0, 0
 
diff --git a/maps/Route2NuggetSpeechHouse.asm b/maps/Route2NuggetHouse.asm
index 231b568ed..d1fcedee6 100644
--- a/maps/Route2NuggetSpeechHouse.asm
+++ b/maps/Route2NuggetHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
-	const ROUTE2NUGGETSPEECHHOUSE_FISHER
+	const ROUTE2NUGGETHOUSE_FISHER
 
-Route2NuggetSpeechHouse_MapScripts:
+Route2NuggetHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -25,7 +25,7 @@ FisherScript_0x9b847:
 	closetext
 	end
 
-Route2NuggetSpeechHouseBookshelf:
+Route2NuggetHouseBookshelf:
 ; unused
 	jumpstd difficultbookshelf
 
@@ -52,7 +52,7 @@ UnknownText_0x9b8e5:
 	line "have to do!"
 	done
 
-Route2NuggetSpeechHouse_MapEvents:
+Route2NuggetHouse_MapEvents:
 	; filler
 	db 0, 0
 
diff --git a/maps/Route30.asm b/maps/Route30.asm
index df8b593d6..5d6fc0de8 100644
--- a/maps/Route30.asm
+++ b/maps/Route30.asm
@@ -412,7 +412,7 @@ Route30_MapEvents:
 
 .Warps:
 	db 2
-	warp_def 7, 39, 1, ROUTE_30_BERRY_SPEECH_HOUSE
+	warp_def 7, 39, 1, ROUTE_30_BERRY_HOUSE
 	warp_def 17, 5, 1, MR_POKEMONS_HOUSE
 
 .CoordEvents:
diff --git a/maps/Route30BerrySpeechHouse.asm b/maps/Route30BerryHouse.asm
index 96605b3c8..f304957ba 100644
--- a/maps/Route30BerrySpeechHouse.asm
+++ b/maps/Route30BerryHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
-	const ROUTE30BERRYSPEECHHOUSE_POKEFAN_M
+	const ROUTE30BERRYHOUSE_POKEFAN_M
 
-Route30BerrySpeechHouse_MapScripts:
+Route30BerryHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -25,7 +25,7 @@ UnknownScript_0x196d7d:
 	closetext
 	end
 
-Route30BerrySpeechHouseBookshelf:
+Route30BerryHouseBookshelf:
 	jumpstd magazinebookshelf
 
 UnknownText_0x196d82:
@@ -46,7 +46,7 @@ UnknownText_0x196dec:
 	cont "drop right off."
 	done
 
-Route30BerrySpeechHouse_MapEvents:
+Route30BerryHouse_MapEvents:
 	; filler
 	db 0, 0
 
@@ -60,8 +60,8 @@ Route30BerrySpeechHouse_MapEvents:
 
 .BGEvents:
 	db 2
-	bg_event 0, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
-	bg_event 1, 1, BGEVENT_READ, Route30BerrySpeechHouseBookshelf
+	bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf
+	bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf
 
 .ObjectEvents:
 	db 1
diff --git a/maps/Route5.asm b/maps/Route5.asm
index 9bdf8a023..02fd4113c 100644
--- a/maps/Route5.asm
+++ b/maps/Route5.asm
@@ -48,7 +48,7 @@ Route5_MapEvents:
 	warp_def 17, 15, 1, ROUTE_5_UNDERGROUND_PATH_ENTRANCE
 	warp_def 8, 17, 1, ROUTE_5_SAFFRON_GATE
 	warp_def 9, 17, 2, ROUTE_5_SAFFRON_GATE
-	warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_SPEECH_HOUSE
+	warp_def 10, 11, 1, ROUTE_5_CLEANSE_TAG_HOUSE
 
 .CoordEvents:
 	db 0
diff --git a/maps/Route5CleanseTagSpeechHouse.asm b/maps/Route5CleanseTagHouse.asm
index f044a48b0..ec05c99fb 100644
--- a/maps/Route5CleanseTagSpeechHouse.asm
+++ b/maps/Route5CleanseTagHouse.asm
@@ -1,8 +1,8 @@
 const_value set 2
-	const ROUTE5CLEANSETAGSPEECHHOUSE_GRANNY
-	const ROUTE5CLEANSETAGSPEECHHOUSE_TEACHER
+	const ROUTE5CLEANSETAGHOUSE_GRANNY
+	const ROUTE5CLEANSETAGHOUSE_TEACHER
 
-Route5CleanseTagSpeechHouse_MapScripts:
+Route5CleanseTagHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -26,8 +26,8 @@ UnknownScript_0x18b64d:
 	closetext
 	end
 
-Route5CleanseTagSpeechHouseTeacherScript:
-	jumptextfaceplayer Route5CleanseTagSpeechHouseTeacherText
+Route5CleanseTagHouseTeacherScript:
+	jumptextfaceplayer Route5CleanseTagHouseTeacherText
 
 HouseForSaleBookshelf:
 	jumpstd difficultbookshelf
@@ -49,7 +49,7 @@ UnknownText_0x18b6a7:
 	cont "are protected now."
 	done
 
-Route5CleanseTagSpeechHouseTeacherText:
+Route5CleanseTagHouseTeacherText:
 	text "My grandma is into"
 	line "warding off what"
 
@@ -60,7 +60,7 @@ Route5CleanseTagSpeechHouseTeacherText:
 	line "startled you."
 	done
 
-Route5CleanseTagSpeechHouse_MapEvents:
+Route5CleanseTagHouse_MapEvents:
 	; filler
 	db 0, 0
 
@@ -80,4 +80,4 @@ Route5CleanseTagSpeechHouse_MapEvents:
 .ObjectEvents:
 	db 2
 	object_event 2, 5, SPRITE_GRANNY, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, GrannyScript_0x18b634, -1
-	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagSpeechHouseTeacherScript, -1
+	object_event 5, 3, SPRITE_TEACHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route5CleanseTagHouseTeacherScript, -1