From b1d494eadbf057da6e11bdb330a462935f321e12 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Wed, 19 Mar 2025 04:22:52 +0100
Subject: [PATCH] [UI/UX] [Bug] Icons for egg moves and passives show up even
 when not unlocked (#5540)

Reworked icons to more compact code
---
 src/ui/pokedex-ui-handler.ts | 50 +++++++++++++++---------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/src/ui/pokedex-ui-handler.ts b/src/ui/pokedex-ui-handler.ts
index f4cb9f51c16..f3625f64476 100644
--- a/src/ui/pokedex-ui-handler.ts
+++ b/src/ui/pokedex-ui-handler.ts
@@ -1742,36 +1742,26 @@ export default class PokedexUiHandler extends MessageUiHandler {
           container.icon.setTint(0);
         }
 
-        if (data.eggMove1) {
-          container.eggMove1Icon.setVisible(true);
-        } else {
-          container.eggMove1Icon.setVisible(false);
-        }
-        if (data.eggMove2) {
-          container.eggMove2Icon.setVisible(true);
-        } else {
-          container.eggMove2Icon.setVisible(false);
-        }
-        if (data.tmMove1) {
-          container.tmMove1Icon.setVisible(true);
-        } else {
-          container.tmMove1Icon.setVisible(false);
-        }
-        if (data.tmMove2) {
-          container.tmMove2Icon.setVisible(true);
-        } else {
-          container.tmMove2Icon.setVisible(false);
-        }
-        if (data.passive1) {
-          container.passive1Icon.setVisible(true);
-        } else {
-          container.passive1Icon.setVisible(false);
-        }
-        if (data.passive2) {
-          container.passive2Icon.setVisible(true);
-        } else {
-          container.passive2Icon.setVisible(false);
-        }
+        const pairs: [boolean | undefined, Phaser.GameObjects.Image][] = [
+          [data.eggMove1, container.eggMove1Icon],
+          [data.eggMove2, container.eggMove2Icon],
+          [data.tmMove1, container.tmMove1Icon],
+          [data.tmMove2, container.tmMove2Icon],
+          [data.passive1, container.passive1Icon],
+          [data.passive2, container.passive2Icon],
+        ];
+
+        pairs.forEach(([unlocked, icon]) => {
+          if (unlocked) {
+            icon.setVisible(true);
+            icon.clearTint();
+          } else if (unlocked === false) {
+            icon.setVisible(true);
+            icon.setTint(0x808080);
+          } else {
+            icon.setVisible(false);
+          }
+        });
 
         if (this.showDecorations) {
           if (this.pokerusSpecies.includes(data.species)) {