11 files changed, 521 insertions, 6 deletions
diff --git a/data/text/check_furniture.inc b/data/text/check_furniture.inc
new file mode 100644
index 000000000..a8e008e7c
--- /dev/null
+++ b/data/text/check_furniture.inc
@@ -0,0 +1,27 @@
+Text_PictureBookshelf: @ 81C6A69
+	.string "There's a set of POKéMON picture books.$"
+
+Text_Bookshelf: @ 81C6A91
+	.string "It's filled with all sorts of books.$"
+
+Text_PokemonCenterBookshelf: @ 81C6AB6
+	.string "POKéMON magazines!\n"
+	.string "POKéMON PAL...\p"
+	.string "POKéMON HANDBOOK...\n"
+	.string "ADORABLE POKéMON...$"
+
+Text_Vase: @ 81C6B00
+	.string "This vase looks expensive...\n"
+	.string "Peered inside...\p"
+	.string "But, it was empty.$"
+
+Text_EmptyTrashCan: @ 81C6B41
+	.string "It's empty.$"
+
+Text_ShopShelf: @ 81C6B4D
+	.string "The shelves brim with all sorts of\n"
+	.string "POKéMON merchandise.$"
+
+Text_Blueprint: @ 81C6B85
+	.string "A blueprint of some sort?\n"
+	.string "It's too complicated!$"
diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc
new file mode 100644
index 000000000..a974e7b0f
--- /dev/null
+++ b/data/text/mart_clerk.inc
@@ -0,0 +1,15 @@
+Text_HowMayIServeYou:: @ 81A0BE4
+	.string "Welcome!\p"
+	.string "How may I serve you?$"
+
+Text_PleaseComeAgain:: @ 81A0C02
+	.string "Please come again!$"
+
+@ Unused
+Text_DiscountSaleToday: @ 81A0C15
+	.string "Welcome!\p"
+	.string "We're having a discount sale today!$"
+
+Text_PlayerWhatCanIDoForYou:: @ 81A0C42
+	.string "{PLAYER}{KUN}, welcome!\p"
+	.string "What can I do for you?$"
diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc
new file mode 100644
index 000000000..3473487ef
--- /dev/null
+++ b/data/text/obtain_item.inc
@@ -0,0 +1,27 @@
+Text_ObtainedTheItem: @ 81A0C68
+	.string "Obtained the {STR_VAR_2}.$"
+
+Text_TheBagIsFull:: @ 81A0C79
+	.string "The BAG is full...$"
+
+Text_PutItemInPocket: @ 81A0C8C
+	.string "{PLAYER} put away the {STR_VAR_2}\n"
+	.string "in the {STR_VAR_3} POCKET.$"
+
+Text_FoundOneItem: @ 81A0CB1
+	.string "{PLAYER} found one {STR_VAR_2}!$"
+
+Text_TooBadBagIsFull:
+	.string "Too bad!\n"
+	.string "The BAG is full...$"
+
+Text_ObtainedTheDecor: @ 81A0CDE
+	.string "Obtained the {STR_VAR_2}.$"
+
+Text_NoRoomLeftForAnother:: @ 81A0CEF
+	.string "Too bad! There's no room left for\n"
+	.string "another {STR_VAR_2}...$"
+
+Text_TheDecorWasTransferredToThePC: @ 81A0D1F
+	.string "The {STR_VAR_2} was transferred\n"
+	.string "to the PC.$"
diff --git a/data/text/pc.inc b/data/text/pc.inc
new file mode 100644
index 000000000..1d350d24b
--- /dev/null
+++ b/data/text/pc.inc
@@ -0,0 +1,17 @@
+Text_BootUpPC: @ 81A09EC
+	.string "{PLAYER} booted up the PC.$"
+
+Text_WhichPCShouldBeAccessed:: @ 81A0A01
+	.string "Which PC should be accessed?$"
+
+Text_AccessedSomeonesPC: @ 81A0A1E
+	.string "Accessed someone's PC.$"
+
+Text_StorageSystemOpened: @ 81A0A35
+	.string "POKéMON Storage System opened.$"
+
+Text_AccessedPlayersPC: @ 81A0A54
+	.string "Accessed {PLAYER}'s PC.$"
+
+Text_AccessedLanettesPC: @ 81A0A66
+	.string "Accessed LANETTE's PC.$"
diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc
new file mode 100644
index 000000000..6c63f8d93
--- /dev/null
+++ b/data/text/pkmn_center_nurse.inc
@@ -0,0 +1,26 @@
+gText_NurseJoy_Welcome:: @ 81A0A7D
+	.string "Hello, and welcome to the POKéMON\n"
+	.string "CENTER.\p"
+	.string "We restore your tired POKéMON to\n"
+	.string "full health.\p"
+	.string "Would you like to rest your POKéMON?$"
+
+gText_NurseJoy_WeHopeToSeeYouAgain:: @ 81A0AFA
+	.string "We hope to see you again!$"
+
+gText_NurseJoy_ThankYouForWaiting:: @ 81A0B14
+	.string "Thank you for waiting.\p"
+	.string "We've restored your POKéMON to\n"
+	.string "full health.$"
+
+UnknownString_81A0B57: @ 81A0B57
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TRADE CENTER.$"
+
+UnknownString_81A0B87: @ 81A0B87
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "COLOSSEUM.$"
+
+UnknownString_81A0BB4: @ 81A0BB4
+	.string "Welcome to the POKéMON CABLE CLUB\n"
+	.string "TIME CAPSULE.$"
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 07495b000..267130b26 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -1,13 +1,13 @@
-Route101_Text_1C4449:: @ 81C4449
+gBirchDexRatingText_ComeToShowMePokedex:: @ 81C4449
 	.string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p"
 	.string "Have you come to show me how your\n"
 	.string "POKéDEX is coming along?$"
 
-Route101_Text_1C449B:: @ 81C449B
+gBirchDexRatingText_Cancel:: @ 81C449B
 	.string "Hm? Oh, you haven't caught enough\n"
 	.string "POKéMON to make it worthwhile.$"
 
-Route101_Text_1C44DC:: @ 81C44DC
+gBirchDexRatingText_SoYouveSeenAndCaught:: @ 81C44DC
 	.string "Hmhm...\p"
 	.string "So, you've seen {STR_VAR_1} POKéMON,\n"
 	.string "and you've caught {STR_VAR_2} POKéMON...$"
@@ -99,7 +99,7 @@ gBirchDexRatingText_DexCompleted:: @ 81C4ADA
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"
 
-Route101_Text_1C4B05:: @ 81C4B05
+gBirchDexRatingText_OnANationwideBasis:: @ 81C4B05
 	.string "Hmhm...\n"
 	.string "On a nationwide basis...\p"
 	.string "You've seen {STR_VAR_1} POKéMON,\n"
diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc
new file mode 100644
index 000000000..d542d0c78
--- /dev/null
+++ b/data/text/record_mix.inc
@@ -0,0 +1,6 @@
+UnusedMixRecordsPromptText: @ 81A099F
+	.string "Would you like to mix records with other\n"
+	.string "TRAINERS?$"
+
+UnusedMixRecordsSeeYouAgainText: @ 81A09D2
+	.string "We hope to see you again!$"
diff --git a/data/text/sample_message.inc b/data/text/sample_message.inc
new file mode 100644
index 000000000..e061b9328
--- /dev/null
+++ b/data/text/sample_message.inc
@@ -0,0 +1,17 @@
+Text_SampleMessage1:: @ 81A089A
+	.string "This is sample message 1.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
+
+Text_SampleMessage2:: @ 81A08F1
+	.string "This is sample message 2.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
+
+Text_SampleMessage3:: @ 81A0948
+	.string "This is sample message 3.\p"
+	.string "Welcome to the world of\n"
+	.string "POKéMON AGB!\l"
+	.string "We hope you enjoy this!$"
diff --git a/data/text/secret_base.inc b/data/text/secret_base.inc
new file mode 100644
index 000000000..303483c9a
--- /dev/null
+++ b/data/text/secret_base.inc
@@ -0,0 +1,64 @@
+SecretBase_Text_AllDecorationsWillBeReturned: @ 81A38FB
+	.string "All decorations and furniture in your\n"
+	.string "SECRET BASE will be returned to your PC.\p"
+	.string "Is that okay?$"
+
+SecretBase_Text_WantToRegisterSecretBase: @ 81A3958
+	.string "Do you want to register\n"
+	.string "{STR_VAR_1}'s SECRET BASE?$"
+
+SecretBase_Text_AlreadyRegisteredDelete: @ 81A3982
+	.string "This data is already registered.\n"
+	.string "Would you like to delete it?$"
+
+SecretBase_Text_TooManyBasesDeleteSome: @ 81A39C0
+	.string "Up to 10 locations can be registered.\p"
+	.string "Delete a location if you want to\n"
+	.string "register another location.$"
+
+SecretBase_Text_RegistrationCompleted: @ 81A3A22
+	.string "Registration completed.$"
+
+SecretBase_Text_DataUnregistered: @ 81A3A3A
+	.string "Data has been unregistered.$"
+
+UnknownString_81A3A56: @ 81A3A56
+	.string "There are no decorations...$"
+
+SecretBase_Text_BootUpPC: @ 81A3A72
+	.string "{PLAYER} booted up the PC.$"
+
+SecretBase_Text_WhatWouldYouLikeToDo: @ 81A3A87
+	.string "What would you like to do?$"
+
+SecretBase_Text_RegistryInfo: @ 81A3AA2
+	.string "The registered SECRET BASE will remain\n"
+	.string "unless the owner moves away.\p"
+	.string "If it is removed from the registry,\n"
+	.string "another SECRET BASE may take its place.\p"
+	.string "Up to ten locations can be registered.{PAUSE_UNTIL_PRESS}$"
+
+SecretBase_Text_BattleTowerShield: @ 81A3B5B
+	.string "A shield of {STR_VAR_2} that marks winning\n"
+	.string "{STR_VAR_1} times in a row at the BATTLE TOWER.$"
+
+SecretBase_Text_ToyTV: @ 81A3BA4
+	.string "A realistic toy TV. It could be easily\n"
+	.string "mistaken for the real thing.$"
+
+SecretBase_Text_SeedotTV: @ 81A3BE8
+	.string "A toy TV shaped like a SEEDOT.\n"
+	.string "It looks ready to roll away on its own...$"
+
+SecretBase_Text_SkittyTV: @ 81A3C31
+	.string "A toy TV shaped like a SKITTY.\n"
+	.string "It looks ready to stroll away...$"
+
+UnknownString_81A3C71: @ 81A3C71
+	.string "You may only make one SECRET BASE.\p"
+	.string "Would you like to move from the SECRET\n"
+	.string "BASE near {STR_VAR_1}?$"
+
+UnknownString_81A3CC9: @ 81A3CC9
+	.string "Moving completed.\p"
+	.string "Would you like to use the SECRET POWER?$"
diff --git a/data/text/secret_base_trainers.inc b/data/text/secret_base_trainers.inc
new file mode 100644
index 000000000..57b37bf7f
--- /dev/null
+++ b/data/text/secret_base_trainers.inc
@@ -0,0 +1,316 @@
+UnknownString_81A1948: @ 81A1948
+	.string "If some vines drop down, this tree can\n"
+	.string "be climbed.$"
+
+UnknownString_81A197B: @ 81A197B
+	.string "If some vines drop down, this tree can\n"
+	.string "be climbed.\p"
+	.string "Use the SECRET POWER?$"
+
+UnknownString_81A19C4: @ 81A19C4
+	.string "A thick vine dropped down!$"
+
+UnknownString_81A19DF: @ 81A19DF
+	.string "Want to make your SECRET BASE here?$"
+
+UnknownString_81A1A03: @ 81A1A03
+	.string "If this clump of grass can be moved,\n"
+	.string "it might be possible to go inside.$"
+
+UnknownString_81A1A4B: @ 81A1A4B
+	.string "If this clump of grass can be moved,\n"
+	.string "it might be possible to go inside.\p"
+	.string "Use the SECRET POWER?$"
+
+UnknownString_81A1AA9: @ 81A1AA9
+	.string "Discovered a small entrance!$"
+
+UnknownString_81A1AC6: @ 81A1AC6
+	.string "Want to make your SECRET BASE here?$"
+
+SecretBase_RedCave1_Text_1A1AEA:: @ 81A1AEA
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Since you're already here, how would\n"
+	.string "you like to battle?$"
+
+SecretBase_RedCave1_Text_1A1B83:: @ 81A1B83
+	.string "Okay!\n"
+	.string "Here we come!$"
+
+SecretBase_RedCave1_Text_1A1B97:: @ 81A1B97
+	.string "Hunh?\n"
+	.string "Oh, you can't now...$"
+
+UnknownString_81A1BB2:: @ 81A1BB2
+	.string "Waaargh! You're too strong!\n"
+	.string "About me losing... Please keep it secret!$"
+
+SecretBase_RedCave1_Text_1A1BF8:: @ 81A1BF8
+	.string "What do you think of my SECRET BASE?\n"
+	.string "Come visit me again tomorrow.$"
+
+SecretBase_RedCave1_Text_1A1C3B:: @ 81A1C3B
+	.string "Have you made a SECRET BASE already?\p"
+	.string "I went here, there, everywhere before\n"
+	.string "choosing this place.\p"
+	.string "Feel free to hang out!$"
+
+SecretBase_RedCave1_Text_1A1CB2:: @ 81A1CB2
+	.string "There're a lot of places where you can\n"
+	.string "make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?\p"
+	.string "Oh, would you like to have a battle?$"
+
+SecretBase_RedCave1_Text_1A1D48:: @ 81A1D48
+	.string "Okay, here goes!$"
+
+SecretBase_RedCave1_Text_1A1D59:: @ 81A1D59
+	.string "Oh...\n"
+	.string "You can't now, okay.$"
+
+UnknownString_81A1D74:: @ 81A1D74
+	.string "Hmmm... It's our loss...\n"
+	.string "But don't tell anyone!\l"
+	.string "It's a confidential secret!$"
+
+SecretBase_RedCave1_Text_1A1DC0:: @ 81A1DC0
+	.string "If you're in this area again, I hope\n"
+	.string "you'll visit me.$"
+
+SecretBase_RedCave1_Text_1A1DF6:: @ 81A1DF6
+	.string "There're a lot of places where you can\n"
+	.string "make a SECRET BASE.\p"
+	.string "But I like this spot best.\n"
+	.string "Don't you think it's nice?$"
+
+SecretBase_RedCave1_Text_1A1E67:: @ 81A1E67
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "Oh! Were you thinking about taking this\n"
+	.string "spot, too?\p"
+	.string "I'll tell you what, you can have this\n"
+	.string "spot if you can beat me.$"
+
+SecretBase_RedCave1_Text_1A1F04:: @ 81A1F04
+	.string "Okay!\n"
+	.string "I'm going to defend my SECRET BASE!$"
+
+SecretBase_RedCave1_Text_1A1F2E:: @ 81A1F2E
+	.string "Hunh? Is that right?\n"
+	.string "You're not interested in this spot?$"
+
+UnknownString_81A1F67:: @ 81A1F67
+	.string "I can't keep going!\n"
+	.string "I surrender!$"
+
+SecretBase_RedCave1_Text_1A1F88:: @ 81A1F88
+	.string "Okay, when I move one day, this place\n"
+	.string "will be yours!$"
+
+SecretBase_RedCave1_Text_1A1FBD:: @ 81A1FBD
+	.string "This is a popular spot.\n"
+	.string "It's always taken.\p"
+	.string "I waited a long time for it to open.\n"
+	.string "I finally got to use it!$"
+
+SecretBase_RedCave1_Text_1A2026:: @ 81A2026
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.\p"
+	.string "Would you like to see how strong I am?$"
+
+SecretBase_RedCave1_Text_1A2095:: @ 81A2095
+	.string "I'm going to go all out!$"
+
+SecretBase_RedCave1_Text_1A20AE:: @ 81A20AE
+	.string "Oh.\n"
+	.string "Some other time, then!$"
+
+UnknownString_81A20C9:: @ 81A20C9
+	.string "Hmm... I've still got lots to learn.\n"
+	.string "I have to study some more.$"
+
+SecretBase_RedCave1_Text_1A2109:: @ 81A2109
+	.string "Thanks for battling with me.\n"
+	.string "Please come back again tomorrow.$"
+
+SecretBase_RedCave1_Text_1A2147:: @ 81A2147
+	.string "Welcome to my POKéMON LAB.\p"
+	.string "I carry out research on battling in\n"
+	.string "secrecy.$"
+
+SecretBase_RedCave1_Text_1A218F:: @ 81A218F
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.\p"
+	.string "So, how would you like a battle?$"
+
+SecretBase_RedCave1_Text_1A2220:: @ 81A2220
+	.string "That's the way!$"
+
+SecretBase_RedCave1_Text_1A2230:: @ 81A2230
+	.string "When you're ready, give me a shout!$"
+
+UnknownString_81A2254:: @ 81A2254
+	.string "Aww! Done in!\n"
+	.string "But it's still fun to battle!$"
+
+SecretBase_RedCave1_Text_1A2280:: @ 81A2280
+	.string "Well, anyway, I should go buy some\n"
+	.string "decorations and furniture.\p"
+	.string "I want my SECRET BASE to be a place\n"
+	.string "other people can enjoy.$"
+
+SecretBase_RedCave1_Text_1A22FA:: @ 81A22FA
+	.string "A big mansion is nice, but I like this\n"
+	.string "sort of place more.\p"
+	.string "I like it because all kinds of people\n"
+	.string "come visit me.$"
+
+SecretBase_RedCave1_Text_1A236A:: @ 81A236A
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.\p"
+	.string "If you would be so kind, will you battle\n"
+	.string "with my POKéMON?$"
+
+SecretBase_RedCave1_Text_1A2405:: @ 81A2405
+	.string "Thank you.\n"
+	.string "Shall we begin?$"
+
+SecretBase_RedCave1_Text_1A2420:: @ 81A2420
+	.string "Oh.\n"
+	.string "How disappointing...$"
+
+UnknownString_81A2439:: @ 81A2439
+	.string "I concede...$"
+
+SecretBase_RedCave1_Text_1A2446:: @ 81A2446
+	.string "That was all in good fun!\n"
+	.string "I should go enjoy shopping now.$"
+
+SecretBase_RedCave1_Text_1A2480:: @ 81A2480
+	.string "I simply adore shopping for decorations\n"
+	.string "and furniture.\p"
+	.string "I also love raising POKéMON just\n"
+	.string "as much.$"
+
+SecretBase_RedCave1_Text_1A24E1:: @ 81A24E1
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?\p"
+	.string "But since you found me, how about we\n"
+	.string "have a battle?$"
+
+SecretBase_RedCave1_Text_1A256F:: @ 81A256F
+	.string "I'm not going down easily!$"
+
+SecretBase_RedCave1_Text_1A258A:: @ 81A258A
+	.string "Oh... Are you maybe tired from searching\n"
+	.string "for this place?$"
+
+UnknownString_81A25C3:: @ 81A25C3
+	.string "I went down...$"
+
+SecretBase_RedCave1_Text_1A25D2:: @ 81A25D2
+	.string "Where's your SECRET BASE?\n"
+	.string "I should go visit you there.$"
+
+SecretBase_RedCave1_Text_1A2609:: @ 81A2609
+	.string "Some people make their SECRET BASES in\n"
+	.string "hard-to-find places.\l"
+	.string "Do they want to just lie low?$"
+
+SecretBase_RedCave1_Text_1A2663:: @ 81A2663
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!\p"
+	.string "In the meantime, want to battle?$"
+
+SecretBase_RedCave1_Text_1A2710:: @ 81A2710
+	.string "This is my SECRET BASE.\n"
+	.string "I can't lose!$"
+
+SecretBase_RedCave1_Text_1A2736:: @ 81A2736
+	.string "I'll battle with you anytime.$"
+
+UnknownString_81A2754:: @ 81A2754
+	.string "Huh?\n"
+	.string "Did I just lose?$"
+
+SecretBase_RedCave1_Text_1A276A:: @ 81A276A
+	.string "I won't lose at collecting decorations.\n"
+	.string "Come visit again!$"
+
+SecretBase_RedCave1_Text_1A27A4:: @ 81A27A4
+	.string "People have told me that you can get\n"
+	.string "decorations in several ways.\p"
+	.string "We should have a race to see who can\n"
+	.string "get nicer decorations and furniture!$"
+
+SecretBase_RedCave1_Text_1A2830:: @ 81A2830
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "That's what I do.\n"
+	.string "Want to battle with me?$"
+
+SecretBase_RedCave1_Text_1A28D7:: @ 81A28D7
+	.string "Show me what you're made of!$"
+
+SecretBase_RedCave1_Text_1A28F4:: @ 81A28F4
+	.string "I guess there are times when you're not\n"
+	.string "into it.$"
+
+UnknownString_81A2925:: @ 81A2925
+	.string "I know exactly what you're made of now.$"
+
+SecretBase_RedCave1_Text_1A294D:: @ 81A294D
+	.string "We can both become stronger.\n"
+	.string "Let's keep at it!$"
+
+SecretBase_RedCave1_Text_1A297C:: @ 81A297C
+	.string "I found a spot I liked, and I did it up\n"
+	.string "with my favorite decorations.\p"
+	.string "I raise my favorite POKéMON and grow\n"
+	.string "stronger with it.\p"
+	.string "Every day is a great day.$"
+
+SecretBase_RedCave1_Text_1A2A13:: @ 81A2A13
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?\p"
+	.string "Want to see my taste in battling?$"
+
+SecretBase_RedCave1_Text_1A2AE2:: @ 81A2AE2
+	.string "There's no holding back!$"
+
+SecretBase_RedCave1_Text_1A2AFB:: @ 81A2AFB
+	.string "I'll be happy to demonstrate my style\n"
+	.string "anytime.$"
+
+UnknownString_81A2B2A:: @ 81A2B2A
+	.string "You're supremely talented!\n"
+	.string "Your power seems to be limitless...$"
+
+SecretBase_RedCave1_Text_1A2B69:: @ 81A2B69
+	.string "What did you think of my style?\n"
+	.string "I'll keep on polishing it!$"
+
+SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
+	.string "You can learn a lot about the taste\n"
+	.string "and sense of people by the kinds of\l"
+	.string "decorations they have, and how they\l"
+	.string "display them.\p"
+	.string "What do you think of my taste?\n"
+	.string "Are you speechless?$"
diff --git a/data/text/surf.inc b/data/text/surf.inc
index e9e3e9026..d78c80a42 100644
--- a/data/text/surf.inc
+++ b/data/text/surf.inc
@@ -1,6 +1,6 @@
-UseSurfPromptText: @ 81A1344
+gText_WantToUseSurf: @ 81A1344
 	.string "The water is dyed a deep blue...\n"
 	.string "Would you like to SURF?$"
 
-UsedSurfText: @ 81A137D
+gText_PlayerUsedSurf: @ 81A137D
 	.string "{STR_VAR_1} used SURF!$"