From c530fc18a767851a1c7d4be5be06b639e0d009e3 Mon Sep 17 00:00:00 2001
From: IBBCalc <147992650+IBBCalc@users.noreply.github.com>
Date: Tue, 24 Dec 2024 00:12:27 +0100
Subject: [PATCH] fix #5034 removed unnecessary caught data block for certain
 forms

---
 src/data/pokemon-species.ts | 13 -------------
 src/system/game-data.ts     |  5 +----
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 09788e353cf..df176f22bfc 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -944,19 +944,6 @@ export class PokemonForm extends PokemonSpeciesForm {
   }
 }
 
-export const noStarterFormKeys: string[] = [
-  SpeciesFormKey.MEGA,
-  SpeciesFormKey.MEGA_X,
-  SpeciesFormKey.MEGA_Y,
-  SpeciesFormKey.PRIMAL,
-  SpeciesFormKey.ORIGIN,
-  SpeciesFormKey.THERIAN,
-  SpeciesFormKey.GIGANTAMAX,
-  SpeciesFormKey.GIGANTAMAX_RAPID,
-  SpeciesFormKey.GIGANTAMAX_SINGLE,
-  SpeciesFormKey.ETERNAMAX
-].map(k => k.toString());
-
 /**
 * Method to get the daily list of starters with Pokerus.
 * @param scene {@linkcode BattleScene} used as part of RNG
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 3e3a6ce8f8b..8440c45ca97 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -2,7 +2,7 @@ import i18next from "i18next";
 import BattleScene, { bypassLogin, PokeballCounts } from "#app/battle-scene";
 import Pokemon, { EnemyPokemon, PlayerPokemon } from "#app/field/pokemon";
 import { pokemonPrevolutions } from "#app/data/balance/pokemon-evolutions";
-import PokemonSpecies, { allSpecies, getPokemonSpecies, noStarterFormKeys } from "#app/data/pokemon-species";
+import PokemonSpecies, { allSpecies, getPokemonSpecies } from "#app/data/pokemon-species";
 import { speciesStarterCosts } from "#app/data/balance/starters";
 import * as Utils from "#app/utils";
 import Overrides from "#app/overrides";
@@ -1625,9 +1625,6 @@ export class GameData {
       const dexEntry = this.dexData[species.speciesId];
       const caughtAttr = dexEntry.caughtAttr;
       const formIndex = pokemon.formIndex;
-      if (noStarterFormKeys.includes(pokemon.getFormKey())) {
-        pokemon.formIndex = 0;
-      }
       const dexAttr = pokemon.getDexAttr();
       pokemon.formIndex = formIndex;