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

1 files changed, 34 insertions, 34 deletions

diff --git a/text/OaksLab.asm b/text/OaksLab.asm
index 7e78f8f5..606ade96 100644
--- a/text/OaksLab.asm
+++ b/text/OaksLab.asm
@@ -1,4 +1,4 @@
-_OaksLabGaryText1::
+_OaksLabRivalGrampsIsntAroundText::
 	text "<RIVAL>: Yo"
 	line "<PLAYER>! Gramps"
 	cont "isn't around!"
@@ -8,30 +8,30 @@ _OaksLabGaryText1::
 	cont "#MON for me."
 	done
 
-_OaksLabText40::
+_OaksLabRivalIllGetABetterPokemonThanYou::
 	text "<RIVAL>: Humph!"
 	line "I'll get a better"
 	cont "#MON than you!"
 	done
 
-_OaksLabText41::
+_OaksLabRivalMyPokemonLooksStrongerText::
 	text "<RIVAL>: Heh, my"
 	line "#MON looks a"
 	cont "lot stronger."
 	done
 
-_OaksLabText39::
+_OaksLabThatsAPokeball::
 	text "That's a #"
 	line "BALL. There's a"
 	cont "#MON inside!"
 	done
 
-_OaksLabPikachuText::
+_OaksLabOak1GoAheadItsYours::
 	text "OAK: Go ahead,"
 	line "it's yours!"
 	done
 
-_OaksLabText_1d2f5::
+_OaksLabOak1YourPokemonCanFightText::
 	text "OAK: If a wild"
 	line "#MON appears,"
 	cont "your #MON can"
@@ -41,13 +41,13 @@ _OaksLabText_1d2f5::
 	line "to the next town."
 	done
 
-_OaksLabText_1d2fa::
+_OaksLabOak1YouShouldTalkToIt::
 	text "OAK: You should"
 	line "talk to it and"
 	cont "see how it feels."
 	done
 
-_OaksLabDeliverParcelText1::
+_OaksLabOak1DeliverParcelText::
 	text "OAK: Oh, <PLAYER>!"
 
 	para "How is my old"
@@ -67,7 +67,7 @@ _OaksLabDeliverParcelText1::
 	line "OAK's PARCEL.@"
 	text_end
 
-_OaksLabDeliverParcelText2::
+_OaksLabOak1ParcelThanksText::
 	text_start
 	para "Ah! This is the"
 	line "custom # BALL"
@@ -79,13 +79,13 @@ _OaksLabDeliverParcelText2::
 	cont "something for me."
 	done
 
-_OaksLabAroundWorldText::
+_OaksLabOak1PokemonAroundTheWorldText::
 	text "#MON around the"
 	line "world wait for"
 	cont "you, <PLAYER>!"
 	done
 
-_OaksLabGivePokeballsText1::
+_OaksLabOak1ReceivedPokeballsText::
 	text "OAK: You can't get"
 	line "detailed data on"
 	cont "#MON by just"
@@ -100,7 +100,7 @@ _OaksLabGivePokeballsText1::
 	line "# BALLs!@"
 	text_end
 
-_OaksLabGivePokeballsText2::
+_OaksLabGivePokeballsExplanationText::
 	text_start
 	para "When a wild"
 	line "#MON appears,"
@@ -119,7 +119,7 @@ _OaksLabGivePokeballsText2::
 	cont "have to be lucky!"
 	done
 
-_OaksLabPleaseVisitText::
+_OaksLabOak1ComeSeeMeSometimesText::
 	text "OAK: Come see me"
 	line "sometimes."
 
@@ -128,7 +128,7 @@ _OaksLabPleaseVisitText::
 	cont "coming along."
 	done
 
-_OaksLabText_1d31d::
+_OaksLabOak1HowIsYourPokedexComingText::
 	text "OAK: Good to see "
 	line "you! How is your "
 	cont "#DEX coming? "
@@ -136,17 +136,17 @@ _OaksLabText_1d31d::
 	cont "a look!"
 	prompt
 
-_OaksLabText_1d32c::
+_OaksLabPokedexText::
 	text "It's encyclopedia-"
 	line "like, but the"
 	cont "pages are blank!"
 	done
 
-_OaksLabText8::
+_OaksLabOak2Text::
 	text "?"
 	done
 
-_OaksLabText_1d340::
+_OaksLabGirlText::
 	text "PROF.OAK is the"
 	line "authority on"
 	cont "#MON!"
@@ -156,13 +156,13 @@ _OaksLabText_1d340::
 	cont "in high regard!"
 	done
 
-_OaksLabRivalWaitingText::
+_OaksLabRivalFedUpWithWaitingText::
 	text "<RIVAL>: Gramps!"
 	line "I'm fed up with"
 	cont "waiting!"
 	done
 
-_OaksLabChooseMonText::
+_OaksLabOakChooseMonText::
 	text "OAK: Hmm? <RIVAL>?"
 	line "Why are you here"
 	cont "already?"
@@ -185,13 +185,13 @@ _OaksLabChooseMonText::
 	line "Go on, take it!"
 	done
 
-_OaksLabRivalInterjectionText::
+_OaksLabRivalWhatAboutMeText::
 	text "<RIVAL>: Hey!"
 	line "Gramps! What"
 	cont "about me?"
 	done
 
-_OaksLabBePatientText::
+_OaksLabOakBePatientText::
 	text "OAK: Be patient,"
 	line "<RIVAL>, I'll give"
 	cont "you one later."
@@ -250,12 +250,12 @@ _OaksLabReceivedText::
 	text "!@"
 	text_end
 
-_OaksLabLeavingText::
+_OaksLabOakDontGoAwayYetText::
 	text "OAK: Hey! Don't go"
 	line "away yet!"
 	done
 
-_OaksLabRivalChallengeText::
+_OaksLabRivalIllTakeYouOnText::
 	text "<RIVAL>: Wait"
 	line "<PLAYER>!"
 	cont "Let's check out"
@@ -265,19 +265,19 @@ _OaksLabRivalChallengeText::
 	line "you on!"
 	done
 
-_OaksLabText_1d3be::
+_OaksLabRivalIPickedTheWrongPokemonText::
 	text "WHAT?"
 	line "Unbelievable!"
 	cont "I picked the"
 	cont "wrong #MON!"
 	prompt
 
-_OaksLabText_1d3c3::
+_OaksLabRivalAmIGreatOrWhatText::
 	text "<RIVAL>: Yeah! Am"
 	line "I great or what?"
 	prompt
 
-_OaksLabRivalToughenUpText::
+_OaksLabRivalSmellYouLaterText::
 	text "<RIVAL>: Okay!"
 	line "I'll make my"
 	cont "#MON fight to"
@@ -311,18 +311,18 @@ _OaksLabPikachuDislikesPokeballsText2::
 	cont "feels about you."
 	done
 
-_OaksLabText21::
+_OaksLabRivalGrampsText::
 	text "<RIVAL>: Gramps!"
 	done
 
-_OaksLabText22::
+_OaksLabRivalMyPokemonHasGrownStrongerText::
 	text "<RIVAL>: Gramps,"
 	line "my #MON has"
 	cont "grown stronger!"
 	cont "Check it out!"
 	done
 
-_OaksLabText23::
+_OaksLabOakIHaveARequestText::
 	text "OAK: Ah, <RIVAL>,"
 	line "good timing!"
 
@@ -331,7 +331,7 @@ _OaksLabText23::
 	cont "something for me."
 	done
 
-_OaksLabText24::
+_OaksLabOakMyInventionPokedexText::
 	text "On the desk there"
 	line "is my invention,"
 	cont "#DEX!"
@@ -345,7 +345,7 @@ _OaksLabText24::
 	line "encyclopedia!"
 	done
 
-_OaksLabText25::
+_OaksLabOakGotPokedexText::
 	text "OAK: <PLAYER> and"
 	line "<RIVAL>! Take"
 	cont "these with you!"
@@ -354,7 +354,7 @@ _OaksLabText25::
 	line "#DEX from OAK!@"
 	text_end
 
-_OaksLabText26::
+_OaksLabOakThatWasMyDreamText::
 	text "To make a complete"
 	line "guide on all the"
 	cont "#MON in the"
@@ -377,7 +377,7 @@ _OaksLabText26::
 	cont "#MON history!"
 	done
 
-_OaksLabText27::
+_OaksLabRivalLeaveItAllToMeText::
 	text "<RIVAL>: Alright"
 	line "Gramps! Leave it"
 	cont "all to me!"
@@ -395,7 +395,7 @@ _OaksLabText27::
 	cont "<PLAYER>! Hahaha!"
 	done
 
-_OaksLabText_1d405::
+_OaksLabScientistText::
 	text "I study #MON as"
 	line "PROF.OAK's AIDE."
 	done