Merge branch 'master' into document-gyms2

3 files changed, 534 insertions, 49 deletions

diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc
index e69de29bb..85e0e4edb 100644
--- a/data/text/cable_club.inc
+++ b/data/text/cable_club.inc
@@ -0,0 +1,485 @@
+CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4
+	.string "Welcome to the POKéMON CABLE\n"
+	.string "CLUB.\p"
+	.string "Which of our services do you wish\n"
+	.string "to use?$"
+
+CableClub_Text_WhichService: @ 8277EF1
+	.string "Which of our services do you wish\n"
+	.string "to use?$"
+
+CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
+	.string "Trade POKéMON with another player\n"
+	.string "using a GBA Game Link cable.$"
+
+CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
+	.string "You may battle another TRAINER\n"
+	.string "using a GBA Game Link cable.$"
+
+CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
+	.string "You can use the RECORD CORNER with\n"
+	.string "others using a GBA Game Link cable.$"
+
+@ Unused
+CableClub_Text_CloseThisMenu: @ 8277FDD
+	.string "Close this menu.$"
+
+CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE
+	.string "For a DOUBLE BATTLE, you must\n"
+	.string "have at least two POKéMON.$"
+
+CableClub_Text_NeedTwoMonsToTrade: @ 8278027
+	.string "For trading, you must have at\n"
+	.string "least two POKéMON with you.$"
+
+CableClub_Text_CantTradeEnigmaBerry: @ 8278061
+	.string "A POKéMON holding the {STR_VAR_1}\n"
+	.string "BERRY can't be traded.$"
+
+gText_PleaseWaitForLink:: @ 8278091
+	.string "Please wait.\n"
+	.string "… … B Button: Cancel$"
+
+gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
+	.string "When all players are ready…\n"
+	.string "A Button: Confirm\l"
+	.string "B Button: Cancel$"
+
+gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
+	.string "Start link with {STR_VAR_1} players.\n"
+	.string "A Button: Confirm\l"
+	.string "B Button: Cancel$"
+
+gText_AwaitingLinkup:: @ 8278131
+	.string "Awaiting linkup…\n"
+	.string "… … B Button: Cancel$"
+
+@ Unused
+CableClub_Text_OkayToSaveProgress:: @ 8278157
+	.string "Your progress must be saved before\n"
+	.string "linking. Is it okay to save?$"
+
+CableClub_Text_PleaseEnter: @ 8278197
+	.string "Please enter.$"
+
+CableClub_Text_DirectYouToYourRoom: @ 82781A5
+	.string "I'll direct you to your room now.$"
+
+Text_SomeoneIsNotReadyToLink: @ 82781C7
+	.string "Someone is not ready to link.\p"
+	.string "Please come back after everyone\n"
+	.string "has made preparations.$"
+
+Text_LinkErrorPleaseReset: @ 827821C
+	.string "Sorry, we have a link error…\n"
+	.string "Please reset and try again.$"
+
+Text_PlayersMadeDifferentSelections: @ 8278255
+	.string "The link partners appear to have\n"
+	.string "made different selections.$"
+
+CableClub_Text_PleaseVisitAgain: @ 8278291
+	.string "Please do visit again.$"
+
+CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8
+	.string "The number of participants is\n"
+	.string "incorrect.$"
+
+CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1
+	.string "The SINGLE BATTLE Mode can't be\n"
+	.string "played by {STR_VAR_1} players.$"
+
+CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307
+	.string "The DOUBLE BATTLE Mode can't be\n"
+	.string "played by {STR_VAR_1} players.$"
+
+CableClub_Text_NeedFourPlayers: @ 827833D
+	.string "There must be four players to play\n"
+	.string "this Battle Mode.$"
+
+CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372
+	.string "Please confirm the number of\n"
+	.string "players and start again.$"
+
+Text_TerminateLinkConfirmation: @ 82783A8
+	.string "The link will be terminated if you\n"
+	.string "leave the room. Is that okay?$"
+
+Text_TerminateLinkPleaseWait: @ 82783E9
+	.string "Terminating link…\n"
+	.string "You will be escorted out of\l"
+	.string "the room. Please wait.$"
+
+CableClub_Text_TooBusyToNotice: @ 827842E
+	.string "This TRAINER is too busy to\n"
+	.string "notice…$"
+
+CableClub_Text_GotToLookAtTrainerCard: @ 8278452
+	.string "Score! Got to look at {STR_VAR_1}'s\n"
+	.string "TRAINER CARD!$"
+
+CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
+	.string "Score! Got to look at {STR_VAR_1}'s\n"
+	.string "TRAINER CARD!\p"
+	.string "It's a {STR_VAR_2} card!$"
+
+SingleBattleColosseum_Text_TakePlaceStartBattle: @ 82784B4
+	.string "Please take your place and start\n"
+	.string "your battle.$"
+
+TradeCenter_Text_TakeSeatStartTrade: @ 82784E2
+	.string "Please take your seat and start\n"
+	.string "your trade.$"
+
+RecordCorner_Text_ThanksForComing: @ 827850E
+	.string "Thanks for coming.$"
+
+CableClub_Text_TrainerCardDataOverwritten: @ 8278521
+	.string "The TRAINER CARD data will\n"
+	.string "be overwritten.$"
+
+CableClub_Text_HopeToSeeYouAgain: @ 827854C
+	.string "I hope to see you again!$"
+
+CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565
+	.string "I'm awfully sorry.\p"
+	.string "We're not set up to conduct trades\n"
+	.string "with TRAINERS far away in another\l"
+	.string "region yet…$"
+
+CableClub_Text_OtherTrainerNotReady: @ 82785C9
+	.string "The other TRAINER is not ready.$"
+
+CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9
+	.string "You have at least one POKéMON\n"
+	.string "that can't be taken.$"
+
+RecordCorner_Text_TakeSeatAndWait: @ 827861C
+	.string "Please take your seat and wait.$"
+
+RecordCorner_Text_PlayerSentOverOneX: @ 827863C
+	.string "{STR_VAR_1} sent over one\n"
+	.string "{STR_VAR_2}.$"
+
+CableClub_Text_CantMixWithJapaneseGame: @ 8278651
+	.string "Sorry, there is a transmission error.\p"
+	.string "You may not mix records with  \n"
+	.string "Japanese Ruby or Sapphire games.\p"
+	.string "Also, you can't mix records with\n"
+	.string "Japanese Emerald and overseas Ruby\l"
+	.string "or Sapphire games at the same time.$"
+
+CableClub_Text_AdapterNotConnected: @ 827871F
+	.string "The Wireless Adapter is not\n"
+	.string "connected properly.$"
+
+CableClub_Text_ParticipantsStepUpToCounter: @ 827874F
+	.string "Participants are asked to step up\n"
+	.string "to the reception counter.$"
+
+@ Unused
+CableClub_Text_Hello: @ 827878B
+	.string "Hello!$"
+
+@ Unused
+CableClub_Text_PleaseWait: @ 8278792
+	.string "Please wait.$"
+
+CableClub_Text_YouMayTradeHere:: @ 827879F
+	.string "You may trade your POKéMON here\n"
+	.string "with another TRAINER.$"
+
+CableClub_Text_YouMayBattleHere:: @ 82787D5
+	.string "You may battle with your friends\n"
+	.string "here.$"
+
+CableClub_Text_CanMakeBerryPowder:: @ 82787FC
+	.string "Two to five TRAINERS can make\n"
+	.string "BERRY POWDER together.$"
+
+CableClub_Text_CanMixRecords:: @ 8278831
+	.string "The records of two to four players\n"
+	.string "can be mixed together.$"
+
+OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
+	.string "A guide to the WIRELESS CLUB's\n"
+	.string "various services.$"
+
+CableClub_Text_CancelSelectedItem:: @ 827889C
+	.string "Cancels the selected MENU item.$"
+
+OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC
+	.string "Which battle mode would you like?$"
+
+@ Unused
+CableClub_Text_ReturnsToPreviousStep: @ 82788DE
+	.string "Returns to the previous step.$"
+
+CableClub_Text_NeedBerryForBerryCrush: @ 82788FC
+	.string "To use the BERRY CRUSH service,\n"
+	.string "you must have at least one BERRY.$"
+
+CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E
+	.string "To enter the UNION ROOM, you must\n"
+	.string "have at least two POKéMON.$"
+
+CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B
+	.string "No POKéMON holding the {STR_VAR_1}\n"
+	.string "BERRY may enter the UNION ROOM.$"
+
+CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5
+	.string "This is the POKéMON WIRELESS CLUB\n"
+	.string "UNION ROOM.\p"
+	.string "Unfortunately, your Wireless\n"
+	.string "Adapter is not connected properly.\p"
+	.string "Please do come again.$"
+
+@ Unused
+CableClub_Text_OhExcuseMe: @ 8278A39
+	.string "Oh…\n"
+	.string "Excuse me!$"
+
+CableClub_Text_PlayerIsWaiting: @ 8278A48
+	.string "It appears as if {STR_VAR_1} is playing\n"
+	.string "right now.\l"
+	.string "Go for it!$"
+
+MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D
+	.string "I can explain game rules to you,\n"
+	.string "if you'd like.\p"
+	.string "Which game should I describe?$"
+
+MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB
+	.string "“POKéMON JUMP”\p"
+	.string "Make your POKéMON skip the VINE WHIP\n"
+	.string "rope with the A Button.\p"
+	.string "Only mini POKéMON around 28 inches\n"
+	.string "or less may participate.\p"
+	.string "POKéMON that only swim, burrow,\n"
+	.string "or fly are not good at jumping.\p"
+	.string "As a result, those POKéMON may not\n"
+	.string "participate.\p"
+	.string "Good things happen if everyone\n"
+	.string "jumps in time.$"
+
+MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1
+	.string "“DODRIO BERRY-PICKING”\p"
+	.string "Command DODRIO's three heads to\n"
+	.string "catch falling BERRIES.\p"
+	.string "Press right, up, or left on the\n"
+	.string "{PLUS} Control Pad to move the heads.\p"
+	.string "To play this game, you must have\n"
+	.string "a DODRIO.$"
+
+MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC
+	.string "If you want to play a game,\n"
+	.string "please tell the old man beside me.$"
+
+MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB
+	.string "Hi, welcome!\n"
+	.string "Are you here to play games using\l"
+	.string "Wireless Communication?\p"
+	.string "Can you wait just a little bit?$"
+
+MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51
+	.string "All right, come again!$"
+
+MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68
+	.string "The Wireless Adapter isn't connected.\n"
+	.string "Come back when it's hooked up!$"
+
+MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD
+	.string "All right, which game did you want\n"
+	.string "to play?$"
+
+MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9
+	.string "Which POKéMON would you like to\n"
+	.string "enter?$"
+
+MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00
+	.string "Okay, you're all good to go.\n"
+	.string "Don't let the others beat you!$"
+
+@ Unused
+MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C
+	.string "Are you leaving now?\n"
+	.string "Do come again!$"
+
+MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60
+	.string "It doesn't look like you have any\n"
+	.string "POKéMON that you can enter…\p"
+	.string "Would you like me to explain what\n"
+	.string "kinds of POKéMON can enter?$"
+
+MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC
+	.string "“POKéMON JUMP” is open to POKéMON\n"
+	.string "around 28 inches or less.\p"
+	.string "What you can't enter are those\n"
+	.string "POKéMON that can't jump.\p"
+	.string "You know, like POKéMON that only\n"
+	.string "swim, burrow, or fly.\p"
+	.string "That's all you need to know.$"
+
+MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4
+	.string "DODRIO BERRY-PICKING is a game that \n"
+	.string "only DODRIO may enter.$"
+
+@ Unused
+MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0
+	.string "Could you retry this from the start\n"
+	.string "again, please?$"
+
+CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
+	.string "Welcome to the POKéMON WIRELESS\n"
+	.string "CLUB DIRECT CORNER.\p"
+	.string "You may interact directly with\n"
+	.string "your friends here.\p"
+	.string "Which room would you like to\n"
+	.string "enter?$"
+
+CableClub_Text_TradePokemon: @ 827909D
+	.string "Would you like to trade POKéMON?$"
+
+CableClub_Text_WhichBattleMode: @ 82790BE
+	.string "Which Battle Mode would you like\n"
+	.string "to play?$"
+
+CableClub_Text_AccessRecordCorner: @ 82790E8
+	.string "Would you like to access\n"
+	.string "the RECORD CORNER?$"
+
+CableClub_Text_UseBerryCrush: @ 8279114
+	.string "Would you like to use the\n"
+	.string "BERRY CRUSH System?$"
+
+CableClub_Text_ExplainBattleModes: @ 8279142
+	.string "There are three Battle Modes.\p"
+	.string "SINGLE BATTLE is for two TRAINERS\n"
+	.string "with one or more POKéMON each.\p"
+	.string "Each TRAINER can have one POKéMON\n"
+	.string "in battle at a time.\p"
+	.string "DOUBLE BATTLE is for two TRAINERS\n"
+	.string "with two or more POKéMON each.\p"
+	.string "Each TRAINER will send out two\n"
+	.string "POKéMON in battle at a time.\p"
+	.string "MULTI BATTLE is for four TRAINERS\n"
+	.string "with one or more POKéMON each.\p"
+	.string "Each TRAINER can have one POKéMON\n"
+	.string "in battle at a time.$"
+
+CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD
+	.string "Please decide which of you two\n"
+	.string "will become the LEADER.\p"
+	.string "The other player must then choose\n"
+	.string "“JOIN GROUP.”$"
+
+CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334
+	.string "Please decide which of you four\n"
+	.string "will become the GROUP LEADER.\p"
+	.string "The other players must then choose\n"
+	.string "“JOIN GROUP.”$"
+
+CableClub_Text_ChooseGroupLeader: @ 82793A3
+	.string "Please decide which of you will\n"
+	.string "become the GROUP LEADER.\p"
+	.string "The other players must then choose\n"
+	.string "“JOIN GROUP.”$"
+
+CableClub_Text_WelcomeUnionRoomEnter: @ 827940D
+	.string "Welcome to the POKéMON WIRELESS\n"
+	.string "CLUB UNION ROOM.\p"
+	.string "You may interact directly with\n"
+	.string "other TRAINERS here, some of\l"
+	.string "whom you may not even know.\p"
+	.string "Would you like to enter the ROOM?$"
+
+CableClub_Text_UnionRoomInfo: @ 82794B8
+	.string "The TRAINERS in the UNION ROOM\n"
+	.string "will be those players around you\l"
+	.string "who have also entered the ROOM.\p"
+	.string "You may do all sorts of things\n"
+	.string "here, such as exchanging greetings.\p"
+	.string "You may enter two POKéMON up to\n"
+	.string "Lv. 30 for a one-on-one battle.\p"
+	.string "You may take part in a chat with\n"
+	.string "two to five people.\p"
+	.string "Or, you may register a POKéMON for\n"
+	.string "trade.\p"
+	.string "Would you like to enter the ROOM?$"
+
+CableClub_Text_EnjoyUnionRoom: @ 827961C
+	.string "I hope you enjoy your time in\n"
+	.string "the UNION ROOM.$"
+
+CableClub_Text_FirstTimeRightThisWay: @ 827964A
+	.string "Hello!\n"
+	.string "My name is TEALA.\p"
+	.string "This must be your first time\n"
+	.string "up here.\p"
+	.string "I'll show you how the Wireless\n"
+	.string "Communication System works.\p"
+	.string "First, I need to show you this\n"
+	.string "floor of our POKéMON CENTER.\p"
+	.string "Right this way, please.$"
+
+CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718
+	.string "On the top floor, there are two\n"
+	.string "rooms.\p"
+	.string "First, the room on the left.\n"
+	.string "It's the UNION ROOM.\p"
+	.string "You may link up with TRAINERS\n"
+	.string "around you who have also entered\l"
+	.string "the UNION ROOM.\p"
+	.string "With them, you may do things like\n"
+	.string "chat, battle, and trade.\p"
+	.string "Second, the room on the right is\n"
+	.string "the DIRECT CORNER.\p"
+	.string "You may trade or battle POKéMON\n"
+	.string "with your friends in this room.\p"
+	.string "If the Wireless Adapter isn't\n"
+	.string "connected, you may still link up\l"
+	.string "using a GBA Game Link cable.\p"
+	.string "If that is the case, you must go\n"
+	.string "to the DIRECT CORNER.\p"
+	.string "I hope you enjoy the Wireless \n"
+	.string "Communication System.$"
+
+CableClub_Text_AskAboutLinking: @ 8279937
+	.string "Hello, {PLAYER}!\p"
+	.string "It's me, TEALA, the POKéMON\n"
+	.string "CENTER 2F attendant.\p"
+	.string "Is there something you needed to\n"
+	.string "ask me about linking?$"
+
+CableClub_Text_ExplainWirelessClub: @ 82799AA
+	.string "Let me explain how the POKéMON\n"
+	.string "WIRELESS CLUB works.\p"
+	.string "On this, the top floor, there are\n"
+	.string "two rooms.\p"
+	.string "First, the room on the left.\n"
+	.string "It's the UNION ROOM.\p"
+	.string "You may link up with TRAINERS\n"
+	.string "around you who have also entered\l"
+	.string "the UNION ROOM.\p"
+	.string "With them, you may do things like\n"
+	.string "chat, battle, and trade.\p"
+	.string "Second, the room on the right is\n"
+	.string "the DIRECT CORNER.\p"
+	.string "You may trade or battle POKéMON\n"
+	.string "with your friends in this room.\p"
+	.string "Sometimes, you may not be able to\n"
+	.string "find your friends in the UNION ROOM\l"
+	.string "or the DIRECT CORNER.\p"
+	.string "In that case, please move closer\n"
+	.string "to your friends.\p"
+	.string "If the Wireless Adapter isn't\n"
+	.string "connected, you may still link up\l"
+	.string "using a GBA Game Link cable.\p"
+	.string "If that is the case, you must go\n"
+	.string "to the DIRECT CORNER.\p"
+	.string "I hope you enjoy the Wireless \n"
+	.string "Communication System.$"
+
+CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91
+	.string "I hope you enjoy the Wireless\n"
+	.string "Communication System.$"
diff --git a/data/text/mevent.inc b/data/text/mevent.inc
index 44c456f1c..ae4032eb4 100644
--- a/data/text/mevent.inc
+++ b/data/text/mevent.inc
@@ -1,14 +1,14 @@
-gText_FillOutQuestionnaire:: @ 827339F
+Mevent_Text_FillOutQuestionnaire:: @ 827339F
 	.string "There is a questionnaire.\n"
 	.string "Would you like to fill it out?$"
 
-gText_ThankYouForTakingQuestionnaire:: @ 82733D8
+Mevent_Text_QuestionnaireThankYou:: @ 82733D8
 	.string "Thank you for taking the time to\n"
 	.string "fill out our questionnaire.\p"
 	.string "Your feedback will be used for\n"
 	.string "future reference.$"
 
-gUnknown_08273446:: @ 8273446
+Mevent_Text_YouKnowThoseWordsGift:: @ 8273446
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
@@ -16,27 +16,27 @@ gUnknown_08273446:: @ 8273446
 	.string "From now on, you should be\n"
 	.string "receiving MYSTERY GIFTS!$"
 
-gUnknown_082734CC:: @ 82734CC
+Mevent_Text_YouCanAccessMysteryGift:: @ 82734CC
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY GIFT.$"
 
-gUnknown_08273506:: @ 8273506
+Mevent_Text_YouKnowThoseWordsEvent:: @ 8273506
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
 	.string "the MYSTERY EVENT.$"
 
-gUnknown_08273559:: @ 8273559
+Mevent_Text_YouCanAccessMysteryEvent:: @ 8273559
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY EVENT.$"
 
-gUnknown_08273594:: @ 8273594
+Mevent_Text_TheresATicketForYou:: @ 8273594
 	.string "Thank you for using the MYSTERY\n"
 	.string "EVENT System.\p"
 	.string "You must be {PLAYER}.\n"
 	.string "There is a ticket here for you.$"
 
-gUnknown_082735F2:: @ 82735F2
+Mevent_Text_TryUsingItAtLilycovePort:: @ 82735F2
 	.string "It appears to be for use at\n"
 	.string "the LILYCOVE CITY port.\p"
 	.string "Why not give it a try and see what\n"
diff --git a/data/text/move_tutors.inc b/data/text/move_tutors.inc
index 6f3910b80..baadad73d 100644
--- a/data/text/move_tutors.inc
+++ b/data/text/move_tutors.inc
@@ -1,8 +1,8 @@
-MauvilleCity_Text_2C6E05: @ 82C6E05
+MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce: @ 82C6E05
 	.string "This move can be learned only\n"
 	.string "once. Is that okay?$"
 
-SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37
+MoveTutor_Text_SwaggerTeach: @ 82C6E37
 	.string "Heh! My POKéMON totally rules!\n"
 	.string "It's cooler than any POKéMON!\p"
 	.string "I was lipping off with a swagger in\n"
@@ -12,19 +12,19 @@ SlateportCity_PokemonFanClub_Text_2C6E37: @ 82C6E37
 	.string "If you'd like, I'll teach the move\n"
 	.string "SWAGGER to a POKéMON of yours.$"
 
-SlateportCity_PokemonFanClub_Text_2C6F33: @ 82C6F33
+MoveTutor_Text_SwaggerDeclined: @ 82C6F33
 	.string "What, no? Can't you get into\n"
 	.string "the spirit of things?$"
 
-SlateportCity_PokemonFanClub_Text_2C6F66: @ 82C6F66
+MoveTutor_Text_SwaggerWhichMon: @ 82C6F66
 	.string "All right, which POKéMON wants to\n"
 	.string "learn how to SWAGGER?$"
 
-SlateportCity_PokemonFanClub_Text_2C6F9E: @ 82C6F9E
+MoveTutor_Text_SwaggerTaught: @ 82C6F9E
 	.string "I'll just praise my POKéMON from now\n"
 	.string "on without the swagger.$"
 
-MauvilleCity_Text_2C6FDB: @ 82C6FDB
+MoveTutor_Text_RolloutTeach: @ 82C6FDB
 	.string "Did you know that you can go from\n"
 	.string "here a long way in that direction\l"
 	.string "without changing direction?\p"
@@ -35,19 +35,19 @@ MauvilleCity_Text_2C6FDB: @ 82C6FDB
 	.string "I can teach one the move ROLLOUT\n"
 	.string "if you'd like.$"
 
-MauvilleCity_Text_2C70C4: @ 82C70C4
+MoveTutor_Text_RolloutDeclined: @ 82C70C4
 	.string "You don't need to be shy about it.\n"
 	.string "Let's roll!$"
 
-MauvilleCity_Text_2C70F3: @ 82C70F3
+MoveTutor_Text_RolloutWhichMon: @ 82C70F3
 	.string "Ehehe, sure thing! It'd be great if\n"
 	.string "the POKéMON looked like me.$"
 
-MauvilleCity_Text_2C7133: @ 82C7133
+MoveTutor_Text_RolloutTaught: @ 82C7133
 	.string "Rolling around in the grass makes me\n"
 	.string "happy. Come on, let's roll!$"
 
-VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174
+MoveTutor_Text_FuryCutterTeach: @ 82C7174
 	.string "There's a move that gets stronger\n"
 	.string "when you keep using it in a row.\p"
 	.string "It's a BUG-type move, and it is\n"
@@ -55,18 +55,18 @@ VerdanturfTown_PokemonCenter_1F_Text_2C7174: @ 82C7174
 	.string "It's called FURY CUTTER.\n"
 	.string "Want me to teach it to a POKéMON?$"
 
-VerdanturfTown_PokemonCenter_1F_Text_2C7221: @ 82C7221
+MoveTutor_Text_FuryCutterDeclined: @ 82C7221
 	.string "We're not on the same wavelength.$"
 
-VerdanturfTown_PokemonCenter_1F_Text_2C7243: @ 82C7243
+MoveTutor_Text_FuryCutterWhichMon: @ 82C7243
 	.string "Yay!\n"
 	.string "Show me which POKéMON I should teach.$"
 
-VerdanturfTown_PokemonCenter_1F_Text_2C726E: @ 82C726E
+MoveTutor_Text_FuryCutterTaught: @ 82C726E
 	.string "I get a thrill watching to see if\n"
 	.string "the move keeps hitting in succession!$"
 
-LavaridgeTown_House_Text_2C72B6: @ 82C72B6
+MoveTutor_MimicTeach: @ 82C72B6
 	.string "Ah, young one!\p"
 	.string "I am also a young one, but I mimic\n"
 	.string "the styles and speech of the elderly\l"
@@ -75,21 +75,21 @@ LavaridgeTown_House_Text_2C72B6: @ 82C72B6
 	.string "Would you agree to it if I were to\l"
 	.string "offer to teach the move MIMIC?$"
 
-LavaridgeTown_House_Text_2C737F: @ 82C737F
+MoveTutor_MimicDeclined: @ 82C737F
 	.string "Oh, boo! I wanted to teach MIMIC\n"
 	.string "to your POKéMON!$"
 
-LavaridgeTown_House_Text_2C73B1: @ 82C73B1
+MoveTutor_Text_MimicWhichMon: @ 82C73B1
 	.string "Fwofwo! And so I shall!\n"
 	.string "Let me see the POKéMON\l"
 	.string "you wish me to teach.$"
 
-LavaridgeTown_House_Text_2C73F6: @ 82C73F6
+MoveTutor_Text_MimicTaught: @ 82C73F6
 	.string "MIMIC is a move of great depth.\p"
 	.string "Could you execute it to perfection\n"
 	.string "as well as me…?$"
 
-FallarborTown_Mart_Text_2C7449: @ 82C7449
+MoveTutor_Text_MetronomeTeach: @ 82C7449
 	.string "I want all sorts of things!\n"
 	.string "But I used up my allowance…\p"
 	.string "Wouldn't it be nice if there were\n"
@@ -100,22 +100,22 @@ FallarborTown_Mart_Text_2C7449: @ 82C7449
 	.string "Money won't appear, but your POKéMON\n"
 	.string "will waggle a finger. Yes?$"
 
-FallarborTown_Mart_Text_2C7556: @ 82C7556
+MoveTutor_Text_MetronomeDeclined: @ 82C7556
 	.string "Okay. I'll be here if you change\n"
 	.string "your mind.$"
 
-FallarborTown_Mart_Text_2C7582: @ 82C7582
+MoveTutor_Text_MetronomeWhichMon: @ 82C7582
 	.string "Okay! I'll teach it!\n"
 	.string "Which POKéMON should I teach?$"
 
-FallarborTown_Mart_Text_2C75B5: @ 82C75B5
+MoveTutor_Text_MetronomeTaught: @ 82C75B5
 	.string "When a POKéMON waggles its finger\n"
 	.string "like a METRONOME, all sorts of nice\l"
 	.string "things happen.\p"
 	.string "Wouldn't it be nice if we could\n"
 	.string "use it, too?$"
 
-FortreeCity_House2_Text_2C7637: @ 82C7637
+MoveTutor_Text_SleepTalkTeach: @ 82C7637
 	.string "Humph! My wife relies on HIDDEN\n"
 	.string "POWER to stay awake.\p"
 	.string "She should just take a nap like I do,\n"
@@ -123,21 +123,21 @@ FortreeCity_House2_Text_2C7637: @ 82C7637
 	.string "I can teach your POKéMON how to\n"
 	.string "SLEEP TALK instead. Interested?$"
 
-FortreeCity_House2_Text_2C76E2: @ 82C76E2
+MoveTutor_Text_SleepTalkDeclined: @ 82C76E2
 	.string "Oh, fine, fine. You want to stay awake\n"
 	.string "with HIDDEN POWER, too…$"
 
-FortreeCity_House2_Text_2C7721: @ 82C7721
+MoveTutor_Text_SleepTalkWhichMon: @ 82C7721
 	.string "Ah, an appreciative child!\n"
 	.string "Which POKéMON should I teach?$"
 
-FortreeCity_House2_Text_2C775A: @ 82C775A
+MoveTutor_Text_SleepTalkTaught: @ 82C775A
 	.string "I've never once gotten my wife's\n"
 	.string "coin trick right.\p"
 	.string "I would be happy if I got it right\n"
 	.string "even as I SLEEP TALK…$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6
+MoveTutor_Text_SubstituteTeach: @ 82C77C6
 	.string "When I see the wide world from up\n"
 	.string "here on the roof…\p"
 	.string "I think about how nice it would be\n"
@@ -148,22 +148,22 @@ LilycoveCity_DepartmentStoreRooftop_Text_2C77C6: @ 82C77C6
 	.string "I know! Would you be interested in\n"
 	.string "having a POKéMON learn SUBSTITUTE?$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2C78D1: @ 82C78D1
+MoveTutor_Text_SubstituteDeclined: @ 82C78D1
 	.string "Oh, no?\p"
 	.string "A POKéMON can make a copy of\n"
 	.string "itself using it, you know.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2C7911: @ 82C7911
+MoveTutor_Text_SubstituteWhichMon: @ 82C7911
 	.string "Giggle…\n"
 	.string "Which POKéMON do you want me to\l"
 	.string "teach SUBSTITUTE?$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_2C794B: @ 82C794B
+MoveTutor_Text_SubstituteTaught: @ 82C794B
 	.string "We human beings should enjoy our\n"
 	.string "own lives to the utmost!\p"
 	.string "I hope you'll get that way, too!$"
 
-MossdeepCity_Text_2C79A6: @ 82C79A6
+MoveTutor_Text_DynamicPunchTeach: @ 82C79A6
 	.string "I can't do this anymore!\p"
 	.string "It's utterly hopeless!\p"
 	.string "I'm a FIGHTING-type TRAINER,\n"
@@ -176,19 +176,19 @@ MossdeepCity_Text_2C79A6: @ 82C79A6
 	.string "Or do you want me to teach your\n"
 	.string "POKéMON DYNAMICPUNCH?$"
 
-MossdeepCity_Text_2C7AD4: @ 82C7AD4
+MoveTutor_Text_DynamicPunchDeclined: @ 82C7AD4
 	.string "Darn! You're even making fun of me?\n"
 	.string "Punch! Punch! Punch!$"
 
-MossdeepCity_Text_2C7B0D: @ 82C7B0D
+MoveTutor_Text_DynamicPunchWhichMon: @ 82C7B0D
 	.string "What? You do? You're a good person!\n"
 	.string "Which POKéMON should I teach?$"
 
-MossdeepCity_Text_2C7B4F: @ 82C7B4F
+MoveTutor_Text_DynamicPunchTaught: @ 82C7B4F
 	.string "I want you to win at the MOSSDEEP GYM\n"
 	.string "using that DYNAMICPUNCH!$"
 
-SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E
+MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E
 	.string "Sigh…\p"
 	.string "SOOTOPOLIS's GYM LEADER is really\n"
 	.string "lovably admirable.\p"
@@ -199,19 +199,19 @@ SootopolisCity_PokemonCenter_1F_Text_2C7B8E: @ 82C7B8E
 	.string "Please, let me teach your POKéMON\n"
 	.string "the move DOUBLE-EDGE!$"
 
-SootopolisCity_PokemonCenter_1F_Text_2C7C7E: @ 82C7C7E
+MoveTutor_Text_DoubleEdgeDeclined: @ 82C7C7E
 	.string "Oh…\n"
 	.string "Even you rejected me…$"
 
-SootopolisCity_PokemonCenter_1F_Text_2C7C98: @ 82C7C98
+MoveTutor_Text_DoubleEdgeWhichMon: @ 82C7C98
 	.string "Okay, which POKéMON should I teach\n"
 	.string "DOUBLE-EDGE?$"
 
-SootopolisCity_PokemonCenter_1F_Text_2C7CC8: @ 82C7CC8
+MoveTutor_Text_DoubleEdgeTaught: @ 82C7CC8
 	.string "I won't live for love anymore!\n"
 	.string "I'll become tough!$"
 
-PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA
+MoveTutor_Text_ExplosionTeach: @ 82C7CFA
 	.string "I don't intend to be going nowhere\n"
 	.string "fast in the sticks like this forever.\p"
 	.string "You watch me, I'll get out to the city\n"
@@ -221,15 +221,15 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7CFA: @ 82C7CFA
 	.string "If you overheard that, I'll happily\n"
 	.string "teach EXPLOSION to your POKéMON!$"
 
-PacifidlogTown_PokemonCenter_1F_Text_2C7E04: @ 82C7E04
+MoveTutor_Text_ExplosionDeclined: @ 82C7E04
 	.string "Gaah! You're turning me down because\n"
 	.string "I live in the country?$"
 
-PacifidlogTown_PokemonCenter_1F_Text_2C7E40: @ 82C7E40
+MoveTutor_Text_ExplosionWhichMon: @ 82C7E40
 	.string "Fine! An EXPLOSION it is!\n"
 	.string "Which POKéMON wants to blow up?$"
 
-PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A
+MoveTutor_Text_ExplosionTaught: @ 82C7E7A
 	.string "For a long time, I've taught POKéMON\n"
 	.string "how to use EXPLOSION, but I've yet\l"
 	.string "to ignite my own EXPLOSION…\p"