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

1 files changed, 19 insertions, 19 deletions

diff --git a/text/SilphCo6F.asm b/text/SilphCo6F.asm
index 90456b5c..86581c24 100644
--- a/text/SilphCo6F.asm
+++ b/text/SilphCo6F.asm
@@ -1,77 +1,77 @@
-_SilphCo6Text_1a24a::
+_SilphCo6FSilphWorkerM1TookOverTheBuildingText::
 	text "The ROCKETs came"
 	line "and took over the"
 	cont "building!"
 	done
 
-_SilphCo6Text_1a24f::
+_SilphCo6FSilphWorkerM1BackToWorkText::
 	text "Well, better get"
 	line "back to work!"
 	done
 
-_SilphCo6Text_1a261::
+_SilphCo6FSilphWorkerMHelpMePleaseText::
 	text "Oh dear, oh dear."
 	line "Help me please!"
 	done
 
-_SilphCo6Text_1a266::
+_SilphCo6FSilphWorkerMWeGotEngagedText::
 	text "We got engaged!"
 	line "Heheh!"
 	done
 
-_SilphCo6Text_1a278::
+_SilphCo6FSilphWorkerF1SuchACowardText::
 	text "Look at him! He's"
 	line "such a coward!"
 	done
 
-_SilphCo6Text_1a27d::
+_SilphCo6FSilphWorkerF1HaveToMarryHimText::
 	text "I feel so sorry"
 	line "for him, I have"
 	cont "to marry him!"
 	done
 
-_SilphCo6Text_1a28f::
+_SilphCo6FSilphWorkerF2TeamRocketConquerWorldText::
 	text "TEAM ROCKET is"
 	line "trying to conquer"
 	cont "the world with"
 	cont "#MON!"
 	done
 
-_SilphCo6Text_1a294::
+_SilphCo6FSilphWorkerF2TeamRocketRanText::
 	text "TEAM ROCKET ran"
 	line "because of you!"
 	done
 
-_SilphCo6Text_1a2a6::
+_SilphCo6FSilphWorkerM3TargetedSilphText::
 	text "They must have"
 	line "targeted SILPH"
 	cont "for our #MON"
 	cont "products."
 	done
 
-_SilphCo6Text_1a2ab::
+_SilphCo6FSilphWorkerM3WorkForSilphText::
 	text "Come work for"
 	line "SILPH when you"
 	cont "get older!"
 	done
 
-_SilphCo6BattleText2::
+_SilphCo6FRocket1BattleText::
 	text "I am one of the 4"
 	line "ROCKET BROTHERS!"
 	done
 
-_SilphCo6EndBattleText2::
+_SilphCo6Rocket1EndBattleText::
 	text "Flame"
 	line "out!"
 	prompt
 
-_SilphCo6AfterBattleText2::
+_SilphCo6Rocket1AfterBattleText::
 	text "No matter!"
 	line "My brothers will"
 	cont "avenge me!"
 	done
 
-_SilphCo6BattleText3::
+_SilphCo6FScientistBattleText::
 	text "That rotten"
 	line "PRESIDENT!"
 
@@ -80,27 +80,27 @@ _SilphCo6BattleText3::
 	cont "TIKSI BRANCH!"
 	done
 
-_SilphCo6EndBattleText3::
+_SilphCo6FScientistEndBattleText::
 	text "Shoot!"
 	prompt
 
-_SilphCo6AfterBattleText3::
+_SilphCo6FScientistAfterBattleText::
 	text "TIKSI BRANCH?"
 	line "It's in Russian"
 	cont "no man's land!"
 	done
 
-_SilphCo6BattleText4::
+_SilphCo6FRocket2BattleText::
 	text "You dare betray"
 	line "TEAM ROCKET?"
 	done
 
-_SilphCo6EndBattleText4::
+_SilphCo6FRocket2EndBattleText::
 	text "You"
 	line "traitor!"
 	prompt
 
-_SilphCo6AfterBattleText4::
+_SilphCo6FRocket2AfterBattleText::
 	text "If you stand for"
 	line "justice, you"
 	cont "betray evil!"