Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

data/text/new_game_intro.inc

@@ -124,41 +124,41 @@ gNameChoice_Momo::
 gNameChoice_Suzi::
     .string "SUZI$"
 
-gNewGame_HelpDocs1::
+gControlsGuide_Text_Intro::
     .string "The various buttons will be explained in\n"
     .string "the order of their importance.$"
 
-gNewGame_HelpDocs2::
+gControlsGuide_Text_DPad::
     .string "Moves the main character.\n"
     .string "Also used to choose various data\n"
     .string "headings.$"
 
-gNewGame_HelpDocs3::
+gControlsGuide_Text_AButton::
     .string "Used to confirm a choice, check\n"
     .string "things, chat, and scroll text.$"
 
-gNewGame_HelpDocs4::
+gControlsGuide_Text_BButton::
     .string "Used to exit, cancel a choice,\n"
     .string "and cancel a mode.$"
 
-gNewGame_HelpDocs5::
+gControlsGuide_Text_StartButton::
     .string "Press this button to open the\n"
     .string "MENU.$"
 
-gNewGame_HelpDocs6::
+gControlsGuide_Text_SelectButton::
     .string "Used to shift items and to use\n"
     .string "a registered item.$"
 
-gNewGame_HelpDocs7::
+gControlsGuide_Text_LRButtons::
     .string "If you need help playing the\n"
     .string "game, or on how to do things,\n"
     .string "press the L or R Button.$"
 
-gOakText_AskPlayerGender::
+gOakSpeech_Text_AskPlayerGender::
     .string "Now tell me. Are you a boy?\n"
     .string "Or are you a girl?$"
 
-gNewGameAdventureIntro1::
+gPikachuIntro_Text_Page1::
     .string "In the world which you are about to\n"
     .string "enter, you will embark on a grand\n"
     .string "adventure with you as the hero.\n"
@@ -168,7 +168,7 @@ gNewGameAdventureIntro1::
     .string "or caves. Gather information and\n"
     .string "hints from every source.$"
 
-gNewGameAdventureIntro2::
+gPikachuIntro_Text_Page2::
     .string "New paths will open to you by helping\n"
     .string "people in need, overcoming challenges,\n"
     .string "and solving mysteries.\n"
@@ -177,7 +177,7 @@ gNewGameAdventureIntro2::
     .string "others and attacked by wild creatures.\n"
     .string "Be brave and keep pushing on.$"
 
-gNewGameAdventureIntro3::
+gPikachuIntro_Text_Page3::
     .string "Through your adventure, we hope\n"
     .string "that you will interact with all sorts\n"
     .string "of people and achieve personal growth.\n"
@@ -186,49 +186,58 @@ gNewGameAdventureIntro3::
     .string "Press the A Button, and let your\n"
     .string "adventure begin!$"
 
-gOakText_WelcomeToTheWorld::
+gOakSpeech_Text_WelcomeToTheWorld::
     .string "Hello, there!\n"
-    .string "Glad to meet you!\pWelcome to the world of POKéMON!\pMy name is OAK.\pPeople affectionately refer to me\n"
+    .string "Glad to meet you!\p"
+    .string "Welcome to the world of POKéMON!\p"
+    .string "My name is OAK.\p"
+    .string "People affectionately refer to me\n"
     .string "as the POKéMON PROFESSOR.\p$"
 
-gOakText_WorldInhabited1::
+gOakSpeech_Text_ThisWorld::
     .string "This world…$"
 
-gOakText_WorldInhabited2::
+gOakSpeech_Text_IsInhabitedFarAndWide::
     .string "…is inhabited far and wide by\n"
     .string "creatures called POKéMON.\p$"
 
-gOakText_PetsBattlingStudy::
+gOakSpeech_Text_IStudyPokemon::
     .string "For some people, POKéMON are pets.\n"
-    .string "Others use them for battling.\pAs for myself…\pI study POKéMON as a profession.\p$"
+    .string "Others use them for battling.\p"
+    .string "As for myself…\p"
+    .string "I study POKéMON as a profession.\p$"
 
-gOakText_TellMeALittleAboutYourself::
+gOakSpeech_Text_TellMeALittleAboutYourself::
     .string "But first, tell me a little about\n"
     .string "yourself.\p$"
 
-gOakText_AskPlayerName::
+gOakSpeech_Text_YourNameWhatIsIt::
     .string "Let's begin with your name.\n"
     .string "What is it?\p$"
 
-gOakText_FinalizePlayerName::
+gOakSpeech_Text_SoYourNameIsPlayer::
     .string "Right…\n"
     .string "So your name is {PLAYER}.$"
 
-gOakText_IntroduceRival::
-    .string "This is my grandson.\pHe's been your rival since you both\n"
-    .string "were babies.\p…Erm, what was his name now?$"
+gOakSpeech_Text_WhatWasHisName::
+    .string "This is my grandson.\p"
+    .string "He's been your rival since you both\n"
+    .string "were babies.\p"
+    .string "…Erm, what was his name now?$"
 
-gOakText_AskRivalName::
+gOakSpeech_Text_YourRivalsNameWhatWasIt::
     .string "Your rival's name, what was it now?$"
 
-gOakText_ConfirmRivalName::
+gOakSpeech_Text_ConfirmRivalName::
     .string "…Er, was it {RIVAL}?$"
 
-gOakText_RememberRivalName::
+gOakSpeech_Text_RememberRivalsName::
     .string "That's right! I remember now!\n"
     .string "His name is {RIVAL}!\p$"
 
-gOakText_LegendAboutToUnfold::
-    .string "{PLAYER}!\pYour very own POKéMON legend is\n"
-    .string "about to unfold!\pA world of dreams and adventures\n"
+gOakSpeech_Text_LetsGo::
+    .string "{PLAYER}!\p"
+    .string "Your very own POKéMON legend is\n"
+    .string "about to unfold!\p"
+    .string "A world of dreams and adventures\n"
     .string "with POKéMON awaits! Let's go!$"