Merge branch 'main' of https://github.com/ben-lear/pokerogue

2025-08-24 16:29:27 +02:00 · 2024-09-27 21:23:37 -04:00 · 2024-09-27 21:23:37 -04:00 · 14e2992868
commit 14e2992868
parent 380e2090a9 2e7f6a2f4f
1 changed files with 4 additions and 0 deletions
--- a/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-expert-pokemon-breeder-encounter.ts
@ -558,6 +558,10 @@ function onGameOver(scene: BattleScene) {
  // Revert BGM
  scene.playBgm(scene.arena.bgm);

+  // Clear any leftover battle phases
+  scene.clearPhaseQueue();
+  scene.clearPhaseQueueSplice();
+
  // Return enemy Pokemon
  const pokemon = scene.getEnemyPokemon();
  if (pokemon) {