Merge branch 'master' of https://github.com/pret/pokeemerald into intro

2 files changed, 30 insertions, 30 deletions

diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc
index 9e7eea3bc..1dfc0242b 100644
--- a/data/text/birch_speech.inc
+++ b/data/text/birch_speech.inc
@@ -1,4 +1,4 @@
-gUnknown_082C897B:: @ 82C897B
+gText_Birch_Welcome:: @ 82C897B
 	.string "Hi! Sorry to keep you waiting!\p"
 	.string "Welcome to the world of POKéMON!\p"
 	.string "My name is BIRCH.\p"
@@ -6,12 +6,12 @@ gUnknown_082C897B:: @ 82C897B
 	.string "PROFESSOR.\p"
 	.string "$"
 
-gUnknown_082C89FB:: @ 82C89FB
+gText_Birch_Pokemon:: @ 82C89FB
 	.string "This is what we call a “POKéMON.”\p"
 	.string "\n"
 	.string "$"
 
-gUnknown_082C8A1F:: @ 82C8A1F
+gText_Birch_MainSpeech:: @ 82C8A1F
 	.string "This world is widely inhabited by\n"
 	.string "creatures known as POKéMON.\p"
 	.string "We humans live alongside POKéMON,\n"
@@ -28,28 +28,28 @@ gUnknown_082C8A1F:: @ 82C8A1F
 	.string "That’s what I do.\p"
 	.string "$"
 
-gUnknown_082C8BD0:: @ 82C8BD0
+gText_Birch_AndYouAre:: @ 82C8BD0
 	.string "And you are?$"
 
-gUnknown_082C8BDD:: @ 82C8BDD
+gText_Birch_BoyOrGirl:: @ 82C8BDD
 	.string "Are you a boy?\n"
 	.string "Or are you a girl?$"
 
-gUnknown_082C8BFF:: @ 82C8BFF
+gText_Birch_WhatsYourName:: @ 82C8BFF
 	.string "All right.\n"
 	.string "What’s your name?$"
 
-gUnknown_082C8C1C:: @ 82C8C1C
+gText_Birch_SoItsPlayer:: @ 82C8C1C
 	.string "So it’s {PLAYER}{KUN}?$"
 
-gUnknown_082C8C2A:: @ 82C8C2A
+gText_Birch_YourePlayer:: @ 82C8C2A
 	.string "Ah, okay!\p"
 	.string "You’re {PLAYER}{KUN} who’s moving to my\n"
 	.string "hometown of LITTLEROOT.\l"
 	.string "I get it now!\p"
 	.string "$"
 
-gUnknown_082C8C7A:: @ 82C8C7A
+gText_Birch_AreYouReady:: @ 82C8C7A
 	.string "All right, are you ready?\p"
 	.string "Your very own adventure is about\n"
 	.string "to unfold.\p"
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 735488b37..666c90867 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -12,99 +12,99 @@ gUnknown_082A5D2C:: @ 82A5D2C
 	.string "So, you’ve seen {STR_VAR_1} POKéMON,\n"
 	.string "and you’ve caught {STR_VAR_2} POKéMON…$"
 
-gUnknown_082A5D6C:: @ 82A5D6C
+gBirchDexRatingText_LessThan10:: @ 82A5D6C
 	.string "Go into grassy areas more and look\n"
 	.string "for POKéMON more carefully.$"
 
-gUnknown_082A5DAB:: @ 82A5DAB
+gBirchDexRatingText_LessThan20:: @ 82A5DAB
 	.string "I guess you’re getting the hang\n"
 	.string "of it. But, it gets harder from here.$"
 
-gUnknown_082A5DF1:: @ 82A5DF1
+gBirchDexRatingText_LessThan30:: @ 82A5DF1
 	.string "Some POKéMON only appear in\n"
 	.string "certain areas.\l"
 	.string "You must be persistent.$"
 
-gUnknown_082A5E34:: @ 82A5E34
+gBirchDexRatingText_LessThan40:: @ 82A5E34
 	.string "Well, it could use more quantity,\n"
 	.string "but this is looking more like\l"
 	.string "a POKéDEX now.$"
 
-gUnknown_082A5E83:: @ 82A5E83
+gBirchDexRatingText_LessThan50:: @ 82A5E83
 	.string "This is coming along pretty good.\n"
 	.string "Keep up the effort.$"
 
-gUnknown_082A5EB9:: @ 82A5EB9
+gBirchDexRatingText_LessThan60:: @ 82A5EB9
 	.string "Are you using any RODS?\n"
 	.string "There are many POKéMON in the sea.$"
 
-gUnknown_082A5EF4:: @ 82A5EF4
+gBirchDexRatingText_LessThan70:: @ 82A5EF4
 	.string "Instead of just catching POKéMON,\n"
 	.string "how about making them evolve, too?$"
 
-gUnknown_082A5F39:: @ 82A5F39
+gBirchDexRatingText_LessThan80:: @ 82A5F39
 	.string "This is going to be a fantastic\n"
 	.string "POKéDEX.\l"
 	.string "That’s the feeling I’m getting.$"
 
-gUnknown_082A5F82:: @ 82A5F82
+gBirchDexRatingText_LessThan90:: @ 82A5F82
 	.string "You’ve collected this many…\n"
 	.string "Your talent is remarkable!$"
 
-gUnknown_082A5FB9:: @ 82A5FB9
+gBirchDexRatingText_LessThan100:: @ 82A5FB9
 	.string "Have you visited the SAFARI ZONE?\p"
 	.string "I hear there are some POKéMON that\n"
 	.string "can only be caught there.$"
 
-gUnknown_082A6018:: @ 82A6018
+gBirchDexRatingText_LessThan110:: @ 82A6018
 	.string "You’ve finally reached\n"
 	.string "the 100-kind mark.\p"
 	.string "This is an impressive POKéDEX!$"
 
-gUnknown_082A6061:: @ 82A6061
+gBirchDexRatingText_LessThan120:: @ 82A6061
 	.string "There might be POKéMON that can be\n"
 	.string "found using ROCK SMASH.$"
 
-gUnknown_082A609C:: @ 82A609C
+gBirchDexRatingText_LessThan130:: @ 82A609C
 	.string "You should get some more POKéMON\n"
 	.string "by trading with others.$"
 
-gUnknown_082A60D5:: @ 82A60D5
+gBirchDexRatingText_LessThan140:: @ 82A60D5
 	.string "I’ve heard of POKéMON that evolve\n"
 	.string "when they come to fully love their\l"
 	.string "TRAINERS.$"
 
-gUnknown_082A6124:: @ 82A6124
+gBirchDexRatingText_LessThan150:: @ 82A6124
 	.string "I had no idea that there were so\n"
 	.string "many POKéMON species in the HOENN\l"
 	.string "region.$"
 
-gUnknown_082A616F:: @ 82A616F
+gBirchDexRatingText_LessThan160:: @ 82A616F
 	.string "On occasion, some POKéMON appear\n"
 	.string "in large numbers like outbreaks.\p"
 	.string "Don’t miss opportunities like\n"
 	.string "those.$"
 
-gUnknown_082A61D6:: @ 82A61D6
+gBirchDexRatingText_LessThan170:: @ 82A61D6
 	.string "One can get a very good idea about\n"
 	.string "the POKéMON of the HOENN region\l"
 	.string "by looking through your POKéDEX.$"
 
-gUnknown_082A623A:: @ 82A623A
+gBirchDexRatingText_LessThan180:: @ 82A623A
 	.string "I would say you already qualify as\n"
 	.string "a POKéMON PROFESSOR, and a good\l"
 	.string "one, too!$"
 
-gUnknown_082A6287:: @ 82A6287
+gBirchDexRatingText_LessThan190:: @ 82A6287
 	.string "With a POKéDEX this complete,\n"
 	.string "you’re a real professional at this!$"
 
-gUnknown_082A62C9:: @ 82A62C9
+gBirchDexRatingText_LessThan200:: @ 82A62C9
 	.string "You’re very close to completing\n"
 	.string "this POKéDEX.\l"
 	.string "I can feel it in my bones!$"
 
-gUnknown_082A6312:: @ 82A6312
+gBirchDexRatingText_DexCompleted:: @ 82A6312
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"