Use dimension constants in warp data and add map name consisntency

6 files changed, 17 insertions, 17 deletions

diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm
index 7ed628fa..78c9f76a 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,4 +1,4 @@
-_CeruleanHouseText1:: ; 9888c (26:488c)
+_CeruleanHouse1Text1:: ; 9888c (26:488c)
 	text "My husband likes"
 	line "trading #MON."
 
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm
index 872d52fc..0af104a4 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -1,11 +1,11 @@
-_CopycatsHouseF1Text1:: ; a14f7 (28:54f7)
+_CopycatsHouse1FText1:: ; a14f7 (28:54f7)
 	text "My daughter is so"
 	line "self-centered."
 	cont "She only has a"
 	cont "few friends."
 	done
 
-_CopycatsHouseF1Text2:: ; a1535 (28:5535)
+_CopycatsHouse1FText2:: ; a1535 (28:5535)
 	text "My daughter likes"
 	line "to mimic people."
 
@@ -15,7 +15,7 @@ _CopycatsHouseF1Text2:: ; a1535 (28:5535)
 	cont "around here!"
 	done
 
-_CopycatsHouseF1Text3:: ; a1596 (28:5596)
+_CopycatsHouse1FText3:: ; a1596 (28:5596)
 	text "CHANSEY: Chaan!"
 	line "Sii!@@"
 
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
index 0f429f57..c818f034 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -58,7 +58,7 @@ _TM31NoRoomText:: ; a1733 (28:5733)
 	text "Don't you want"
 	line "this?@@"
 
-_CopycatsHouseF2Text2:: ; a1749 (28:5749)
+_CopycatsHouse2FText2:: ; a1749 (28:5749)
 	text "DODUO: Giiih!"
 
 	para "MIRROR MIRROR ON"
@@ -67,13 +67,13 @@ _CopycatsHouseF2Text2:: ; a1749 (28:5749)
 	cont "OF ALL?"
 	done
 
-_CopycatsHouseF2Text3:: ; a1792 (28:5792)
+_CopycatsHouse2FText3:: ; a1792 (28:5792)
 	text "This is a rare"
 	line "#MON! Huh?"
 	cont "It's only a doll!"
 	done
 
-_CopycatsHouseF2Text6:: ; a17be (28:57be)
+_CopycatsHouse2FText6:: ; a17be (28:57be)
 	text "A game with MARIO"
 	line "wearing a bucket"
 	cont "on his head!"
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
index b986d823..7594c797 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,11 +1,11 @@
-_MuseumF2Text1:: ; 96841 (25:6841)
+_Museum2FText1:: ; 96841 (25:6841)
 	text "MOON STONE?"
 
 	para "What's so special"
 	line "about it?"
 	done
 
-_MuseumF2Text2:: ; 96869 (25:6869)
+_Museum2FText2:: ; 96869 (25:6869)
 	text "July 20, 1969!"
 
 	para "The 1st lunar"
@@ -15,12 +15,12 @@ _MuseumF2Text2:: ; 96869 (25:6869)
 	line "TV to watch it!"
 	done
 
-_MuseumF2Text3:: ; 968b1 (25:68b1)
+_Museum2FText3:: ; 968b1 (25:68b1)
 	text "We have a space"
 	line "exhibit now."
 	done
 
-_MuseumF2Text4:: ; 968cf (25:68cf)
+_Museum2FText4:: ; 968cf (25:68cf)
 	text "I want a PIKACHU!"
 	line "It's so cute!"
 
@@ -28,17 +28,17 @@ _MuseumF2Text4:: ; 968cf (25:68cf)
 	line "to catch me one!"
 	done
 
-_MuseumF2Text5:: ; 96911 (25:6911)
+_Museum2FText5:: ; 96911 (25:6911)
 	text "Yeah, a PIKACHU"
 	line "soon, I promise!"
 	done
 
-_MuseumF2Text6:: ; 96933 (25:6933)
+_Museum2FText6:: ; 96933 (25:6933)
 	text "SPACE SHUTTLE"
 	line "COLUMBIA"
 	done
 
-_MuseumF2Text7:: ; 9694b (25:694b)
+_Museum2FText7:: ; 9694b (25:694b)
 	text "Meteorite that"
 	line "fell on MT.MOON."
 	cont "(MOON STONE?)"
diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm
index b83bbf50..22ac6788 100644
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -16,7 +16,7 @@ _UnnamedText_49781:: ; 8cd0e (23:4d0e)
 	line "up please!"
 	done
 
-_Route16GateMapText2:: ; 8cd2a (23:4d2a)
+_Route16GateText2:: ; 8cd2a (23:4d2a)
 	text "How'd you get in?"
 	line "Good effort!"
 	done
diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm
index 6cfb5ee0..e74474e9 100644
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -1,4 +1,4 @@
-_ViridianForestexitText1:: ; 8a6fd (22:66fd)
+_ViridianForestExitText1:: ; 8a6fd (22:66fd)
 	text "Many #MON live"
 	line "only in forests "
 	cont "and caves."
@@ -8,7 +8,7 @@ _ViridianForestexitText1:: ; 8a6fd (22:66fd)
 	cont "different kinds!"
 	done
 
-_ViridianForestexitText2:: ; 8a75d (22:675d)
+_ViridianForestExitText2:: ; 8a75d (22:675d)
 	text "Have you noticed"
 	line "the bushes on the"
 	cont "roadside?"