fix: Play Oak's name confirmation lines

This commit is contained in:
Juan Heredia
2026-08-02 08:18:33 +02:00
parent ebbc55c4d0
commit b6a397460e
2 changed files with 20 additions and 3 deletions
+16
View File
@@ -46,6 +46,8 @@ local FALLBACKS = {
_OakSpeechText3 = Strings.source("{PLAYER}!\fYour very own\nPOKéMON legend is\vabout to unfold!\fA world of dreams\nand adventures\vwith POKéMON\vawaits! Let's go!"),
_IntroducePlayerText = Strings.source("First, what is\nyour name?"),
_IntroduceRivalText = Strings.source("This is my grand-\nson. He's been\vyour rival since\vyou were a baby.\f...Erm, what is\nhis name again?"),
_YourNameIsText = Strings.source("Right! So your\nname is {PLAYER}!"),
_HisNameIsText = Strings.source("That's right! I\nremember now! His\vname is {RIVAL}!"),
}
local function textOr(game, key)
@@ -152,6 +154,14 @@ function OakSpeech.defaultSteps(speech)
presetsWho = "player",
presetsFallback = { "RED", "ASH", "JACK" },
},
{
-- oak_speech.asm prints YourNameIsText right after the naming screen
-- returns ("Right! So your name is RED!"); the port went straight on
-- to the rival and dropped it, in every language.
id = "confirm_player_name",
kind = "say",
textKey = "_YourNameIsText",
},
{
id = "ask_rival_name",
kind = "say",
@@ -166,6 +176,12 @@ function OakSpeech.defaultSteps(speech)
presetsWho = "rival",
presetsFallback = { "BLUE", "GARY", "JOHN" },
},
{
-- HisNameIsText, the rival's counterpart to the confirmation above
id = "confirm_rival_name",
kind = "say",
textKey = "_HisNameIsText",
},
{
id = "legend",
kind = "say",