From 44b2cb6001d9e82e53f2b5b0439bcdd7f5dfa6da Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:34:13 +0100
Subject: [PATCH] Better messages for evolution conditions

---
 src/ui/pokedex-page-ui-handler.ts | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/ui/pokedex-page-ui-handler.ts b/src/ui/pokedex-page-ui-handler.ts
index 1ee250326cd..ff912aa74d2 100644
--- a/src/ui/pokedex-page-ui-handler.ts
+++ b/src/ui/pokedex-page-ui-handler.ts
@@ -1415,12 +1415,12 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
 
                     let label:string = "";
                     if (pre.level > 1) {
-                      label = `${pre.level}`;
+                      label = i18next.t("pokedexUiHandler:evolveAtLv") + ` ${pre.level}`;
                     } else if (pre.item) {
-                      label = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[pre.item].toUpperCase()}`) +
+                      label = i18next.t("pokedexUiHandler:evolveUsing") + i18next.t(`modifierType:EvolutionItem.${EvolutionItem[pre.item].toUpperCase()}`) +
                         " (" + (pre.item > 50 ? "Ultra" : "Great") + ")";
                     } else {
-                      label = "";
+                      label = i18next.t("pokedexUiHandler:evolveGeneric");
                     }
                     options.push({
                       label: label,
@@ -1457,13 +1457,15 @@ export default class PokedexPageUiHandler extends MessageUiHandler {
                       }
                     });
                     let label:string = "";
-                    if (evo.level > 1) {
-                      label = `${evo.level}`;
+                    if (evo.condition) {
+                      label = i18next.t("pokedexUiHandler:evolveGeneric");
+                    } else if (evo.level > 1) {
+                      label = i18next.t("pokedexUiHandler:evolveAtLv") + ` ${evo.level}`;
                     } else if (evo.item) {
-                      label = i18next.t(`modifierType:EvolutionItem.${EvolutionItem[evo.item].toUpperCase()}`) +
+                      label = i18next.t("pokedexUiHandler:evolveUsing") + i18next.t(`modifierType:EvolutionItem.${EvolutionItem[evo.item].toUpperCase()}`) +
                         " (" + (evo.item > 50 ? "Ultra" : "Great") + ")";
                     } else {
-                      label = "";
+                      label = i18next.t("pokedexUiHandler:evolveGeneric");
                     }
                     options.push({
                       label: label,