From 39de822d7b674d1874db613dcc542b9492f283ea Mon Sep 17 00:00:00 2001
From: xsn34kzx <xsn34kzx@gmail.com>
Date: Wed, 6 Aug 2025 23:03:56 -0400
Subject: [PATCH] Fix and Lint Suggestions Pt. 2

---
 src/data/moves/pokemon-move.ts          | 2 +-
 src/phases/party-heal-phase.ts          | 2 +-
 test/challenges/permanent-faint.test.ts | 9 +++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/data/moves/pokemon-move.ts b/src/data/moves/pokemon-move.ts
index b3a0612e553..3c96cbea598 100644
--- a/src/data/moves/pokemon-move.ts
+++ b/src/data/moves/pokemon-move.ts
@@ -1,6 +1,6 @@
 import { allMoves } from "#data/data-lists";
 import { ChallengeType } from "#enums/challenge-type";
-import type { MoveId } from "#enums/move-id";
+import { MoveId } from "#enums/move-id";
 import type { Pokemon } from "#field/pokemon";
 import type { Move } from "#moves/move";
 import { applyChallenges } from "#utils/challenge-utils";
diff --git a/src/phases/party-heal-phase.ts b/src/phases/party-heal-phase.ts
index dc38c9662a8..1030d5eb9d9 100644
--- a/src/phases/party-heal-phase.ts
+++ b/src/phases/party-heal-phase.ts
@@ -26,7 +26,7 @@ export class PartyHealPhase extends BattlePhase {
       applyChallenges(ChallengeType.PREVENT_REVIVE, preventRevive);
       for (const pokemon of globalScene.getPlayerParty()) {
         // Prevent reviving fainted pokemon during certain challenges
-        if (!(pokemon.isFainted() && preventRevive.value)) {
+        if (pokemon.isFainted() && preventRevive.value) {
           continue;
         }
 
diff --git a/test/challenges/permanent-faint.test.ts b/test/challenges/permanent-faint.test.ts
index 1577b23eb9b..b952ea36a38 100644
--- a/test/challenges/permanent-faint.test.ts
+++ b/test/challenges/permanent-faint.test.ts
@@ -34,7 +34,8 @@ describe("Challenges - Permanent Faint", () => {
       .battleStyle("single")
       .enemySpecies(SpeciesId.VOLTORB)
       .enemyAbility(AbilityId.BALL_FETCH)
-      .enemyMoveset(MoveId.SPLASH);
+      .enemyMoveset(MoveId.SPLASH)
+      .moveset(MoveId.SPLASH);
   });
 
   it("should render Revival Blessing unusable by players only", async () => {
@@ -43,7 +44,7 @@ describe("Challenges - Permanent Faint", () => {
 
     const player = game.field.getPlayerPokemon();
     const revBlessing = player.getMoveset()[0];
-    expect(revBlessing.isUsable()).toBe(false);
+    expect(revBlessing.isUsable(player)).toBe(false);
 
     game.move.select(MoveId.REVIVAL_BLESSING);
     await game.toEndOfTurn();
@@ -57,7 +58,7 @@ describe("Challenges - Permanent Faint", () => {
     game.override.startingWave(181).startingLevel(200);
     await game.challengeMode.startBattle();
 
-    game.move.select(MoveId.RAZOR_LEAF);
+    game.move.select(MoveId.SPLASH);
     await game.doKillOpponents();
 
     await game.phaseInterceptor.to("SelectModifierPhase");
@@ -84,7 +85,7 @@ describe("Challenges - Permanent Faint", () => {
     faintedPokemon.status = new Status(StatusEffect.FAINT);
     expect(faintedPokemon.isFainted()).toBe(true);
 
-    game.move.select(MoveId.RAZOR_LEAF);
+    game.move.select(MoveId.SPLASH);
     await game.doKillOpponents();
 
     await game.toNextWave();