From b43a6ec764db9c5cba39385d5e6e53875e2d4e46 Mon Sep 17 00:00:00 2001
From: Xavion3 <xavion333@gmail.com>
Date: Mon, 29 Apr 2024 00:52:43 +1000
Subject: [PATCH] Fix end catching (#332)

* Fix end catching

* Remove fusion code
---
 src/phases.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/phases.ts b/src/phases.ts
index 640f475927e..fdca671dbff 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -1697,7 +1697,7 @@ export class CommandPhase extends FieldPhase {
         }
         break;
       case Command.BALL:
-        if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1)) {
+        if (this.scene.arena.biomeType === Biome.END && (!this.scene.gameMode.isClassic || (this.scene.getEnemyField().filter(p => p.isActive(true)).some(p => !p.scene.gameData.dexData[p.species.speciesId].caughtAttr) && this.scene.gameData.getStarterCount(d => !!d.caughtAttr) < Object.keys(speciesStarters).length - 1))) {
           this.scene.ui.setMode(Mode.COMMAND, this.fieldIndex);
           this.scene.ui.setMode(Mode.MESSAGE);
           this.scene.ui.showText(i18next.t('menu:noPokeballForce'), null, () => {