Merge remote-tracking branch 'upstream/master' into 80c

6 files changed, 149 insertions, 1160 deletions

diff --git a/data/text/bard.inc b/data/text/bard.inc
index edf4942f6..bd22c97a3 100644
--- a/data/text/bard.inc
+++ b/data/text/bard.inc
@@ -1,19 +1,19 @@
-UnknownString_81B0A83: @ 81B0A83
+gTextBard_BardTesting: @ 81B0A83
 	.string "BARD testing!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0A91:: @ 81B0A91
+gTextBard_HiImTheBard:: @ 81B0A91
 	.string "Hi, I’m the BARD.\n"
 	.string "Would you like to hear my song?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AC3:: @ 81B0AC3
+gTextBard_OhYouveLeftMe:: @ 81B0AC3
 	.string "Oh...\n"
 	.string "You’ve left me feeling the blues...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0AED:: @ 81B0AED
+gTextBard_OhWhatAMovingSong:: @ 81B0AED
 	.string "Oh, what a moving song...\n"
 	.string "I wish I could play it for others...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
+gTextBard_SoHowDoYouLikeMySong:: @ 81B0B2C
 	.string "So?\n"
 	.string "How do you like my song?\p"
 	.string "But I’m none too happy about the\n"
@@ -21,18 +21,18 @@ MauvilleCity_PokemonCenter_1F_Text_1B0B2C:: @ 81B0B2C
 	.string "How would you like to write some new\n"
 	.string "lyrics for me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BA6:: @ 81B0BA6
+gTextBard_OhYouveLeftMe2:: @ 81B0BA6
 	.string "Oh...\n"
 	.string "You’ve left me feeling the blues...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BD0:: @ 81B0BD0
+gTextBard_ThankYouKindly:: @ 81B0BD0
 	.string "Thank you kindly!\n"
 	.string "Let me sing it for you.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0BFA:: @ 81B0BFA
+gTextBard_WasThatHowYouWanted:: @ 81B0BFA
 	.string "Was that how you wanted your song\n"
 	.string "to go?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0C23:: @ 81B0C23
+gTextBard_OkayThatsIt:: @ 81B0C23
 	.string "Okay! That’s it, then.\n"
 	.string "I’ll sing this song for a while.$"
diff --git a/data/text/credits.inc b/data/text/credits.inc
deleted file mode 100644
index 29abccf91..000000000
--- a/data/text/credits.inc
+++ /dev/null
@@ -1,1011 +0,0 @@
-Category_Credits:
-	.string "{PALETTE 9}Credits$"
-Category_ExecutiveDirector:
-	.string "{PALETTE 9}Executive Director$"
-Category_Director:
-	.string "{PALETTE 9}Director$"
-Category_ArtDirector:
-	.string "{PALETTE 9}Art Director$"
-Category_BattleDirector:
-	.string "{PALETTE 9}Battle Director$"
-Category_MainProgrammer:
-	.string "{PALETTE 9}Main Programmer$"
-Category_BattleSystemProgrammer:
-	.string "{PALETTE 9}Battle System Programmer$"
-Category_FieldSystemProgrammer:
-	.string "{PALETTE 9}Field System Programmer$"
-Category_Programmers:
-	.string "{PALETTE 9}Programmers$"
-Category_MainGraphicDesigner:
-	.string "{PALETTE 9}Main Graphic Designer$"
-Category_POKeMONGraphicDesigners:
-	.string "{PALETTE 9}POKéMON & Graphic Designers$"
-Category_POKeMONDesigners:
-	.string "{PALETTE 9}POKéMON Designers$"
-Category_MusicComposition:
-	.string "{PALETTE 9}Music Composition$"
-Category_SoundEffectsPOKeMONVoices:
-	.string "{PALETTE 9}Sound Effects & POKéMON Voices$"
-Category_GameDesigners:
-	.string "{PALETTE 9}Game Designers$"
-Category_PlotScenario:
-	.string "{PALETTE 9}Plot Scenario$"
-Category_GameScenario:
-	.string "{PALETTE 9}Game Scenario$"
-Category_ScriptDesigners:
-	.string "{PALETTE 9}Script Designers$"
-Category_MapDesigners:
-	.string "{PALETTE 9}Map Designers$"
-Category_MapDataDesigners:
-	.string "{PALETTE 9}Map Data Designers$"
-Category_ParametricDesigners:
-	.string "{PALETTE 9}Parametric Designers$"
-Category_POKeDEXText:
-	.string "{PALETTE 9}POKéDEX Text$"
-Category_EnvironmentToolProgrammers:
-	.string "{PALETTE 9}Environment & Tool Programmers$"
-Category_ProductTesting:
-	.string "{PALETTE 9}Product Testing$"
-Category_SpecialThanks:
-	.string "{PALETTE 9}Special Thanks$"
-Category_Coordinators:
-	.string "{PALETTE 9}Coordinators$"
-Category_Producers:
-	.string "{PALETTE 9}Producers$"
-Category_ExecutiveProducers:
-	.string "{PALETTE 9}Executive Producers$"
-Category_InformationSupervisors:
-	.string "{PALETTE 9}Information Supervisors$"
-Category_TaskManagers:
-	.string "{PALETTE 9}Task Managers$"
-Category_BrailleCodeCheck:
-	.string "{PALETTE 9}Braille Code Check$"
-Category_EnglishVersionCoordinators:
-	.string "{PALETTE 9}English Version Coordinators$"
-Category_Translator:
-	.string "{PALETTE 9}Translator$"
-Category_ProductSupport:
-	.string "{PALETTE 9}Product Support$"
-Category_Artwork:
-	.string "{PALETTE 9}Artwork$"
-Category_TextEditor:
-	.string "{PALETTE 9}Text Editor$"
-Category_NOAProductTesting:
-	.string "{PALETTE 9}NOA Product Testing$"
-Category_GraphicDesigners:
-	.string "{PALETTE 9}Graphic Designers$"
-Text_SatoshiTajiri:
-	.string "Satoshi Tajiri$"
-Text_Masuda:
-	.string "Junichi Masuda$"
-Text_Sugimori:
-	.string "Ken Sugimori$"
-Text_Morimoto:
-	.string "Shigeki Morimoto$"
-Text_TetsuyaWatanabe:
-	.string "Tetsuya Watanabe$"
-Text_Sogabe:
-	.string "Hisashi Sogabe$"
-Text_Tamada:
-	.string "Sousuke Tamada$"
-Text_Mori:
-	.string "Akito Mori$"
-Text_Kagaya:
-	.string "Keita Kagaya$"
-Text_Matsuda:
-	.string "Yoshinori Matsuda$"
-Text_HiroyukiNakamura:
-	.string "Hiroyuki Nakamura$"
-Text_Taya:
-	.string "Masao Taya$"
-Text_Nohara:
-	.string "Satoshi Nohara$"
-Text_TomomichiOhta:
-	.string "Tomomichi Ohta$"
-Text_Iwasawa:
-	.string "Miyuki Iwasawa$"
-Text_TakenoriOhta:
-	.string "Takenori Ohta$"
-Text_Yoshida:
-	.string "Hironobu Yoshida$"
-Text_Fujiwara:
-	.string "Motofumi Fujiwara$"
-Text_SatoshiOhta:
-	.string "Satoshi Ohta$"
-Text_Iwashita:
-	.string "Asuka Iwashita$"
-Text_Tomita:
-	.string "Aimi Tomita$"
-Text_Unno:
-	.string "Takao Unno$"
-Text_Eo:
-	.string "Kanako Eo$"
-Text_Okutani:
-	.string "Jun Okutani$"
-Text_Nishida:
-	.string "Atsuko Nishida$"
-Text_Saito:
-	.string "Muneo Saito$"
-Text_Yoshikawa:
-	.string "Rena Yoshikawa$"
-Text_Ichinose:
-	.string "Go Ichinose$"
-Text_Aoki:
-	.string "Morikazu Aoki$"
-Text_Nishino:
-	.string "Koji Nishino$"
-Text_Matsushima:
-	.string "Kenji Matsushima$"
-Text_TetsujiOhta:
-	.string "Tetsuji Ohta$"
-Text_Sato:
-	.string "Hitomi Sato$"
-Text_Kawachimaru:
-	.string "Takeshi Kawachimaru$"
-Text_Shimoyamada:
-	.string "Teruyuki Shimoyamada$"
-Text_Ohmori:
-	.string "Shigeru Ohmori$"
-Text_Takahashi:
-	.string "Tadashi Takahashi$"
-Text_ToshinobuMatsumiya:
-	.string "Toshinobu Matsumiya$"
-Text_Tomisawa:
-	.string "Akihito Tomisawa$"
-Text_Enomoto:
-	.string "Hiroki Enomoto$"
-Text_Terada:
-	.string "Kazuyuki Terada$"
-Text_Sakurai:
-	.string "Yuri Sakurai$"
-Text_Sagawa:
-	.string "Hiromi Sagawa$"
-Text_Tominaga:
-	.string "Kenji Tominaga$"
-Text_YoshioTajiri:
-	.string "Yoshio Tajiri$"
-Text_Sasaki:
-	.string "Teiko Sasaki$"
-Text_Hamano:
-	.string "Sachiko Hamano$"
-Text_ChieMatsumiya:
-	.string "Chie Matsumiya$"
-Text_Shinozaki:
-	.string "Akiko Shinozaki$"
-Text_Fujii:
-	.string "Atsuko Fujii$"
-Text_SuperMarioClub:
-	.string "NCL Super Mario Club$"
-Text_Tada:
-	.string "Atsushi Tada$"
-Text_Ohnishi:
-	.string "Takahiro Ohnishi$"
-Text_Okamura:
-	.string "Norihide Okamura$"
-Text_HiroNakamura:
-	.string "Hiro Nakamura$"
-Text_Uesugi:
-	.string "Hiroyuki Uesugi$"
-Text_Murakawa:
-	.string "Teruki Murakawa$"
-Text_Kinashi:
-	.string "Akira Kinashi$"
-Text_Takizawa:
-	.string "Michiko Takizawa$"
-Text_Takada:
-	.string "Makiko Takada$"
-Text_Kondo:
-	.string "Takanao Kondo$"
-Text_Mashima:
-	.string "Ai Mashima$"
-Text_Nomoto:
-	.string "Gakuji Nomoto$"
-Text_Izushi:
-	.string "Takehiro Izushi$"
-Text_Yamagami:
-	.string "Hitoshi Yamagami$"
-Text_KyokoWatanabe:
-	.string "Kyoko Watanabe$"
-Text_Nakano:
-	.string "Takao Nakano$"
-Text_Jinnai:
-	.string "Hiroyuki Jinnai$"
-Text_Tsuru:
-	.string "Hiroaki Tsuru$"
-Text_Ishihara:
-	.string "Tsunekaz Ishihara$"
-Text_Iwata:
-	.string "Satoru Iwata$"
-Text_Suyama:
-	.string "Kazuya Suyama$"
-Text_Mitsuhara:
-	.string "Satoshi Mitsuhara$"
-Text_JapanBrailleLibrary:
-	.string "Japan Braille Library$"
-Text_Komura:
-	.string "Tomotaka Komura$"
-Text_Ohashi:
-	.string "Mikiko Ohashi$"
-Text_McMahill:
-	.string "Seth McMahill$"
-Text_Ogasawara:
-	.string "Nob Ogasawara$"
-Text_Yamamoto:
-	.string "Souichi Yamamoto$"
-Text_Funakoshi:
-	.string "Masanori Funakoshi$"
-Text_Fujihara:
-	.string "Kazuhiro Fujihara$"
-Text_Nakamichi:
-	.string "Kimiko Nakamichi$"
-Text_Hara:
-	.string "Daisuke Hara$"
-Text_Okada:
-	.string "Atsushi Okada$"
-Text_Lillygren:
-	.string "Teresa Lillygren$"
-Text_Hertzog:
-	.string "Thomas Hertzog$"
-Text_Ridgeway:
-	.string "Ed Ridgeway$"
-Text_NFotB:
-	.string "National Federation of the Blind$"
-Text_Maurer:
-	.string "Patricia A. Maurer$"
-Text_Ford:
-	.string "Sayoko Blodgett-Ford$"
-Text_Barlow:
-	.string "Nicola Pratt-Barlow$"
-Text_Uyama:
-	.string "Koji Uyama$"
-Text_Howitt:
-	.string "Anthony Howitt$"
-Text_Tilden:
-	.string "Gail Tilden$"
-Text_EBU:
-	.string "European Blind Union$"
-Text_ABA:
-	.string "Australian Braille Authority$"
-Text_RNZFotB:
-	.string "Royal New Zealand Federation for the Blind$"
-Text_CreditsTerminator:
-	.string "$"
-Text_Version:
-	.ifdef SAPPHIRE
-	.string "{PALETTE 9}POKéMON SAPPHIRE VERSION$"
-	.else
-	.string "{PALETTE 9}POKéMON RUBY VERSION$"
-	.endif
-
-@ pointer table
-
-CreditsTerminator::
-	credits_entry 0, Text_CreditsTerminator
-
-CreditsVersion::
-	.ifdef SAPPHIRE
-	credits_entry 7, Text_Version
-	.else
-	credits_entry 8, Text_Version
-	.endif
-
-CreditsCredits::
-	credits_entry 11, Category_Credits
-
-CreditsExecutiveDirector::
-	credits_entry 8,  Category_ExecutiveDirector
-
-CreditsDirector::
-	credits_entry 12,  Category_Director
-
-CreditsArtDirector::
-	credits_entry 10,  Category_ArtDirector
-
-CreditsBattleDirector::
-	credits_entry 10,  Category_BattleDirector
-
-CreditsMainProgrammer::
-	credits_entry 10,  Category_MainProgrammer
-
-CreditsBattleSystemProgrammer::
-	credits_entry 8,  Category_BattleSystemProgrammer
-
-CreditsFieldSystemProgrammer::
-	credits_entry 7,  Category_FieldSystemProgrammer
-
-CreditsProgrammers::
-	credits_entry 12,  Category_Programmers
-
-CreditsMainGraphicDesigner::
-	credits_entry 7,  Category_MainGraphicDesigner
-
-CreditsPOKeMONGraphicDesigners::
-	credits_entry 6,  Category_POKeMONGraphicDesigners
-
-CreditsPOKeMONDesigners::
-	credits_entry 10,  Category_POKeMONDesigners
-
-CreditsMusicComposition::
-	credits_entry 13,  Category_MusicComposition
-
-CreditsSoundEffectsPOKeMONVoices::
-	credits_entry 4,  Category_SoundEffectsPOKeMONVoices
-
-CreditsGameDesigners::
-	credits_entry 11,  Category_GameDesigners
-
-CreditsPlotScenario::
-	credits_entry 11,  Category_PlotScenario
-
-CreditsGameScenario::
-	credits_entry 13,  Category_GameScenario
-
-CreditsScriptDesigners::
-	credits_entry 10,  Category_ScriptDesigners
-
-CreditsMapDesigners::
-	credits_entry 11,  Category_MapDesigners
-
-CreditsMapDataDesigners::
-	credits_entry 9,  Category_MapDataDesigners
-
-CreditsParametricDesigners::
-	credits_entry 9,  Category_ParametricDesigners
-
-CreditsPOKeDEXText::
-	credits_entry 11,  Category_POKeDEXText
-
-CreditsEnvironmentToolProgrammers::
-	credits_entry 6,  Category_EnvironmentToolProgrammers
-
-CreditsProductTesting::
-	credits_entry 11,  Category_ProductTesting
-
-CreditsSpecialThanks::
-	credits_entry 10,  Category_SpecialThanks
-
-CreditsCoordinators::
-	credits_entry 11,  Category_Coordinators
-
-CreditsProducers::
-	credits_entry 11,  Category_Producers
-
-CreditsExecutiveProducers::
-	credits_entry 7,  Category_ExecutiveProducers
-
-CreditsInformationSupervisors::
-	credits_entry 10,  Category_InformationSupervisors
-
-CreditsTaskManagers::
-	credits_entry 8,  Category_TaskManagers
-
-CreditsBrailleCodeCheck::
-	credits_entry 10,  Category_BrailleCodeCheck
-
-CreditsSatoshiTajiri::
-	credits_entry 11, Text_SatoshiTajiri
-
-CreditsMasuda::
-	credits_entry 11, Text_Masuda
-
-CreditsSugimori::
-	credits_entry 11,  Text_Sugimori
-
-CreditsMorimoto::
-	credits_entry 11,  Text_Morimoto
-
-CreditsTetsuyaWatanabe::
-	credits_entry 11,  Text_TetsuyaWatanabe
-
-CreditsSogabe::
-	credits_entry 11,  Text_Sogabe
-
-CreditsTamada::
-	credits_entry 11,  Text_Tamada
-
-CreditsMori::
-	credits_entry 11,  Text_Mori
-
-CreditsKagaya::
-	credits_entry 11,  Text_Kagaya
-
-CreditsMatsuda::
-	credits_entry 11,  Text_Matsuda
-
-CreditsHiroyukiNakamura::
-	credits_entry 11,  Text_HiroyukiNakamura
-
-CreditsTaya::
-	credits_entry 11,  Text_Taya
-
-CreditsNohara::
-	credits_entry 11,  Text_Nohara
-
-CreditsTomomichiOhta::
-	credits_entry 11,  Text_TomomichiOhta
-
-CreditsIwasawa::
-	credits_entry 11,  Text_Iwasawa
-
-CreditsTakenoriOhta::
-	credits_entry 11,  Text_TakenoriOhta
-
-CreditsYoshida::
-	credits_entry 11,  Text_Yoshida
-
-CreditsFujiwara::
-	credits_entry 11,  Text_Fujiwara
-
-CreditsSatoshiOhta::
-	credits_entry 11,  Text_SatoshiOhta
-
-CreditsIwashita::
-	credits_entry 11,  Text_Iwashita
-
-CreditsTomita::
-	credits_entry 11,  Text_Tomita
-
-CreditsUnno::
-	credits_entry 11,  Text_Unno
-
-CreditsEo::
-	credits_entry 11,  Text_Eo
-
-CreditsOkutani::
-	credits_entry 11,  Text_Okutani
-
-CreditsNishida::
-	credits_entry 11,  Text_Nishida
-
-CreditsSaito::
-	credits_entry 11,  Text_Saito
-
-CreditsYoshikawa::
-	credits_entry 11,  Text_Yoshikawa
-
-CreditsIchinose::
-	credits_entry 11,  Text_Ichinose
-
-CreditsAoki::
-	credits_entry 11,  Text_Aoki
-
-CreditsNishino::
-	credits_entry 11,  Text_Nishino
-
-CreditsMatsushima::
-	credits_entry 11,  Text_Matsushima
-
-CreditsTetsujiOhta::
-	credits_entry 11,  Text_TetsujiOhta
-
-CreditsSato::
-	credits_entry 11,  Text_Sato
-
-CreditsKawachimaru::
-	credits_entry 11,  Text_Kawachimaru
-
-CreditsShimoyamada::
-	credits_entry 11,  Text_Shimoyamada
-
-CreditsOhmori::
-	credits_entry 11,  Text_Ohmori
-
-CreditsTakahashi::
-	credits_entry 11,  Text_Takahashi
-
-CreditsToshinobuMatsumiya::
-	credits_entry 11,  Text_ToshinobuMatsumiya
-
-CreditsTomisawa::
-	credits_entry 11,  Text_Tomisawa
-
-CreditsEnomoto::
-	credits_entry 11,  Text_Enomoto
-
-CreditsTerada::
-	credits_entry 11,  Text_Terada
-
-CreditsSakurai::
-	credits_entry 11,  Text_Sakurai
-
-CreditsSagawa::
-	credits_entry 11,  Text_Sagawa
-
-CreditsTominaga::
-	credits_entry 11,  Text_Tominaga
-
-CreditsYoshiroTajiri::
-	credits_entry 11,  Text_YoshioTajiri
-
-CreditsSasaki::
-	credits_entry 11,  Text_Sasaki
-
-CreditsHamano::
-	credits_entry 11,  Text_Hamano
-
-CreditsChieMatsumiya::
-	credits_entry 11,  Text_ChieMatsumiya
-
-CreditsShinozaki::
-	credits_entry 11,  Text_Shinozaki
-
-CreditsFujii::
-	credits_entry 11,  Text_Fujii
-
-CreditsSuperMarioClub::
-	credits_entry 11,  Text_SuperMarioClub
-
-CreditsTada::
-	credits_entry 11,  Text_Tada
-
-CreditsOhnishi::
-	credits_entry 11,  Text_Ohnishi
-
-CreditsOkamura::
-	credits_entry 11,  Text_Okamura
-
-CreditsHiroNakamura::
-	credits_entry 11,  Text_HiroNakamura
-
-CreditsUesugi::
-	credits_entry 11,  Text_Uesugi
-
-CreditsMurakawa::
-	credits_entry 11,  Text_Murakawa
-
-CreditsKinashi::
-	credits_entry 11,  Text_Kinashi
-
-CreditsTakizawa::
-	credits_entry 11,  Text_Takizawa
-
-CreditsTakada::
-	credits_entry 11,  Text_Takada
-
-CreditsKondo::
-	credits_entry 11,  Text_Kondo
-
-CreditsMashima::
-	credits_entry 11,  Text_Mashima
-
-CreditsNomoto::
-	credits_entry 11,  Text_Nomoto
-
-CreditsIzushi::
-	credits_entry 11,  Text_Izushi
-
-CreditsYamagami::
-	credits_entry 11,  Text_Yamagami
-
-CreditsKyokoWatanabe::
-	credits_entry 11,  Text_KyokoWatanabe
-
-CreditsNakano::
-	credits_entry 11,  Text_Nakano
-
-CreditsJinnai::
-	credits_entry 11,  Text_Jinnai
-
-CreditsTsuru::
-	credits_entry 11,  Text_Tsuru
-
-CreditsIshihara::
-	credits_entry 11,  Text_Ishihara
-
-CreditsIwata::
-	credits_entry 11,  Text_Iwata
-
-CreditsSuyama::
-	credits_entry 11,  Text_Suyama
-
-CreditsMitsuhara::
-	credits_entry 11,  Text_Mitsuhara
-
-CreditsJapanBrailleLibrary::
-	credits_entry 9,  Text_JapanBrailleLibrary
-
-CreditsKomura::
-	credits_entry 11,  Text_Komura
-
-CreditsOhashi::
-	credits_entry 11,  Text_Ohashi
-
-CreditsEnglishVersionCoordinators::
-	credits_entry 0,  Category_EnglishVersionCoordinators
-
-CreditsTranslator::
-	credits_entry 0,  Category_Translator
-
-CreditsProductSupport::
-	credits_entry 0,  Category_ProductSupport
-
-CreditsArtwork::
-	credits_entry 0,  Category_Artwork
-
-CreditsTextEditor::
-	credits_entry 0,  Category_TextEditor
-
-CreditsNOAProductTesting::
-	credits_entry 0,  Category_NOAProductTesting
-
-CreditsGraphicDesigners::
-	credits_entry 0,  Category_GraphicDesigners
-
-CreditsMcMahill::
-	credits_entry 0,  Text_McMahill
-
-CreditsOgasawara::
-	credits_entry 0,  Text_Ogasawara
-
-CreditsYamamoto::
-	credits_entry 0,  Text_Yamamoto
-
-CreditsFunakoshi::
-	credits_entry 0,  Text_Funakoshi
-
-CreditsFujihara::
-	credits_entry 0,  Text_Fujihara
-
-CreditsNakamichi::
-	credits_entry 0,  Text_Nakamichi
-
-CreditsHara::
-	credits_entry 0,  Text_Hara
-
-CreditsOkada::
-	credits_entry 0,  Text_Okada
-
-CreditsLillygren::
-	credits_entry 0,  Text_Lillygren
-
-CreditsHertzog::
-	credits_entry 0,  Text_Hertzog
-
-CreditsRidgeway::
-	credits_entry 0,  Text_Ridgeway
-
-CreditsNFotB::
-	credits_entry 0,  Text_NFotB
-
-CreditsMaurer::
-	credits_entry 0,  Text_Maurer
-
-CreditsFord::
-	credits_entry 0,  Text_Ford
-
-CreditsBarlow::
-	credits_entry 0,  Text_Barlow
-
-CreditsUyama::
-	credits_entry 0,  Text_Uyama
-
-CreditsHowitt::
-	credits_entry 0,  Text_Howitt
-
-CreditsTilden::
-	credits_entry 0,  Text_Tilden
-
-CreditsEBU::
-	credits_entry 0,  Text_EBU
-
-CreditsABA::
-	credits_entry 0,  Text_ABA
-
-CreditsRNZFotB::
-	credits_entry 0,  Text_RNZFotB
-
-@ pointer table to credits entries
-
-	.align 2
-gCreditsEntryPointerTable:: @ 840C5F0
-	.4byte CreditsTerminator
-	.4byte CreditsVersion
-	.4byte CreditsCredits
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsDirector
-	.4byte CreditsMasuda
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsArtDirector
-	.4byte CreditsSugimori
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsBattleDirector
-	.4byte CreditsMorimoto
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsMainProgrammer
-	.4byte CreditsTetsuyaWatanabe
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsBattleSystemProgrammer
-	.4byte CreditsSogabe
-	.4byte CreditsFieldSystemProgrammer
-	.4byte CreditsTamada
-	.4byte CreditsTerminator
-
-	.4byte CreditsProgrammers
-	.4byte CreditsMori
-	.4byte CreditsKagaya
-	.4byte CreditsMatsuda
-	.4byte CreditsTerminator
-
-	.4byte CreditsProgrammers
-	.4byte CreditsHiroyukiNakamura
-	.4byte CreditsTaya
-	.4byte CreditsNohara
-	.4byte CreditsTerminator
-
-	.4byte CreditsProgrammers
-	.4byte CreditsTomomichiOhta
-	.4byte CreditsIwasawa
-	.4byte CreditsTakenoriOhta
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsMainGraphicDesigner
-	.4byte CreditsYoshida
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsPOKeMONGraphicDesigners
-	.4byte CreditsSugimori
-	.4byte CreditsYoshida
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsPOKeMONGraphicDesigners
-	.4byte CreditsFujiwara
-	.4byte CreditsSatoshiOhta
-	.4byte CreditsIwashita
-	.4byte CreditsTerminator
-
-	.4byte CreditsPOKeMONGraphicDesigners
-	.4byte CreditsTomita
-	.4byte CreditsUnno
-	.4byte CreditsEo
-	.4byte CreditsTerminator
-
-	.4byte CreditsPOKeMONDesigners
-	.4byte CreditsMorimoto
-	.4byte CreditsOkutani
-	.4byte CreditsNishida
-	.4byte CreditsTerminator
-
-	.4byte CreditsPOKeMONDesigners
-	.4byte CreditsSaito
-	.4byte CreditsYoshikawa
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsMusicComposition
-	.4byte CreditsIchinose
-	.4byte CreditsAoki
-	.4byte CreditsMasuda
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsSoundEffectsPOKeMONVoices
-	.4byte CreditsAoki
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsGameDesigners
-	.4byte CreditsMasuda
-	.4byte CreditsMorimoto
-	.4byte CreditsNishino
-	.4byte CreditsTerminator
-
-	.4byte CreditsGameDesigners
-	.4byte CreditsMatsushima
-	.4byte CreditsTetsujiOhta
-	.4byte CreditsSato
-	.4byte CreditsKawachimaru
-
-	.4byte CreditsGameDesigners
-	.4byte CreditsShimoyamada
-	.4byte CreditsOhmori
-	.4byte CreditsTakahashi
-	.4byte CreditsTerminator
-
-	.4byte CreditsPlotScenario
-	.4byte CreditsMasuda
-	.4byte CreditsTomisawa
-	.4byte CreditsNishino
-	.4byte CreditsTerminator
-
-	.4byte CreditsGameScenario
-	.4byte CreditsToshinobuMatsumiya
-	.4byte CreditsTomisawa
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsScriptDesigners
-	.4byte CreditsNohara
-	.4byte CreditsTetsujiOhta
-	.4byte CreditsTomomichiOhta
-	.4byte CreditsTerminator
-
-	.4byte CreditsMapDesigners
-	.4byte CreditsOhmori
-	.4byte CreditsTetsujiOhta
-	.4byte CreditsNishino
-	.4byte CreditsTerminator
-
-	.4byte CreditsMapDataDesigners
-	.4byte CreditsTetsujiOhta
-	.4byte CreditsTakahashi
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsParametricDesigners
-	.4byte CreditsNishino
-	.4byte CreditsMorimoto
-	.4byte CreditsTetsujiOhta
-	.4byte CreditsShimoyamada
-
-	.4byte CreditsTerminator
-	.4byte CreditsPOKeDEXText
-	.4byte CreditsMatsushima
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsEnvironmentToolProgrammers
-	.4byte CreditsSogabe
-	.4byte CreditsTamada
-	.4byte CreditsHiroyukiNakamura
-	.4byte CreditsMori
-
-	.4byte CreditsProductTesting
-	.4byte CreditsSuperMarioClub
-	.4byte CreditsTada
-	.4byte CreditsOhnishi
-	.4byte CreditsOkamura
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsTominaga
-	.4byte CreditsYoshiroTajiri
-	.4byte CreditsSasaki
-	.4byte CreditsTerminator
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsHamano
-	.4byte CreditsChieMatsumiya
-	.4byte CreditsShinozaki
-	.4byte CreditsFujii
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsSuyama
-	.4byte CreditsMitsuhara
-	.4byte CreditsKomura
-	.4byte CreditsOhashi
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsTakizawa
-	.4byte CreditsTakada
-	.4byte CreditsKondo
-	.4byte CreditsMashima
-
-	.4byte CreditsInformationSupervisors
-	.4byte CreditsEnomoto
-	.4byte CreditsTerada
-	.4byte CreditsSakurai
-	.4byte CreditsSagawa
-
-	.4byte CreditsCoordinators
-	.4byte CreditsKyokoWatanabe
-	.4byte CreditsNakano
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTaskManagers
-	.4byte CreditsYamagami
-	.4byte CreditsNomoto
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsProducers
-	.4byte CreditsJinnai
-	.4byte CreditsIzushi
-	.4byte CreditsTsuru
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsExecutiveDirector
-	.4byte CreditsSatoshiTajiri
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsExecutiveProducers
-	.4byte CreditsIwata
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsExecutiveProducers
-	.4byte CreditsIshihara
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsEnglishVersionCoordinators
-	.4byte CreditsHiroNakamura
-	.4byte CreditsMcMahill
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsTranslator
-	.4byte CreditsOgasawara
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsProgrammers
-	.4byte CreditsMurakawa
-	.4byte CreditsYamamoto
-	.4byte CreditsFunakoshi
-	.4byte CreditsKinashi
-
-	.4byte CreditsGraphicDesigners
-	.4byte CreditsYamamoto
-	.4byte CreditsKinashi
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsProductSupport
-	.4byte CreditsNakamichi
-	.4byte CreditsHara
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsArtwork
-	.4byte CreditsOkada
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsTerminator
-	.4byte CreditsTextEditor
-	.4byte CreditsLillygren
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsNOAProductTesting
-	.4byte CreditsHertzog
-	.4byte CreditsRidgeway
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsBrailleCodeCheck
-	.4byte CreditsNFotB
-	.4byte CreditsMaurer
-	.4byte CreditsJapanBrailleLibrary
-	.4byte CreditsEBU
-
-	.4byte CreditsBrailleCodeCheck
-	.4byte CreditsABA
-	.4byte CreditsRNZFotB
-	.4byte CreditsTerminator
-	.4byte CreditsTerminator
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsFord
-	.4byte CreditsBarlow
-	.4byte CreditsUesugi
-	.4byte CreditsUyama
-
-	.4byte CreditsSpecialThanks
-	.4byte CreditsHowitt
-	.4byte CreditsTilden
-	.4byte CreditsFujihara
-	.4byte CreditsTerminator
diff --git a/data/text/giddy.inc b/data/text/giddy.inc
index 040ef2ae5..a763776bf 100644
--- a/data/text/giddy.inc
+++ b/data/text/giddy.inc
@@ -1,16 +1,16 @@
-MauvilleCity_PokemonCenter_1F_Text_1B092A:: @ 81B092A
+gTextGiddy_Introduction:: @ 81B092A
 	.string "I’m GIDDY!\n"
 	.string "I have a scintillating story for you!\p"
 	.string "Would you like to hear my story?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B097C:: @ 81B097C
+gTextGiddy_YouveDeflatedMe:: @ 81B097C
 	.string "Oh...\n"
 	.string "You’ve deflated me...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0998:: @ 81B0998
+gTextGiddy_AlsoIWasThinking:: @ 81B0998
 	.string "Also, I was thinking...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B09B0:: @ 81B09B0
+gTextGiddy_ByeBye:: @ 81B09B0
 	.string "That’s about it, I think...\p"
 	.string "We should chat again!\n"
 	.string "Bye-bye!$"
diff --git a/data/text/hipster.inc b/data/text/hipster.inc
index a30943d3a..630db02b2 100644
--- a/data/text/hipster.inc
+++ b/data/text/hipster.inc
@@ -1,19 +1,19 @@
-MauvilleCity_PokemonCenter_1F_Text_1B0C5B:: @ 81B0C5B
+gTextHipster_TheyCallMeTheHipster:: @ 81B0C5B
 	.string "Hey, yo! They call me the HIPSTER.\n"
 	.string "I’ll teach you what’s hip and happening.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0CA7:: @ 81B0CA7
+gTextHipster_TaughtYouAlready:: @ 81B0CA7
 	.string "But, hey, I taught you what’s hip and\n"
 	.string "happening already.\p"
 	.string "I’d like to spread the good word to\n"
 	.string "other folks.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D11:: @ 81B0D11
+gTextHipster_YouAlreadyKnowALot:: @ 81B0D11
 	.string "But, hey, you already know a lot about\n"
 	.string "what’s hip and happening.\p"
 	.string "I’ve got nothing new to teach you!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1B0D75:: @ 81B0D75
+gTextHipster_HaveYouHeardAbout:: @ 81B0D75
 	.string "Hey, have you heard about\n"
 	.string "“{STR_VAR_1}”?\p"
 	.string "What’s it mean? Well...\n"
diff --git a/data/text/storyteller.inc b/data/text/storyteller.inc
index 3cfa8a698..437a1fa21 100644
--- a/data/text/storyteller.inc
+++ b/data/text/storyteller.inc
@@ -1,24 +1,24 @@
-MauvilleCity_PokemonCenter_1F_Text_1AECC6:: @ 81AECC6
+gTextStoryteller_Introduction:: @ 81AECC6
 	.string "I’m the STORYTELLER.\n"
 	.string "I’ll tell you tales of legendary\l"
 	.string "TRAINERS.\p"
 	.string "Will you hear my tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED1D:: @ 81AED1D
+gTextStoryteller_OhIFeelStifled:: @ 81AED1D
 	.string "Oh...\n"
 	.string "I feel stifled...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED35:: @ 81AED35
+gTextStoryteller_WhichTale:: @ 81AED35
 	.string "I know of these legends.\n"
 	.string "Which tale will you have me tell?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AED70:: @ 81AED70
+gTextStoryteller_ButIKnowOfNoLegendaryTrainers:: @ 81AED70
 	.string "But, I know of no legendary TRAINERS.\n"
 	.string "Hence, I know no tales.\p"
 	.string "Where does one find a TRAINER worthy\n"
 	.string "of a legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
+gTextStoryteller_BirthOfANewLegend:: @ 81AEDE8
 	.string "What’s that?!\n"
 	.string "You... You...\p"
 	.string "{STR_VAR_2}\n"
@@ -26,38 +26,38 @@ MauvilleCity_PokemonCenter_1F_Text_1AEDE8:: @ 81AEDE8
 	.string "That is indeed magnificent!\n"
 	.string "It’s the birth of a new legend!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEE50:: @ 81AEE50
+gTextStoryteller_CouldThereBeOtherTrainers:: @ 81AEE50
 	.string "It gets me thinking, could there be\n"
 	.string "other TRAINERS with more impressive\l"
 	.string "legends awaiting discovery?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEEB4:: @ 81AEEB4
+gTextStoryteller_HaveYouAnyTales:: @ 81AEEB4
 	.string "Are you a TRAINER?\p"
 	.string "Then tell me, have you any tales that\n"
 	.string "are even remotely legendary?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF0A:: @ 81AEF0A
+gTextStoryteller_HearAnotherLegendaryTale:: @ 81AEF0A
 	.string "Incidentally... Would you care to hear\n"
 	.string "another legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEF49:: @ 81AEF49
+gTextStoryteller_ImNotSatisfied:: @ 81AEF49
 	.string "Hmm...\n"
 	.string "I’m not satisfied...\p"
 	.string "I wish you would bring me news worthy\n"
 	.string "of being called a legend.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEFA5:: @ 81AEFA5
+gTextStoryteller_WishMorePeopleWould:: @ 81AEFA5
 	.string "I wish more people would be interested\n"
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
-UnknownString_81AEFFC:: @ 81AEFFC
+gTextStoryteller_Story1Title:: @ 81AEFFC
 	.string "The Save-Happy TRAINER$"
 
-UnknownString_81AF013:: @ 81AF013
+gTextStoryteller_Story1Action:: @ 81AF013
 	.string "Saved the game$"
 
-UnknownString_81AF022:: @ 81AF022
+gTextStoryteller_Story1Text:: @ 81AF022
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -65,13 +65,13 @@ UnknownString_81AF022:: @ 81AF022
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
-UnknownString_81AF0A3:: @ 81AF0A3
+gTextStoryteller_Story2Title:: @ 81AF0A3
 	.string "The Trendsetter TRAINER$"
 
-UnknownString_81AF0BB:: @ 81AF0BB
+gTextStoryteller_Story2Action:: @ 81AF0BB
 	.string "Started trends$"
 
-UnknownString_81AF0CA:: @ 81AF0CA
+gTextStoryteller_Story2Text:: @ 81AF0CA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -79,13 +79,13 @@ UnknownString_81AF0CA:: @ 81AF0CA
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-UnknownString_81AF149:: @ 81AF149
+gTextStoryteller_Story3Title:: @ 81AF149
 	.string "The BERRY-Planting TRAINER$"
 
-UnknownString_81AF164:: @ 81AF164
+gTextStoryteller_Story3Action:: @ 81AF164
 	.string "Planted BERRIES$"
 
-UnknownString_81AF174:: @ 81AF174
+gTextStoryteller_Story3Text:: @ 81AF174
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -93,13 +93,13 @@ UnknownString_81AF174:: @ 81AF174
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
-UnknownString_81AF1E5:: @ 81AF1E5
+gTextStoryteller_Story4Title:: @ 81AF1E5
 	.string "The BIKE-Loving TRAINER$"
 
-UnknownString_81AF1FD:: @ 81AF1FD
+gTextStoryteller_Story4Action:: @ 81AF1FD
 	.string "Traded BIKES$"
 
-UnknownString_81AF20A:: @ 81AF20A
+gTextStoryteller_Story4Text:: @ 81AF20A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -107,13 +107,13 @@ UnknownString_81AF20A:: @ 81AF20A
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
-UnknownString_81AF281:: @ 81AF281
+gTextStoryteller_Story5Title:: @ 81AF281
 	.string "The Interviewed TRAINER$"
 
-UnknownString_81AF299:: @ 81AF299
+gTextStoryteller_Story5Action:: @ 81AF299
 	.string "Got interviewed$"
 
-UnknownString_81AF2A9:: @ 81AF2A9
+gTextStoryteller_Story5Text:: @ 81AF2A9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -121,26 +121,26 @@ UnknownString_81AF2A9:: @ 81AF2A9
 	.string "{STR_VAR_3} must be a TRAINER who’s\n"
 	.string "attracting much attention!$"
 
-UnknownString_81AF32C:: @ 81AF32C
+gTextStoryteller_Story6Title:: @ 81AF32C
 	.string "The Battle-Happy TRAINER$"
 
-UnknownString_81AF345:: @ 81AF345
+gTextStoryteller_Story6Action:: @ 81AF345
 	.string "Battled$"
 
-UnknownString_81AF34D:: @ 81AF34D
+gTextStoryteller_Story6Text:: @ 81AF34D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
-UnknownString_81AF3D0:: @ 81AF3D0
+gTextStoryteller_Story7Title:: @ 81AF3D0
 	.string "The POKéMON-Catching TRAINER$"
 
-UnknownString_81AF3ED:: @ 81AF3ED
+gTextStoryteller_Story7Action:: @ 81AF3ED
 	.string "Caught POKéMON$"
 
-UnknownString_81AF3FC:: @ 81AF3FC
+gTextStoryteller_Story7Text:: @ 81AF3FC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -148,13 +148,13 @@ UnknownString_81AF3FC:: @ 81AF3FC
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
-UnknownString_81AF46D:: @ 81AF46D
+gTextStoryteller_Story8Title:: @ 81AF46D
 	.string "The Fishing TRAINER$"
 
-UnknownString_81AF481:: @ 81AF481
+gTextStoryteller_Story8Action:: @ 81AF481
 	.string "Caught POKéMON with a ROD$"
 
-UnknownString_81AF49B:: @ 81AF49B
+gTextStoryteller_Story8Text:: @ 81AF49B
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -162,13 +162,13 @@ UnknownString_81AF49B:: @ 81AF49B
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
-UnknownString_81AF511:: @ 81AF511
+gTextStoryteller_Story9Title:: @ 81AF511
 	.string "The EGG-Warming TRAINER$"
 
-UnknownString_81AF529:: @ 81AF529
+gTextStoryteller_Story9Action:: @ 81AF529
 	.string "Hatched EGGS$"
 
-UnknownString_81AF536:: @ 81AF536
+gTextStoryteller_Story9Text:: @ 81AF536
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -176,13 +176,13 @@ UnknownString_81AF536:: @ 81AF536
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
-UnknownString_81AF5A9:: @ 81AF5A9
+gTextStoryteller_Story10Title:: @ 81AF5A9
 	.string "The Evolver TRAINER$"
 
-UnknownString_81AF5BD:: @ 81AF5BD
+gTextStoryteller_Story10Action:: @ 81AF5BD
 	.string "Evolved POKéMON$"
 
-UnknownString_81AF5CD:: @ 81AF5CD
+gTextStoryteller_Story10Text:: @ 81AF5CD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -190,13 +190,13 @@ UnknownString_81AF5CD:: @ 81AF5CD
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
-UnknownString_81AF63F:: @ 81AF63F
+gTextStoryteller_Story11Title:: @ 81AF63F
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
-UnknownString_81AF661:: @ 81AF661
+gTextStoryteller_Story11Action:: @ 81AF661
 	.string "Used POKéMON CENTERS$"
 
-UnknownString_81AF676:: @ 81AF676
+gTextStoryteller_Story11Text:: @ 81AF676
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -204,13 +204,13 @@ UnknownString_81AF676:: @ 81AF676
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
-UnknownString_81AF711:: @ 81AF711
+gTextStoryteller_Story12Title:: @ 81AF711
 	.string "The Homebody TRAINER$"
 
-UnknownString_81AF726:: @ 81AF726
+gTextStoryteller_Story12Action:: @ 81AF726
 	.string "Rested POKéMON at home$"
 
-UnknownString_81AF73D:: @ 81AF73D
+gTextStoryteller_Story12Text:: @ 81AF73D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -218,13 +218,13 @@ UnknownString_81AF73D:: @ 81AF73D
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
-UnknownString_81AF7BF:: @ 81AF7BF
+gTextStoryteller_Story13Title:: @ 81AF7BF
 	.string "The SAFARI-Loving TRAINER$"
 
-UnknownString_81AF7D9:: @ 81AF7D9
+gTextStoryteller_Story13Action:: @ 81AF7D9
 	.string "Entered the SAFARI ZONE$"
 
-UnknownString_81AF7F1:: @ 81AF7F1
+gTextStoryteller_Story13Text:: @ 81AF7F1
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -232,13 +232,13 @@ UnknownString_81AF7F1:: @ 81AF7F1
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
-UnknownString_81AF88A:: @ 81AF88A
+gTextStoryteller_Story14Title:: @ 81AF88A
 	.string "The CUT-Frenzy TRAINER$"
 
-UnknownString_81AF8A1:: @ 81AF8A1
+gTextStoryteller_Story14Action:: @ 81AF8A1
 	.string "Used CUT$"
 
-UnknownString_81AF8AA:: @ 81AF8AA
+gTextStoryteller_Story14Text:: @ 81AF8AA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -246,13 +246,13 @@ UnknownString_81AF8AA:: @ 81AF8AA
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
-UnknownString_81AF91B:: @ 81AF91B
+gTextStoryteller_Story15Title:: @ 81AF91B
 	.string "The ROCK-SMASHING TRAINER$"
 
-UnknownString_81AF935:: @ 81AF935
+gTextStoryteller_Story15Action:: @ 81AF935
 	.string "Smashed rocks$"
 
-UnknownString_81AF943:: @ 81AF943
+gTextStoryteller_Story15Text:: @ 81AF943
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -260,13 +260,13 @@ UnknownString_81AF943:: @ 81AF943
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can’t leave a stone unsmashed!$"
 
-UnknownString_81AF9C8:: @ 81AF9C8
+gTextStoryteller_Story16Title:: @ 81AF9C8
 	.string "The Move-Loving TRAINER$"
 
-UnknownString_81AF9E0:: @ 81AF9E0
+gTextStoryteller_Story16Action:: @ 81AF9E0
 	.string "Moved the SECRET BASE$"
 
-UnknownString_81AF9F6:: @ 81AF9F6
+gTextStoryteller_Story16Text:: @ 81AF9F6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -274,13 +274,13 @@ UnknownString_81AF9F6:: @ 81AF9F6
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
-UnknownString_81AFA79:: @ 81AFA79
+gTextStoryteller_Story17Title:: @ 81AFA79
 	.string "The SPLASH-Happy TRAINER$"
 
-UnknownString_81AFA92:: @ 81AFA92
+gTextStoryteller_Story17Action:: @ 81AFA92
 	.string "Used SPLASH$"
 
-UnknownString_81AFA9E:: @ 81AFA9E
+gTextStoryteller_Story17Text:: @ 81AFA9E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -288,13 +288,13 @@ UnknownString_81AFA9E:: @ 81AFA9E
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
-UnknownString_81AFB17:: @ 81AFB17
+gTextStoryteller_Story18Title:: @ 81AFB17
 	.string "The Tenacious TRAINER$"
 
-UnknownString_81AFB2D:: @ 81AFB2D
+gTextStoryteller_Story18Action:: @ 81AFB2D
 	.string "Resorted to using STRUGGLE$"
 
-UnknownString_81AFB48:: @ 81AFB48
+gTextStoryteller_Story18Text:: @ 81AFB48
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -302,13 +302,13 @@ UnknownString_81AFB48:: @ 81AFB48
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
-UnknownString_81AFBD8:: @ 81AFBD8
+gTextStoryteller_Story19Title:: @ 81AFBD8
 	.string "The SLOT Champ$"
 
-UnknownString_81AFBE7:: @ 81AFBE7
+gTextStoryteller_Story19Action:: @ 81AFBE7
 	.string "Won the jackpot on the SLOTS$"
 
-UnknownString_81AFC04:: @ 81AFC04
+gTextStoryteller_Story19Text:: @ 81AFC04
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -316,13 +316,13 @@ UnknownString_81AFC04:: @ 81AFC04
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
-UnknownString_81AFC8A:: @ 81AFC8A
+gTextStoryteller_Story20Title:: @ 81AFC8A
 	.string "The ROULETTE Champ$"
 
-UnknownString_81AFC9D:: @ 81AFC9D
+gTextStoryteller_Story20Action:: @ 81AFC9D
 	.string "Had consecutive ROULETTE wins of$"
 
-UnknownString_81AFCBE:: @ 81AFCBE
+gTextStoryteller_Story20Text:: @ 81AFCBE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -330,13 +330,13 @@ UnknownString_81AFCBE:: @ 81AFCBE
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
-UnknownString_81AFD44:: @ 81AFD44
+gTextStoryteller_Story21Title:: @ 81AFD44
 	.string "The BATTLE TOWER Challenger$"
 
-UnknownString_81AFD60:: @ 81AFD60
+gTextStoryteller_Story21Action:: @ 81AFD60
 	.string "Took the BATTLE TOWER challenge$"
 
-UnknownString_81AFD80:: @ 81AFD80
+gTextStoryteller_Story21Text:: @ 81AFD80
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -344,13 +344,13 @@ UnknownString_81AFD80:: @ 81AFD80
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
-UnknownString_81AFE1D:: @ 81AFE1D
+gTextStoryteller_Story22Title:: @ 81AFE1D
 	.string "The Blend-Loving TRAINER$"
 
-UnknownString_81AFE36:: @ 81AFE36
+gTextStoryteller_Story22Action:: @ 81AFE36
 	.string "Made {POKEBLOCK}S$"
 
-UnknownString_81AFE42:: @ 81AFE42
+gTextStoryteller_Story22Text:: @ 81AFE42
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -358,13 +358,13 @@ UnknownString_81AFE42:: @ 81AFE42
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
-UnknownString_81AFEC2:: @ 81AFEC2
+gTextStoryteller_Story23Title:: @ 81AFEC2
 	.string "The CONTEST-Loving TRAINER$"
 
-UnknownString_81AFEDD:: @ 81AFEDD
+gTextStoryteller_Story23Action:: @ 81AFEDD
 	.string "Entered CONTESTS$"
 
-UnknownString_81AFEEE:: @ 81AFEEE
+gTextStoryteller_Story23Text:: @ 81AFEEE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -372,13 +372,13 @@ UnknownString_81AFEEE:: @ 81AFEEE
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
-UnknownString_81AFF68:: @ 81AFF68
+gTextStoryteller_Story24Title:: @ 81AFF68
 	.string "The CONTEST Master$"
 
-UnknownString_81AFF7B:: @ 81AFF7B
+gTextStoryteller_Story24Action:: @ 81AFF7B
 	.string "Won CONTESTS$"
 
-UnknownString_81AFF88:: @ 81AFF88
+gTextStoryteller_Story24Text:: @ 81AFF88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -386,13 +386,13 @@ UnknownString_81AFF88:: @ 81AFF88
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
-UnknownString_81AFFFB:: @ 81AFFFB
+gTextStoryteller_Story25Title:: @ 81AFFFB
 	.string "The Happy Shopper$"
 
-UnknownString_81B000D:: @ 81B000D
+gTextStoryteller_Story25Action:: @ 81B000D
 	.string "Shopped$"
 
-UnknownString_81B0015:: @ 81B0015
+gTextStoryteller_Story25Text:: @ 81B0015
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -400,13 +400,13 @@ UnknownString_81B0015:: @ 81B0015
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
-UnknownString_81B009D:: @ 81B009D
+gTextStoryteller_Story26Title:: @ 81B009D
 	.string "The Item-Finding TRAINER$"
 
-UnknownString_81B00B6:: @ 81B00B6
+gTextStoryteller_Story26Action:: @ 81B00B6
 	.string "Used an ITEMFINDER$"
 
-UnknownString_81B00C9:: @ 81B00C9
+gTextStoryteller_Story26Text:: @ 81B00C9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -414,13 +414,13 @@ UnknownString_81B00C9:: @ 81B00C9
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
-UnknownString_81B014D:: @ 81B014D
+gTextStoryteller_Story27Title:: @ 81B014D
 	.string "The Rain-Soaked TRAINER$"
 
-UnknownString_81B0165:: @ 81B0165
+gTextStoryteller_Story27Action:: @ 81B0165
 	.string "Got rained on$"
 
-UnknownString_81B0173:: @ 81B0173
+gTextStoryteller_Story27Text:: @ 81B0173
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -428,13 +428,13 @@ UnknownString_81B0173:: @ 81B0173
 	.string "{STR_VAR_3}’s charisma must even\n"
 	.string "attract rain!$"
 
-UnknownString_81B01E9:: @ 81B01E9
+gTextStoryteller_Story28Title:: @ 81B01E9
 	.string "The Avid POKéDEX Reader$"
 
-UnknownString_81B0201:: @ 81B0201
+gTextStoryteller_Story28Action:: @ 81B0201
 	.string "Checked a POKéDEX$"
 
-UnknownString_81B0213:: @ 81B0213
+gTextStoryteller_Story28Text:: @ 81B0213
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -442,13 +442,13 @@ UnknownString_81B0213:: @ 81B0213
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
-UnknownString_81B0290:: @ 81B0290
+gTextStoryteller_Story29Title:: @ 81B0290
 	.string "The RIBBON Collector$"
 
-UnknownString_81B02A5:: @ 81B02A5
+gTextStoryteller_Story29Action:: @ 81B02A5
 	.string "Received RIBBONS$"
 
-UnknownString_81B02B6:: @ 81B02B6
+gTextStoryteller_Story29Text:: @ 81B02B6
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -456,13 +456,13 @@ UnknownString_81B02B6:: @ 81B02B6
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
-UnknownString_81B0337:: @ 81B0337
+gTextStoryteller_Story30Title:: @ 81B0337
 	.string "The Ledge-Jumping TRAINER$"
 
-UnknownString_81B0351:: @ 81B0351
+gTextStoryteller_Story30Action:: @ 81B0351
 	.string "Jumped down ledges$"
 
-UnknownString_81B0364:: @ 81B0364
+gTextStoryteller_Story30Text:: @ 81B0364
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -470,26 +470,26 @@ UnknownString_81B0364:: @ 81B0364
 	.string "If there’s a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can’t ignore it!$"
 
-UnknownString_81B03E9:: @ 81B03E9
+gTextStoryteller_Story31Title:: @ 81B03E9
 	.string "The Legendary TV Viewer$"
 
-UnknownString_81B0401:: @ 81B0401
+gTextStoryteller_Story31Action:: @ 81B0401
 	.string "Watched TV$"
 
-UnknownString_81B040C:: @ 81B040C
+gTextStoryteller_Story31Text:: @ 81B040C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
-UnknownString_81B046E:: @ 81B046E
+gTextStoryteller_Story32Title:: @ 81B046E
 	.string "The Time-Conscious TRAINER$"
 
-UnknownString_81B0489:: @ 81B0489
+gTextStoryteller_Story32Action:: @ 81B0489
 	.string "Checked the time$"
 
-UnknownString_81B049A:: @ 81B049A
+gTextStoryteller_Story32Text:: @ 81B049A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -497,13 +497,13 @@ UnknownString_81B049A:: @ 81B049A
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who’s conscious of the time.$"
 
-UnknownString_81B0523:: @ 81B0523
+gTextStoryteller_Story33Title:: @ 81B0523
 	.string "The POKéMON LOTTERY Wizard$"
 
-UnknownString_81B053E:: @ 81B053E
+gTextStoryteller_Story33Action:: @ 81B053E
 	.string "Won POKéMON LOTTERIES$"
 
-UnknownString_81B0554:: @ 81B0554
+gTextStoryteller_Story33Text:: @ 81B0554
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -511,13 +511,13 @@ UnknownString_81B0554:: @ 81B0554
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
-UnknownString_81B05D8:: @ 81B05D8
+gTextStoryteller_Story34Title:: @ 81B05D8
 	.string "The DAY CARE-Using Trainer$"
 
-UnknownString_81B05F3:: @ 81B05F3
+gTextStoryteller_Story34Action:: @ 81B05F3
 	.string "Left POKéMON at the DAY CARE$"
 
-UnknownString_81B0610:: @ 81B0610
+gTextStoryteller_Story34Text:: @ 81B0610
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -525,13 +525,13 @@ UnknownString_81B0610:: @ 81B0610
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
-UnknownString_81B06A9:: @ 81B06A9
+gTextStoryteller_Story35Title:: @ 81B06A9
 	.string "The CABLE CAR-Loving TRAINER$"
 
-UnknownString_81B06C6:: @ 81B06C6
+gTextStoryteller_Story35Action:: @ 81B06C6
 	.string "Rode the CABLE CAR$"
 
-UnknownString_81B06D9:: @ 81B06D9
+gTextStoryteller_Story35Text:: @ 81B06D9
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -539,13 +539,13 @@ UnknownString_81B06D9:: @ 81B06D9
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who’s up and down all the time!$"
 
-UnknownString_81B0763:: @ 81B0763
+gTextStoryteller_Story36Title:: @ 81B0763
 	.string "The Hot Spring-Loving TRAINER$"
 
-UnknownString_81B0781:: @ 81B0781
+gTextStoryteller_Story36Action:: @ 81B0781
 	.string "Bathed in hot springs$"
 
-UnknownString_81B0797:: @ 81B0797
+gTextStoryteller_Story36Text:: @ 81B0797
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
diff --git a/data/text/trader.inc b/data/text/trader.inc
index dba63bcf8..599344091 100644
--- a/data/text/trader.inc
+++ b/data/text/trader.inc
@@ -1,57 +1,57 @@
-MauvilleCity_PokemonCenter_1F_Text_1AE88F:: @ 81AE88F
+gTextTrader_Introduction:: @ 81AE88F
 	.string "Hi, I’m the TRADER.\n"
 	.string "Want to trade decorations with me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8C6:: @ 81AE8C6
+gTextTrader_FeelUnwanted1:: @ 81AE8C6
 	.string "Oh...\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE8DF:: @ 81AE8DF
+gTextTrader_TradedAlready:: @ 81AE8DF
 	.string "But we’ve traded decorations already,\n"
 	.string "you and I.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE910:: @ 81AE910
+gTextTrader_MenuPrompt:: @ 81AE910
 	.string "If you see any decorative item that\n"
 	.string "you want of mine, speak up.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE950:: @ 81AE950
+gTextTrader_DontWantAnything:: @ 81AE950
 	.string "You don’t want anything?\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE97C:: @ 81AE97C
+gTextTrader_ItemOnceBelongedTo:: @ 81AE97C
 	.string "That decorative item once belonged\n"
 	.string "to {STR_VAR_1}.\p"
 	.string "Do you want it?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9B6:: @ 81AE9B6
+gTextTrader_YouDontHaveDecorations:: @ 81AE9B6
 	.string "Uh... Wait a second. You don’t have a\n"
 	.string "single piece of decoration!$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AE9F8:: @ 81AE9F8
+gTextTrader_PickDecorationYoullTrade:: @ 81AE9F8
 	.string "Okay, pick the decoration that you’ll\n"
 	.string "trade to me.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA2B:: @ 81AEA2B
+gTextTrader_FeelUnwanted2:: @ 81AEA2B
 	.string "You won’t trade with me?\n"
 	.string "I feel unwanted...$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA57:: @ 81AEA57
+gTextTrader_NoRoomForThis:: @ 81AEA57
 	.string "You’ve got all the {STR_VAR_2}S that can\n"
 	.string "be stored. You’ve no room for this.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEA9B:: @ 81AEA9B
+gTextTrader_SoWellTrade:: @ 81AEA9B
 	.string "Okay, so we’ll trade my {STR_VAR_3}\n"
 	.string "for your {STR_VAR_2}?$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAC3:: @ 81AEAC3
+gTextTrader_InUseYouCantTradeIt:: @ 81AEAC3
 	.string "That piece of decoration is in use.\n"
 	.string "You can’t trade it.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEAFB:: @ 81AEAFB
+gTextTrader_ThenWellTrade:: @ 81AEAFB
 	.string "Then we’ll trade!\n"
 	.string "I’ll send my decoration to your PC.$"
 
-MauvilleCity_PokemonCenter_1F_Text_1AEB31:: @ 81AEB31
+gTextTrader_ICantTradeThatOneAway:: @ 81AEB31
 	.string "Oops! Sorry!\n"
 	.string "That’s a really rare piece of decoration.\l"
 	.string "I can’t trade that one away!\p"