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

1 files changed, 17 insertions, 17 deletions

diff --git a/text/SilphCo5F.asm b/text/SilphCo5F.asm
index 9c8bfd41..1a38d416 100644
--- a/text/SilphCo5F.asm
+++ b/text/SilphCo5F.asm
@@ -1,84 +1,84 @@
-_SilphCo5Text_1a010::
+_SilphCo5FSilphWorkerMThatsYouRightText::
 	text "TEAM ROCKET is"
 	line "in an uproar over"
 	cont "some intruder."
 	cont "That's you right?"
 	done
 
-_SilphCo5Text_1a015::
+_SilphCo5FSilphWorkerMYoureOurHeroText::
 	text "TEAM ROCKET took"
 	line "off! You're our"
 	cont "hero! Thank you!"
 	done
 
-_SilphCo5BattleText2::
+_SilphCo5FRocket1BattleText::
 	text "I heard a kid was"
 	line "wandering around."
 	done
 
-_SilphCo5EndBattleText2::
+_SilphCo5FRocket1EndBattleText::
 	text "Boom!"
 	prompt
 
-_SilphCo5AfterBattleText2::
+_SilphCo5FRocket1AfterBattleText::
 	text "It's not smart"
 	line "to pick a fight"
 	cont "with TEAM ROCKET!"
 	done
 
-_SilphCo5BattleText3::
+_SilphCo5FScientistBattleText::
 	text "We study #"
 	line "BALL technology"
 	cont "on this floor!"
 	done
 
-_SilphCo5EndBattleText3::
+_SilphCo5FScientistEndBattleText::
 	text "Dang!"
 	line "Blast it!"
 	prompt
 
-_SilphCo5AfterBattleText3::
+_SilphCo5FScientistAfterBattleText::
 	text "We worked on the"
 	line "ultimate #"
 	cont "BALL which would"
 	cont "catch anything!"
 	done
 
-_SilphCo5BattleText4::
+_SilphCo5FRockerBattleText::
 	text "Whaaat? There"
 	line "shouldn't be any"
 	cont "children here!"
 	done
 
-_SilphCo5EndBattleText4::
+_SilphCo5FRockerEndBattleText::
 	text "Oh"
 	line "goodness!"
 	prompt
 
-_SilphCo5AfterBattleText4::
+_SilphCo5FRockerAfterBattleText::
 	text "You're only on 5F."
 	line "It's a long way"
 	cont "to my BOSS!"
 	done
 
-_SilphCo5BattleText5::
+_SilphCo5FRocket2BattleText::
 	text "Show TEAM ROCKET"
 	line "a little respect!"
 	done
 
-_SilphCo5EndBattleText5::
+_SilphCo5FRocket2EndBattleText::
 	text "Cough..."
 	line "Cough..."
 	prompt
 
-_SilphCo5AfterBattleText5::
+_SilphCo5FRocket2AfterBattleText::
 	text "Which reminds me."
 
 	para "KOFFING evolves"
 	line "into WEEZING!"
 	done
 
-_SilphCo5Text9::
+_SilphCo5FPokemonReport1Text::
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -88,7 +88,7 @@ _SilphCo5Text9::
 	cont "reality #MON."
 	done
 
-_SilphCo5Text10::
+_SilphCo5FPokemonReport2Text::
 	text "It's a #MON"
 	line "REPORT!"
 
@@ -97,7 +97,7 @@ _SilphCo5Text10::
 	cont "been confirmed."
 	done
 
-_SilphCo5Text11::
+_SilphCo5FPokemonReport3Text::
 	text "It's a #MON"
 	line "REPORT!"