From 374474720bc1bed39925b8749e4db10add531482 Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Sat, 14 Jun 2025 13:46:58 -0400
Subject: [PATCH] Fixed pollen puff

---
 src/data/moves/move.ts         | 5 +++++
 test/moves/pollen_puff.test.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index d9d112a6739..b488dbc19df 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -2285,6 +2285,11 @@ export class HealOnAllyAttr extends HealAttr {
 
     return false;
   }
+
+  override canApply(user: Pokemon, target: Pokemon, _move: Move, _args?: any[]): boolean {
+    // Don't fail move if not targeting an ally
+    return user.getAlly() !== target || super.canApply(user, target, _move, _args);
+  }
 }
 
 /**
diff --git a/test/moves/pollen_puff.test.ts b/test/moves/pollen_puff.test.ts
index d5866323e79..342e776c8db 100644
--- a/test/moves/pollen_puff.test.ts
+++ b/test/moves/pollen_puff.test.ts
@@ -84,7 +84,7 @@ describe("Moves - Pollen Puff", () => {
     game.move.use(MoveId.SPLASH, BattlerIndex.PLAYER_2);
     await game.toEndOfTurn();
 
-    expect(bulbasaur.turnData.hitCount).toBe(1);
+    expect(bulbasaur.turnData.hitCount).toBe(0);
     expect(omantye.hp).toBeLessThanOrEqual(0.5 * omantye.getMaxHp() + 1);
     expect(game.phaseInterceptor.log.filter(l => l === "PokemonHealPhase")).toHaveLength(1);
   });