From 6361762fc9bc4cc4616ea61023dadb95b0edeef8 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Fri, 22 Aug 2025 18:25:27 -0500
Subject: [PATCH] [Bug] [UI/UX] [Beta] Fix visibility of egg moves in ssui
 (#6343)

Fix visibility of egg moves when backing out of fresh start and back into ssui
---
 src/ui/starter-select-ui-handler.ts | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index a8f8d9efe73..848b162042d 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1171,17 +1171,17 @@ export class StarterSelectUiHandler extends MessageUiHandler {
         this.setUpgradeAnimation(icon, species);
       });
 
-      if (globalScene.gameMode.hasChallenge(Challenges.FRESH_START)) {
-        for (const container of this.pokemonEggMoveContainers) {
-          container.setVisible(false);
-        }
-        this.eggMovesLabel.setVisible(false);
-        // This is not enough, we need individual checks in setStarterSpecies too! :)
-        this.pokemonPassiveDisabledIcon.setVisible(false);
-        this.pokemonPassiveLabelText.setVisible(false);
-        this.pokemonPassiveLockedIcon.setVisible(false);
-        this.pokemonPassiveText.setVisible(false);
+      const notFreshStart = !globalScene.gameMode.hasChallenge(Challenges.FRESH_START);
+
+      for (const container of this.pokemonEggMoveContainers) {
+        container.setVisible(notFreshStart);
       }
+      this.eggMovesLabel.setVisible(notFreshStart);
+      // This is not enough, we need individual checks in setStarterSpecies too! :)
+      this.pokemonPassiveDisabledIcon.setVisible(notFreshStart);
+      this.pokemonPassiveLabelText.setVisible(notFreshStart);
+      this.pokemonPassiveLockedIcon.setVisible(notFreshStart);
+      this.pokemonPassiveText.setVisible(notFreshStart);
 
       this.resetFilters();
       this.updateStarters();