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

1 files changed, 22 insertions, 22 deletions

diff --git a/text/MtMoon1F.asm b/text/MtMoon1F.asm
index 2e8c960e..a7964604 100644
--- a/text/MtMoon1F.asm
+++ b/text/MtMoon1F.asm
@@ -1,119 +1,119 @@
-_MtMoon1BattleText2::
+_MtMoon1FHikerBattleText::
 	text "WHOA! You shocked"
 	line "me! Oh, you're"
 	cont "just a kid!"
 	done
 
-_MtMoon1EndBattleText2::
+_MtMoon1FHikerEndBattleText::
 	text "Wow!"
 	line "Shocked again!"
 	prompt
 
-_MtMoon1AfterBattleText2::
+_MtMoon1FHikerAfterBattleText::
 	text "Kids like you"
 	line "shouldn't be"
 	cont "here!"
 	done
 
-_MtMoon1BattleText3::
+_MtMoon1FYoungster1BattleText::
 	text "Did you come to"
 	line "explore too?"
 	done
 
-_MtMoon1EndBattleText3::
+_MtMoon1FYoungster1EndBattleText::
 	text "Losing"
 	line "stinks!"
 	prompt
 
-_MtMoon1AfterBattleText3::
+_MtMoon1FYoungster1AfterBattleText::
 	text "I came down here"
 	line "to show off to"
 	cont "girls."
 	done
 
-_MtMoon1BattleText4::
+_MtMoon1FCooltrainerF1BattleText::
 	text "Wow! It's way"
 	line "bigger in here"
 	cont "than I thought!"
 	done
 
-_MtMoon1EndBattleText4::
+_MtMoon1FCooltrainerF1EndBattleText::
 	text "Oh!"
 	line "I lost it!"
 	prompt
 
-_MtMoon1AfterBattleText4::
+_MtMoon1FCooltrainerF1AfterBattleText::
 	text "How do you get"
 	line "out of here?"
 	done
 
-_MtMoon1BattleText5::
+_MtMoon1FSuperNerdBattleText::
 	text "What! Don't sneak"
 	line "up on me!"
 	done
 
-_MtMoon1EndBattleText5::
+_MtMoon1FSuperNerdEndBattleText::
 	text "My"
 	line "#MON won't do!"
 	prompt
 
-_MtMoon1AfterBattleText5::
+_MtMoon1FSuperNerdAfterBattleText::
 	text "I have to find"
 	line "stronger #MON."
 	done
 
-_MtMoon1BattleText6::
+_MtMoon1FCooltrainerF2BattleText::
 	text "What? I'm waiting"
 	line "for my friends to"
 	cont "find me here."
 	done
 
-_MtMoon1EndBattleText6::
+_MtMoon1FCooltrainerF2EndBattleText::
 	text "I lost?"
 	prompt
 
-_MtMoon1AfterBattleText6::
+_MtMoon1FCooltrainerF2AfterBattleText::
 	text "I heard there are"
 	line "some very rare"
 	cont "fossils here."
 	done
 
-_MtMoon1BattleText7::
+_MtMoon1FYoungster2BattleText::
 	text "Suspicious men"
 	line "are in the cave."
 	cont "What about you?"
 	done
 
-_MtMoon1EndBattleText7::
+_MtMoon1FYoungster2EndBattleText::
 	text "You"
 	line "got me!"
 	prompt
 
-_MtMoon1AfterBattleText7::
+_MtMoon1FYoungster2AfterBattleText::
 	text "I saw them! I'm"
 	line "sure they're from"
 	cont "TEAM ROCKET!"
 	done
 
-_MtMoon1BattleText8::
+_MtMoon1FYoungster3BattleText::
 	text "Go through this"
 	line "cave to get to"
 	cont "CERULEAN CITY!"
 	done
 
-_MtMoon1EndBattleText8::
+_MtMoon1FYoungster3EndBattleText::
 	text "I"
 	line "lost."
 	prompt
 
-_MtMoon1AfterBattleText8::
+_MtMoon1FYoungster3AfterBattleText::
 	text "ZUBAT is tough!"
 	line "But, it can be"
 	cont "useful if you"
 	cont "catch one."
 	done
 
-_MtMoon1Text14::
+_MtMoon1FBewareZubatSign::
 	text "Beware! ZUBAT is"
 	line "a bloodsucker!"
 	done