From 063e6dbd2d3521f2a61488b930ee244286ce57e2 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 5 Aug 2024 07:22:06 -0700
Subject: [PATCH] [Bug] Player pokemon shouldn't generate an NPC moveset
 (#3356)

* Player pokemon shouldn't generate an NPC moveset

* Make sure Keldeo starts new runs in the correct form
---
 src/field/pokemon.ts | 2 +-
 src/phases.ts        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 1bd9f8db491..7fc5f14d0e1 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3222,7 +3222,7 @@ export class PlayerPokemon extends Pokemon {
     }
 
     if (!dataSource) {
-      this.generateAndPopulateMoveset();
+      this.moveset = [];
     }
     this.generateCompatibleTms();
   }
diff --git a/src/phases.ts b/src/phases.ts
index ac233896b68..c4062b470a2 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -642,6 +642,10 @@ export class SelectStarterPhase extends Phase {
       this.scene.arena.init();
       this.scene.sessionPlayTime = 0;
       this.scene.lastSavePlayTime = 0;
+      // Ensures Keldeo (or any future Pokemon that have this type of form change) starts in the correct form
+      this.scene.getParty().forEach((p: PlayerPokemon) => {
+        this.scene.triggerPokemonFormChange(p, SpeciesFormChangeMoveLearnedTrigger);
+      });
       this.end();
     });
   }