From 84de47931f1db52689aba861f801e4f8601d1789 Mon Sep 17 00:00:00 2001 From: frutescens Date: Tue, 20 Aug 2024 13:49:47 -0700 Subject: [PATCH] messages with confirm do not need an extra button press no more --- src/phases/learn-move-phase.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/phases/learn-move-phase.ts b/src/phases/learn-move-phase.ts index a0630b88646..950577a0a3b 100644 --- a/src/phases/learn-move-phase.ts +++ b/src/phases/learn-move-phase.ts @@ -47,9 +47,11 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { const learnMovePrompt = i18next.t("battle:learnMovePrompt", { pokemonName: getPokemonNameWithAffix(pokemon), moveName: move.name }); const moveLimitReached = i18next.t("battle:learnMoveLimitReached", { pokemonName: getPokemonNameWithAffix(pokemon) }); const shouldReplaceQ = i18next.t("battle:learnMoveReplaceQuestion", { moveName: move.name }); - const prompt = [learnMovePrompt, moveLimitReached, shouldReplaceQ].join("$"); - this.scene.ui.showText(prompt, null, () => { - this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => this.forgetMoveProcess(move, pokemon), () => this.rejectMoveAndEnd(move, pokemon)); + const preQText = [learnMovePrompt, moveLimitReached].join("$"); + this.scene.ui.showText(preQText, null, () => { + this.scene.ui.showText(shouldReplaceQ, null, () => { + this.scene.ui.setModeWithoutClear(Mode.CONFIRM, () => this.forgetMoveProcess(move, pokemon), () => this.rejectMoveAndEnd(move, pokemon)); + }, null); }, null, true); } @@ -81,7 +83,7 @@ export class LearnMovePhase extends PlayerPartyMemberPokemonPhase { this.scene.ui.setMode(this.messageMode); this.replaceMoveCheck(move, pokemon); }); - }, null, true); + }, null); } learnMove(index: number, move, pokemon, textMessage?: string) {