From f2a06649fc1013885fc3f12a23740a9d69feff6d Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Wed, 3 Sep 2025 22:58:42 +0200
Subject: [PATCH] Don't clear starters before starting run

---
 src/ui/starter-select-ui-handler.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index bf02c703a1d..6dd5d691c4d 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -4453,10 +4453,11 @@ export class StarterSelectUiHandler extends MessageUiHandler {
           () => {
             const startRun = () => {
               globalScene.money = globalScene.gameMode.getStartingMoney();
+              const starters = this.starters.slice(0);
               ui.setMode(UiMode.STARTER_SELECT);
               const originalStarterSelectCallback = this.starterSelectCallback;
               this.starterSelectCallback = null;
-              originalStarterSelectCallback?.(this.starters);
+              originalStarterSelectCallback?.(starters);
             };
             startRun();
           },
@@ -4486,9 +4487,15 @@ export class StarterSelectUiHandler extends MessageUiHandler {
     let canStart = false;
     for (let s = 0; s < this.starterSpecies.length; s++) {
       const species = this.starterSpecies[s];
+      const starter = this.starters[s];
       const isValidForChallenge = checkStarterValidForChallenge(
         species,
-        globalScene.gameData.getSpeciesDexAttrProps(species, this.getCurrentDexProps(species.speciesId)),
+        {
+          formIndex: starter.formIndex,
+          shiny: starter.shiny,
+          variant: starter.variant,
+          female: starter.female ?? false,
+        },
         false,
       );
       canStart ||= isValidForChallenge;