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

1 files changed, 24 insertions, 24 deletions

diff --git a/text/RockTunnelB1F.asm b/text/RockTunnelB1F.asm
index d0437de7..6dee59a2 100644
--- a/text/RockTunnelB1F.asm
+++ b/text/RockTunnelB1F.asm
@@ -1,129 +1,129 @@
-_RockTunnel2BattleText2::
+_RockTunnelB1FCooltrainerF1BattleText::
 	text "Hikers leave twigs"
 	line "as trail markers."
 	done
 
-_RockTunnel2EndBattleText2::
+_RockTunnelB1FCooltrainerF1EndBattleText::
 	text "Ohhh!"
 	line "I did my best!"
 	prompt
 
-_RockTunnel2AfterBattleText2::
+_RockTunnelB1FCooltrainerF1AfterBattleText::
 	text "I want to go "
 	line "home!"
 	done
 
-_RockTunnel2BattleText3::
+_RockTunnelB1FHiker1BattleText::
 	text "Hahaha! Can you"
 	line "beat my power?"
 	done
 
-_RockTunnel2EndBattleText3::
+_RockTunnelB1FHiker1EndBattleText::
 	text "Oops!"
 	line "Out-muscled!"
 	prompt
 
-_RockTunnel2AfterBattleText3::
+_RockTunnelB1FHiker1AfterBattleText::
 	text "I go for power"
 	line "because I hate"
 	cont "thinking!"
 	done
 
-_RockTunnel2BattleText4::
+_RockTunnelB1FSuperNerd1BattleText::
 	text "You have a"
 	line "#DEX?"
 	cont "I want one too!"
 	done
 
-_RockTunnel2EndBattleText4::
+_RockTunnelB1FSuperNerd1EndBattleText::
 	text "Shoot!"
 	line "I'm so jealous!"
 	prompt
 
-_RockTunnel2AfterBattleText4::
+_RockTunnelB1FSuperNerd1AfterBattleText::
 	text "When you finish"
 	line "your #DEX, can"
 	cont "I have it?"
 	done
 
-_RockTunnel2BattleText5::
+_RockTunnelB1FSuperNerd2BattleText::
 	text "Do you know about"
 	line "costume players?"
 	done
 
-_RockTunnel2EndBattleText5::
+_RockTunnelB1FSuperNerd2EndBattleText::
 	text "Well,"
 	line "that's that."
 	prompt
 
-_RockTunnel2AfterBattleText5::
+_RockTunnelB1FSuperNerd2AfterBattleText::
 	text "Costume players"
 	line "dress up as"
 	cont "#MON for fun."
 	done
 
-_RockTunnel2BattleText6::
+_RockTunnelB1FHiker2BattleText::
 	text "My #MON"
 	line "techniques will"
 	cont "leave you crying!"
 	done
 
-_RockTunnel2EndBattleText6::
+_RockTunnelB1FHiker2EndBattleText::
 	text "I give!"
 	line "You're a better"
 	cont "technician!"
 	prompt
 
-_RockTunnel2AfterBattleText6::
+_RockTunnelB1FHiker2AfterBattleText::
 	text "In mountains,"
 	line "you'll often find"
 	cont "rock-type #MON."
 	done
 
-_RockTunnel2BattleText7::
+_RockTunnelB1FCooltrainerF2BattleText::
 	text "I don't often"
 	line "come here, but I"
 	cont "will fight you."
 	done
 
-_RockTunnel2EndBattleText7::
+_RockTunnelB1FCooltrainerF2EndBattleText::
 	text "Oh!"
 	line "I lost!"
 	prompt
 
-_RockTunnel2AfterBattleText7::
+_RockTunnelB1FCooltrainerF2AfterBattleText::
 	text "I like tiny"
 	line "#MON, big ones"
 	cont "are too scary!"
 	done
 
-_RockTunnel2BattleText8::
+_RockTunnelB1FHiker3BattleText::
 	text "Hit me with your"
 	line "best shot!"
 	done
 
-_RockTunnel2EndBattleText8::
+_RockTunnelB1FHiker3EndBattleText::
 	text "Fired"
 	line "away!"
 	prompt
 
-_RockTunnel2AfterBattleText8::
+_RockTunnelB1FHiker3AfterBattleText::
 	text "I'll raise my"
 	line "#MON to beat"
 	cont "yours, kid!"
 	done
 
-_RockTunnel2BattleText9::
+_RockTunnelB1FSuperNerd3BattleText::
 	text "I draw #MON"
 	line "when I'm home."
 	done
 
-_RockTunnel2EndBattleText9::
+_RockTunnelB1FSuperNerd3EndBattleText::
 	text "Whew!"
 	line "I'm exhausted!"
 	prompt
 
-_RockTunnel2AfterBattleText9::
+_RockTunnelB1FSuperNerd3AfterBattleText::
 	text "I'm an artist,"
 	line "not a fighter."
 	done