Merge branch 'master' of https://github.com/pret/pokered

text/maps/celadon_dept_store_1f.asm

@@ -29,4 +29,3 @@ _CeladonMart1Text3::
 	text "1F: SERVICE"
 	line "    COUNTER"
 	done
-

text/maps/celadon_dept_store_2f.asm

@@ -20,4 +20,3 @@ _CeladonMart2Text5::
 	para "2F: TRAINER'S"
 	line "    MARKET"
 	done
-

text/maps/celadon_dept_store_3f.asm

@@ -96,4 +96,3 @@ _CeladonMart3Text15::
 	text "Red and Blue!"
 	line "Both are #MON!"
 	done
-

text/maps/celadon_dept_store_4f.asm

@@ -24,4 +24,3 @@ _CeladonMart4Text4::
 	line "Element STONEs on"
 	cont "sale now!"
 	done
-

text/maps/celadon_dept_store_5f.asm

@@ -26,4 +26,3 @@ _CeladonMart5Text2::
 _CeladonMart5Text5::
 	text "5F: DRUG STORE"
 	done
-

text/maps/celadon_dept_store_roof.asm

@@ -136,4 +136,3 @@ _VendingMachineText6::
 _VendingMachineText7::
 	text "Not thirsty!"
 	done
-

text/maps/celadon_pokecenter.asm

@@ -10,4 +10,3 @@ _CeladonPokecenterText3::
 	line "CYCLING ROAD from"
 	cont "FUCHSIA!"
 	done
-

text/maps/cerulean_mart.asm

@@ -17,4 +17,3 @@ _CeruleanMartText3::
 	line "make #MON go"
 	cont "up one level!"
 	done
-

text/maps/cerulean_pokecenter.asm

@@ -1,4 +1,4 @@
-_CeruleanPokecenterText1::
+_CeruleanPokecenterText2::
 	text "That BILL!"
 
 	para "I heard that"
@@ -22,4 +22,3 @@ _CeruleanPokecenterText3::
 	line "to boast about"
 	cont "their #MON?"
 	done
-

text/maps/cinnabar_mart.asm

@@ -8,4 +8,3 @@ _CinnabarMartText3::
 	text "It never hurts to"
 	line "have extra items!"
 	done
-

text/maps/cinnabar_pokecenter.asm

@@ -1,5 +1,4 @@
 _CinnabarPokecenterText2::
-_CinnabarPokecenterText1::
 	text "You can cancel"
 	line "evolution."
 
@@ -20,4 +19,3 @@ _CinnabarPokecenterText3::
 	para "I think it's"
 	line "worth a try!"
 	done
-

text/maps/fuchsia_mart.asm

@@ -12,4 +12,3 @@ _FuchsiaMartText3::
 	cont "up a #MON in"
 	cont "battle!"
 	done
-

text/maps/fuchsia_pokecenter.asm

@@ -18,4 +18,3 @@ _FuchsiaPokecenterText3::
 	cont "The HQ governs"
 	cont "all trainers."
 	done
-

text/maps/indigo_plateau_lobby.asm

@@ -1,4 +1,4 @@
-_IndigoPlateauLobbyText1::
+_IndigoPlateauLobbyText2::
 	text "Yo! Champ in"
 	line "making!"
 
@@ -23,4 +23,3 @@ _IndigoPlateauLobbyText3::
 	cont "next trainer!"
 	cont "Good luck!"
 	done
-

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."
 
@@ -28,4 +28,3 @@ _LavenderMart_5c958::
 	line "useless, but it"
 	cont "sold for ¥5000!"
 	done
-

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!"
@@ -12,4 +10,3 @@ _LavenderPokecenterText3::
 	cont "to escape from"
 	cont "TEAM ROCKET!"
 	done
-

text/maps/mt_moon_pokecenter.asm

@@ -16,7 +16,7 @@ _MtMoonPokecenterText3::
 	cont "news!"
 	done
 
-_MtMoonPokecenterText_4935c::
+_MagikarpSalesmanText1::
 	text "MAN: Hello, there!"
 	line "Have I got a deal"
 	cont "just for you!"
@@ -27,18 +27,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
@@ -46,4 +46,3 @@ _MtMoonPokecenterText_4936b::
 _MtMoonPokecenterText5::
 	db $0
 	done
-

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,11 +8,10 @@ _PewterMartText_74cc6::
 	line "and it cost ¥500!"
 	done
 
-_PewterMartText_74cd5::
+_PewterMartText3::
 	text "Good things can"
 	line "happen if you"
 	cont "raise #MON"
 	cont "diligently, even"
 	cont "the weak ones!"
 	done
-

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
 
-_PewterPokecenterText5::
+_PewterJigglypuffText::
 	text "JIGGLYPUFF: Puu"
 	line "pupuu!"
 	done

text/maps/rock_tunnel_pokecenter.asm

@@ -1,4 +1,4 @@
-_RockTunnelPokecenterText1::
+_RockTunnelPokecenterText2::
 	text "The element types"
 	line "of #MON make"
 	cont "them stronger"
@@ -11,4 +11,3 @@ _RockTunnelPokecenterText3::
 	text "I sold a useless"
 	line "NUGGET for ¥5000!"
 	done
-

text/maps/saffron_mart.asm

@@ -11,4 +11,3 @@ _SaffronMartText3::
 	line "but it revives"
 	cont "fainted #MON!"
 	done
-

text/maps/saffron_pokecenter.asm

@@ -1,4 +1,4 @@
-_SaffronPokecenterText1::
+_SaffronPokecenterText2::
 	text "#MON growth"
 	line "rates differ from"
 	cont "specie to specie."
@@ -10,4 +10,3 @@ _SaffronPokecenterText3::
 	cont "why it attracted"
 	cont "TEAM ROCKET!"
 	done
-

text/maps/seafoam_islands_b4f.asm

@@ -1,4 +1,4 @@
-_SeafoamIslands5BattleText2::
+_ArticunoBattleText::
 	text "Gyaoo!@@"
 
 _SeafoamIslands5Text4::

text/maps/unknown_dungeon_b1f.asm

@@ -1,3 +1,3 @@
-_UnknownDungeon3MewtwoText::
+_MewtwoBattleText::
 	text "Mew!@@"
 

text/maps/vermilion_mart.asm

@@ -21,4 +21,3 @@ _VermilionMartText3::
 	cont "evil. It depends"
 	cont "on the trainer."
 	done
-

text/maps/vermilion_pokecenter.asm

@@ -1,5 +1,4 @@
 _VermilionPokecenterText2::
-_VermilionPokecenterText1::
 	text "Even if they are"
 	line "the same level,"
 	cont "#MON can have"
@@ -18,4 +17,3 @@ _VermilionPokecenterText3::
 	cont "fainted while we"
 	cont "were walking!"
 	done
-

text/maps/victory_road_2f.asm

@@ -1,4 +1,4 @@
-_VictoryRoad2BattleText6::
+_MoltresBattleText::
 	text "Gyaoo!@@"
 
 _VictoryRoad2BattleText1::

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!"

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