summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--data/text/intro.s27
-rw-r--r--src/main_menu.c36
2 files changed, 27 insertions, 36 deletions
diff --git a/data/text/intro.s b/data/text/intro.s
index 5e8bce042..be9c03588 100644
--- a/data/text/intro.s
+++ b/data/text/intro.s
@@ -1,17 +1,14 @@
-gUnknown_081C6D78:: @ 81C6D78
-UnknownString_81C6D78: @ 81C6D78
+gBirchSpeech_Welcome:: @ 81C6D78
.string "Hi! Sorry to keep you waiting!\p"
.string "Welcome to the world of POKéMON!\p"
.string "My name is BIRCH.\p"
.string "But everyone calls me the POKéMON\n"
.string "PROFESSOR.\p$"
-gUnknown_081C6DF8:: @ 81C6DF8
-UnknownString_81C6DF8: @ 81C6DF8
+gBirchSpeech_ThisIsPokemon:: @ 81C6DF8
.string "This is what we call a “POKéMON.”$"
-gUnknown_081C6E1A:: @ 81C6E1A
-UnknownString_81C6E1A: @ 81C6E1A
+gBirchSpeech_WorldInhabitedByPokemon:: @ 81C6E1A
.string "This world is widely inhabited by\n"
.string "creatures known as POKéMON.\p"
.string "We humans live alongside POKéMON,\n"
@@ -27,33 +24,27 @@ UnknownString_81C6E1A: @ 81C6E1A
.string "I’ve been undertaking research.\l"
.string "That’s what I do.\p$"
-gUnknown_081C6FCB:: @ 81C6FCB
-UnknownString_81C6FCB: @ 81C6FCB
+gBirchSpeech_AndYouAre:: @ 81C6FCB
.string "And you are?$"
-gUnknown_081C6FD8:: @ 81C6FD8
-UnknownString_81C6FD8: @ 81C6FD8
+gBirchSpeech_AreYouBoyOrGirl:: @ 81C6FD8
.string "Are you a boy?\n"
.string "Or are you a girl?$"
-gUnknown_081C6FFA:: @ 81C6FFA
-UnknownString_81C6FFA: @ 81C6FFA
+gBirchSpeech_WhatsYourName:: @ 81C6FFA
.string "All right.\n"
.string "What’s your name?$"
-gUnknown_081C7017:: @ 81C7017
-UnknownString_81C7017: @ 81C7017
+gBirchSpeech_SoItsPlayer:: @ 81C7017
.string "So it’s {PLAYER}{KUN}?$"
-gUnknown_081C7025:: @ 81C7025
-UnknownString_81C7025: @ 81C7025
+gBirchSpeech_AhOkayYouArePlayer:: @ 81C7025
.string "Ah, okay!\p"
.string "You’re {PLAYER}{KUN} who’s moving to my\n"
.string "hometown of LITTLEROOT.\l"
.string "I get it now!$"
-gUnknown_081C7074:: @ 81C7074
-UnknownString_81C7074: @ 81C7074
+gBirchSpeech_AreYouReady:: @ 81C7074
.string "All right, are you ready?\p"
.string "Your very own adventure is about\n"
.string "to unfold.\p"
diff --git a/src/main_menu.c b/src/main_menu.c
index 9b8a135e7..17010c418 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -630,15 +630,15 @@ void PrintBadgeCount(void)
}
//Text Strings
-extern const u8 gUnknown_081C6D78[]; //Hi! Sorry to keep you waiting!...
-extern const u8 gUnknown_081C6DF8[];
-extern const u8 gUnknown_081C6E1A[];
-extern const u8 gUnknown_081C6FCB[];
-extern const u8 gUnknown_081C6FD8[];
-extern const u8 gUnknown_081C6FFA[];
-extern u8 gUnknown_081C7017[];
-extern u8 gUnknown_081C7025[];
-extern u8 gUnknown_081C7074[];
+extern const u8 gBirchSpeech_Welcome[]; //Hi! Sorry to keep you waiting!...
+extern const u8 gBirchSpeech_ThisIsPokemon[];
+extern const u8 gBirchSpeech_WorldInhabitedByPokemon[];
+extern const u8 gBirchSpeech_AndYouAre[];
+extern const u8 gBirchSpeech_AreYouBoyOrGirl[];
+extern const u8 gBirchSpeech_WhatsYourName[];
+extern u8 gBirchSpeech_SoItsPlayer[];
+extern u8 gBirchSpeech_AhOkayYouArePlayer[];
+extern u8 gBirchSpeech_AreYouReady[];
struct MonCoords
{
@@ -793,7 +793,7 @@ void task_new_game_prof_birch_speech_3(u8 taskId)
else
{
MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
- MenuPrintMessage(gUnknown_081C6D78, 3, 14);
+ MenuPrintMessage(gBirchSpeech_Welcome, 3, 14);
task->func = task_new_game_prof_birch_speech_4;
}
}
@@ -804,7 +804,7 @@ void task_new_game_prof_birch_speech_4(u8 taskId)
if (!gPaletteFade.active && MenuUpdateWindowText_OverrideLineLength(24))
{
gTasks[taskId].func = task_new_game_prof_birch_speech_5;
- MenuPrintMessage(gUnknown_081C6DF8, 3, 14);
+ MenuPrintMessage(gBirchSpeech_ThisIsPokemon, 3, 14);
}
}
@@ -865,7 +865,7 @@ void task_new_game_prof_birch_speech_8(u8 taskId)
{
if (MenuUpdateWindowText_OverrideLineLength(24))
{
- MenuPrintMessage(gUnknown_081C6E1A, 3, 14);
+ MenuPrintMessage(gBirchSpeech_WorldInhabitedByPokemon, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_9;
}
}
@@ -875,7 +875,7 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
if (MenuUpdateWindowText_OverrideLineLength(24))
{
MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
- MenuPrintMessage(gUnknown_081C6FCB, 3, 14);
+ MenuPrintMessage(gBirchSpeech_AndYouAre, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_10;
}
}
@@ -963,7 +963,7 @@ void task_new_game_prof_birch_speech_13(u8 taskId)
void task_new_game_prof_birch_speech_14(u8 taskId)
{
MenuDrawTextWindow(2, 0xD, 0x1B, 0x12);
- MenuPrintMessage(gUnknown_081C6FD8, 3, 14);
+ MenuPrintMessage(gBirchSpeech_AreYouBoyOrGirl, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_15;
}
@@ -1061,7 +1061,7 @@ void task_new_game_prof_birch_speech_18(u8 taskId)
void sub_800A974(u8 taskId)
{
MenuDrawTextWindow(2, 13, 27, 18);
- MenuPrintMessage(gUnknown_081C6FFA, 3, 14);
+ MenuPrintMessage(gBirchSpeech_WhatsYourName, 3, 14);
gTasks[taskId].func = Task_800A9B4;
}
@@ -1116,7 +1116,7 @@ void sub_800AAAC(u8 taskId)
void task_new_game_prof_birch_speech_part2_1(u8 taskId)
{
MenuDrawTextWindow(2, 13, 27, 18);
- StringExpandPlaceholders(gStringVar4, gUnknown_081C7017);
+ StringExpandPlaceholders(gStringVar4, gBirchSpeech_SoItsPlayer);
MenuPrintMessage(gStringVar4, 3, 14);
gTasks[taskId].func = sub_800AB38;
}
@@ -1191,7 +1191,7 @@ void task_new_game_prof_birch_speech_part2_6(u8 taskId)
sub_800B534(taskId, 2);
sub_800B6C0(taskId, 1);
MenuDrawTextWindow(2, 13, 27, 18);
- StringExpandPlaceholders(gStringVar4, gUnknown_081C7025);
+ StringExpandPlaceholders(gStringVar4, gBirchSpeech_AhOkayYouArePlayer);
MenuPrintMessage(gStringVar4, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_7;
}
@@ -1259,7 +1259,7 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
sub_800B534(taskId, 2);
sub_800B6C0(taskId, 1);
MenuDrawTextWindow(2, 13, 27, 18);
- MenuPrintMessage(gUnknown_081C7074, 3, 14);
+ MenuPrintMessage(gBirchSpeech_AreYouReady, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_9;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 21:34:39 +0000