More syncing with pokered

from April 8, 2016 to present

15 files changed, 30 insertions, 39 deletions

diff --git a/text/maps/cinnabar_pokecenter.asm b/text/maps/cinnabar_pokecenter.asm
index 301c9740..cf481764 100644
--- a/text/maps/cinnabar_pokecenter.asm
+++ b/text/maps/cinnabar_pokecenter.asm
@@ -1,5 +1,4 @@
 _CinnabarPokecenterText2::
-_CinnabarPokecenterText1::
 	text "You can cancel"
 	line "evolution."
 
diff --git a/text/maps/indigo_plateau_lobby.asm b/text/maps/indigo_plateau_lobby.asm
index 86cfb562..8487e29a 100644
--- a/text/maps/indigo_plateau_lobby.asm
+++ b/text/maps/indigo_plateau_lobby.asm
@@ -1,4 +1,4 @@
-_IndigoPlateauLobbyText1::
+_IndigoPlateauLobbyText2::
 	text "Yo! Champ in"
 	line "making!"
 
diff --git a/text/maps/lavender_mart.asm b/text/maps/lavender_mart.asm
index 54519890..222712c6 100644
--- a/text/maps/lavender_mart.asm
+++ b/text/maps/lavender_mart.asm
@@ -14,13 +14,13 @@ _LavenderMartText2::
 	line "I can get them?"
 	done
 
-_LavenderMart_5c953::
+_LavenderMartReviveText::
 	text "You know REVIVE?"
 	line "It revives any"
 	cont "fainted #MON!"
 	done
 
-_LavenderMart_5c958::
+_LavenderMartNuggetText::
 	text "I found a NUGGET"
 	line "in the mountains."
 
diff --git a/text/maps/lavender_pokecenter.asm b/text/maps/lavender_pokecenter.asm
index 5ee5b2f5..3aa7b67d 100644
--- a/text/maps/lavender_pokecenter.asm
+++ b/text/maps/lavender_pokecenter.asm
@@ -1,6 +1,4 @@
-_LavenderPokecenterText4::
 _LavenderPokecenterText2::
-_LavenderPokecenterText1::
 	text "TEAM ROCKET will"
 	line "do anything for"
 	cont "the sake of gold!"
diff --git a/text/maps/mt_moon_pokecenter.asm b/text/maps/mt_moon_pokecenter.asm
index f45c5598..ebcada87 100644
--- a/text/maps/mt_moon_pokecenter.asm
+++ b/text/maps/mt_moon_pokecenter.asm
@@ -20,7 +20,7 @@ _MtMoonPokecenterText5::
 	db $0
 	done
 
-_MtMoonPokecenterText_4935c::
+_MagikarpSalesmanText1::
 	text "MAN: Hello, there!"
 	line "Have I got a deal"
 	cont "just for you!"
@@ -31,18 +31,18 @@ _MtMoonPokecenterText_4935c::
 	cont "What do you say?"
 	done
 
-_MtMoonPokecenterText_49361::
+_MagikarpSalesmanNoText::
 	text "No? I'm only"
 	line "doing this as a"
 	cont "favor to you!"
 	done
 
-_MtMoonPokecenterText_49366::
+_MagikarpSalesmanNoMoneyText::
 	text "You'll need more"
 	line "money than that!"
 	done
 
-_MtMoonPokecenterText_4936b::
+_MagikarpSalesmanText2::
 	text "MAN: Well, I don't"
 	line "give refunds!"
 	done
diff --git a/text/maps/pewter_mart.asm b/text/maps/pewter_mart.asm
index 29a1f597..4dbc3c02 100644
--- a/text/maps/pewter_mart.asm
+++ b/text/maps/pewter_mart.asm
@@ -1,4 +1,4 @@
-_PewterMartText_74cc6::
+_PewterMartText2::
 	text "A shady old man"
 	line "got me to buy"
 	cont "this really weird"
@@ -8,7 +8,7 @@ _PewterMartText_74cc6::
 	line "and it cost ¥500!"
 	done
 
-_PewterMartText_74cd5::
+_PewterMartText3::
 	text "Good things can"
 	line "happen if you"
 	cont "raise #MON"
diff --git a/text/maps/pewter_pokecenter.asm b/text/maps/pewter_pokecenter.asm
index cd76b004..968f6af0 100644
--- a/text/maps/pewter_pokecenter.asm
+++ b/text/maps/pewter_pokecenter.asm
@@ -1,4 +1,4 @@
-_PewterPokecenterText1::
+_PewterPokecenterText2::
 	text "What!?"
 
 	para "TEAM ROCKET is"
@@ -8,7 +8,7 @@ _PewterPokecenterText1::
 	para "Scram!"
 	done
 
-_PewterPokecenterText2::
+_PewterPokecenterText3::
 	text "#MON CENTERS"
 	line "are wonderful!"
 
@@ -21,7 +21,7 @@ _PewterPokecenterText2::
 	cont "are cured."
 	done
 
-_PewterPokecenterText5::
+_PewterJigglypuffText::
 	text "JIGGLYPUFF: Puu"
 	line "pupuu!"
 	done
diff --git a/text/maps/rock_tunnel_pokecenter.asm b/text/maps/rock_tunnel_pokecenter.asm
index ec625e95..0fc249ff 100644
--- a/text/maps/rock_tunnel_pokecenter.asm
+++ b/text/maps/rock_tunnel_pokecenter.asm
@@ -1,4 +1,4 @@
-_RockTunnelPokecenterText1::
+_RockTunnelPokecenterText2::
 	text "The element types"
 	line "of #MON make"
 	cont "them stronger"
diff --git a/text/maps/saffron_pokecenter.asm b/text/maps/saffron_pokecenter.asm
index 8fd47e4f..6548aff8 100644
--- a/text/maps/saffron_pokecenter.asm
+++ b/text/maps/saffron_pokecenter.asm
@@ -1,4 +1,4 @@
-_SaffronPokecenterText1::
+_SaffronPokecenterText2::
 	text "#MON growth"
 	line "rates differ from"
 	cont "specie to specie."
diff --git a/text/maps/vermilion_pokecenter.asm b/text/maps/vermilion_pokecenter.asm
index bbd8842f..c9e9a581 100644
--- a/text/maps/vermilion_pokecenter.asm
+++ b/text/maps/vermilion_pokecenter.asm
@@ -1,5 +1,4 @@
 _VermilionPokecenterText2::
-_VermilionPokecenterText1::
 	text "Even if they are"
 	line "the same level,"
 	cont "#MON can have"
diff --git a/text/maps/viridian_mart.asm b/text/maps/viridian_mart.asm
index 4cc2ce19..5f4e147c 100644
--- a/text/maps/viridian_mart.asm
+++ b/text/maps/viridian_mart.asm
@@ -1,21 +1,3 @@
-_ViridianPokeCenterText2::
-_ViridianPokeCenterText1::
-	text "You can use that"
-	line "PC in the corner."
-
-	para "The receptionist"
-	line "told me. So kind!"
-	done
-
-_ViridianPokeCenterText3::
-	text "There's a #MON"
-	line "CENTER in every"
-	cont "town ahead."
-
-	para "They don't charge"
-	line "any money either!"
-	done
-
 _ViridianMartText1::
 	text "Okay! Say hi to"
 	line "PROF.OAK for me!"
diff --git a/text/maps/viridian_pokecenter.asm b/text/maps/viridian_pokecenter.asm
new file mode 100755
index 00000000..4ac18bf6
--- /dev/null
+++ b/text/maps/viridian_pokecenter.asm
@@ -0,0 +1,16 @@
+_ViridianPokeCenterText2::
+	text "You can use that"
+	line "PC in the corner."
+
+	para "The receptionist"
+	line "told me. So kind!"
+	done
+
+_ViridianPokeCenterText3::
+	text "There's a #MON"
+	line "CENTER in every"
+	cont "town ahead."
+
+	para "They don't charge"
+	line "any money either!"
+	done
diff --git a/text/move_names.asm b/text/move_names.asm
index 92760d45..a9265f51 100644
--- a/text/move_names.asm
+++ b/text/move_names.asm
@@ -164,4 +164,3 @@ MoveNames:: ; b0000 (2c:4000)
 	db "SLASH@"
 	db "SUBSTITUTE@"
 	db "STRUGGLE@"
-
diff --git a/text/oakspeech.asm b/text/oakspeech.asm
index 91aaf5c3..5911092c 100644
--- a/text/oakspeech.asm
+++ b/text/oakspeech.asm
@@ -53,4 +53,3 @@ _OakSpeechText3::
 	cont "with #MON"
 	cont "awaits! Let's go!"
 	done
-
diff --git a/text/pokedex.asm b/text/pokedex.asm
index 22aa946e..7e84a83d 100644
--- a/text/pokedex.asm
+++ b/text/pokedex.asm
@@ -1506,4 +1506,3 @@ _MewDexEntry::
 	next "fine, delicate"
 	next "hair can be seen"
 	dex
-