Don't say "House" twice

4 files changed, 45 insertions, 45 deletions

diff --git a/maps/VermilionCity.asm b/maps/VermilionCity.asm
index 2430b97d3..d3e270ed7 100644
--- a/maps/VermilionCity.asm
+++ b/maps/VermilionCity.asm
@@ -273,12 +273,12 @@ VermilionCity_MapEvents:
 
 .Warps:
 	db 10
-	warp_def 5, 5, 1, VERMILION_HOUSE_FISHING_SPEECH_HOUSE
+	warp_def 5, 5, 1, VERMILION_FISHING_SPEECH_HOUSE
 	warp_def 9, 5, 1, VERMILION_POKECENTER_1F
 	warp_def 7, 13, 1, POKEMON_FAN_CLUB
 	warp_def 13, 13, 1, VERMILION_MAGNET_TRAIN_SPEECH_HOUSE
 	warp_def 21, 13, 2, VERMILION_MART
-	warp_def 21, 17, 1, VERMILION_HOUSE_DIGLETTS_CAVE_SPEECH_HOUSE
+	warp_def 21, 17, 1, VERMILION_DIGLETTS_CAVE_SPEECH_HOUSE
 	warp_def 10, 19, 1, VERMILION_GYM
 	warp_def 19, 31, 1, VERMILION_PORT_PASSAGE
 	warp_def 20, 31, 2, VERMILION_PORT_PASSAGE
diff --git a/maps/VermilionDiglettsCaveSpeechHouse.asm b/maps/VermilionDiglettsCaveSpeechHouse.asm
new file mode 100644
index 000000000..a0992d777
--- /dev/null
+++ b/maps/VermilionDiglettsCaveSpeechHouse.asm
@@ -0,0 +1,40 @@
+const_value set 2
+	const VERMILIONDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
+
+VermilionDiglettsCaveSpeechHouse_MapScripts:
+.SceneScripts:
+	db 0
+
+.MapCallbacks:
+	db 0
+
+VermilionDiglettsCaveSpeechHouseGentlemanScript:
+	jumptextfaceplayer VermilionDiglettsCaveSpeechHouseGentlemanText
+
+VermilionDiglettsCaveSpeechHouseGentlemanText:
+	text "Over many years,"
+	line "DIGLETT dug a"
+	cont "large tunnel."
+
+	para "That tunnel goes"
+	line "to a distant town."
+	done
+
+VermilionDiglettsCaveSpeechHouse_MapEvents:
+	; filler
+	db 0, 0
+
+.Warps:
+	db 2
+	warp_def 2, 7, 6, VERMILION_CITY
+	warp_def 3, 7, 6, VERMILION_CITY
+
+.CoordEvents:
+	db 0
+
+.BGEvents:
+	db 0
+
+.ObjectEvents:
+	db 1
+	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionDiglettsCaveSpeechHouseGentlemanScript, -1
diff --git a/maps/VermilionHouseFishingSpeechHouse.asm b/maps/VermilionFishingSpeechHouse.asm
index 72ed1ba4a..9ae7daaff 100644
--- a/maps/VermilionHouseFishingSpeechHouse.asm
+++ b/maps/VermilionFishingSpeechHouse.asm
@@ -1,7 +1,7 @@
 const_value set 2
-	const VERMILIONHOUSEFISHINGSPEECHHOUSE_FISHING_GURU
+	const VERMILIONFISHINGSPEECHHOUSE_FISHING_GURU
 
-VermilionHouseFishingSpeechHouse_MapScripts:
+VermilionFishingSpeechHouse_MapScripts:
 .SceneScripts:
 	db 0
 
@@ -50,7 +50,7 @@ FishingDudesHousePhotoText:
 	line "great time…"
 	done
 
-VermilionHouseFishingSpeechHouse_MapEvents:
+VermilionFishingSpeechHouse_MapEvents:
 	; filler
 	db 0, 0
 
diff --git a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm b/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
deleted file mode 100644
index 718d5e005..000000000
--- a/maps/VermilionHouseDiglettsCaveSpeechHouse.asm
+++ /dev/null
@@ -1,40 +0,0 @@
-const_value set 2
-	const VERMILIONHOUSEDIGLETTSCAVESPEECHHOUSE_GENTLEMAN
-
-VermilionHouseDiglettsCaveSpeechHouse_MapScripts:
-.SceneScripts:
-	db 0
-
-.MapCallbacks:
-	db 0
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanScript:
-	jumptextfaceplayer VermilionHouseDiglettsCaveSpeechHouseGentlemanText
-
-VermilionHouseDiglettsCaveSpeechHouseGentlemanText:
-	text "Over many years,"
-	line "DIGLETT dug a"
-	cont "large tunnel."
-
-	para "That tunnel goes"
-	line "to a distant town."
-	done
-
-VermilionHouseDiglettsCaveSpeechHouse_MapEvents:
-	; filler
-	db 0, 0
-
-.Warps:
-	db 2
-	warp_def 2, 7, 6, VERMILION_CITY
-	warp_def 3, 7, 6, VERMILION_CITY
-
-.CoordEvents:
-	db 0
-
-.BGEvents:
-	db 0
-
-.ObjectEvents:
-	db 1
-	object_event 1, 3, SPRITE_GENTLEMAN, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VermilionHouseDiglettsCaveSpeechHouseGentlemanScript, -1