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

1 files changed, 23 insertions, 23 deletions

diff --git a/text/ViridianForest.asm b/text/ViridianForest.asm
index f88a484c..2f4c147c 100644
--- a/text/ViridianForest.asm
+++ b/text/ViridianForest.asm
@@ -1,4 +1,4 @@
-_ViridianForestText1::
+_ViridianForestYoungster1Text::
 	text "I came here with"
 	line "some friends!"
 
@@ -6,53 +6,53 @@ _ViridianForestText1::
 	line "#MON fights!"
 	done
 
-_ViridianForestBattleText1::
+_ViridianForestYoungster2BattleText::
 	text "Hey! You have"
 	line "#MON! Come on!"
 	cont "Let's battle 'em!"
 	done
 
-_ViridianForestEndBattleText1::
+_ViridianForestYoungster2EndBattleText::
 	text "No!"
 	line "CATERPIE can't"
 	cont "cut it!"
 	prompt
 
-_ViridianFrstAfterBattleText1::
+_ViridianForestYoungster2AfterBattleText::
 	text "Ssh! You'll scare"
 	line "the bugs away!"
 	done
 
-_ViridianForestBattleText2::
+_ViridianForestYoungster3BattleText::
 	text "Yo! You can't jam"
 	line "out if you're a"
 	cont "#MON trainer!"
 	done
 
-_ViridianForestEndBattleText2::
+_ViridianForestYoungster3EndBattleText::
 	text "Huh?"
 	line "I ran out of"
 	cont "#MON!"
 	prompt
 
-_ViridianFrstAfterBattleText2::
+_ViridianForestYoungster3AfterBattleText::
 	text "Darn! I'm going"
 	line "to catch some"
 	cont "stronger ones!"
 	done
 
-_ViridianForestBattleText3::
+_ViridianForestYoungster4BattleText::
 	text "Hey, wait up!"
 	line "What's the hurry?"
 	done
 
-_ViridianForestEndBattleText3::
+_ViridianForestYoungster4EndBattleText::
 	text "I"
 	line "give! You're good"
 	cont "at this!"
 	prompt
 
-_ViridianFrstAfterBattleText3::
+_ViridianForestYoungster4AfterBattleText::
 	text "Sometimes, you"
 	line "can find stuff on"
 	cont "the ground!"
@@ -62,41 +62,41 @@ _ViridianFrstAfterBattleText3::
 	cont "dropped!"
 	done
 
-_ViridianForestBattleTextPikaGirl::
+_ViridianForestCooltrainerFBattleText::
 	text "Hi, do you have a"
 	line "PIKACHU?"
 	done
 
-_ViridianForestEndBattleTextPikaGirl::
+_ViridianForestCooltrainerFEndBattleText::
 	text "Oh no,"
 	line "really?"
 	prompt
 
-_ViridianForestAfterBattleTextPikaGirl::
+_ViridianForestCooltrainerFAfterBattleText::
 	text "I looked forever,"
 	line "but I never found"
 	cont "a PIKACHU here!"
 	done
 
-_ViridianForestBattleTextSamurai::
+_ViridianForestYoungster5BattleText::
 	text "I'm gonna be the"
 	line "best. You just"
 	cont "can't beat me!"
 	done
 
-_ViridianForestEndBattleTextSamurai::
+_ViridianForestYoungster5EndBattleText::
 	text "After"
 	line "all I did..."
 	prompt
 
-_ViridianForestAfterBattleTextSamurai::
+_ViridianForestYoungster5AfterBattleText::
 	text "A METAPOD is cool"
 	line "because its"
 	cont "attack is its"
 	cont "defense!"
 	done
 
-_ViridianForestText8::
+_ViridianForestYoungster6Text::
 	text "I ran out of #"
 	line "BALLs to catch"
 	cont "#MON with!"
@@ -105,7 +105,7 @@ _ViridianForestText8::
 	line "extras!"
 	done
 
-_ViridianForestText9::
+_ViridianForestTrainerTips1Text::
 	text "TRAINER TIPS"
 
 	para "If you want to"
@@ -114,13 +114,13 @@ _ViridianForestText9::
 	cont "grassy areas!"
 	done
 
-_ViridianForestText10::
+_ViridianForestUseAntidoteSignText::
 	text "For poison, use"
 	line "ANTIDOTE! Get it"
 	cont "at #MON MARTs!"
 	done
 
-_ViridianForestText11::
+_ViridianForestTrainerTips2Text::
 	text "TRAINER TIPS"
 
 	para "Contact PROF.OAK"
@@ -129,7 +129,7 @@ _ViridianForestText11::
 	cont "evaluated!"
 	done
 
-_ViridianForestText12::
+_ViridianForestTrainerTips3Text::
 	text "TRAINER TIPS"
 
 	para "No stealing of"
@@ -139,7 +139,7 @@ _ViridianForestText12::
 	cont "#MON!"
 	done
 
-_ViridianForestText13::
+_ViridianForestTrainerTips4Text::
 	text "TRAINER TIPS"
 
 	para "Weaken #MON"
@@ -150,7 +150,7 @@ _ViridianForestText13::
 	line "they may escape!"
 	done
 
-_ViridianForestText14::
+_ViridianForestLeavingSignText::
 	text "LEAVING"
 	line "VIRIDIAN FOREST"
 	cont "PEWTER CITY AHEAD"