From 5967a4240aec18825021fd1d6d632995d542551b Mon Sep 17 00:00:00 2001
From: PigeonBar <56974298+PigeonBar@users.noreply.github.com>
Date: Wed, 11 Dec 2024 20:35:55 -0500
Subject: [PATCH] Incorporate Despair-Games/poketernity/pull/48

---
 src/battle-scene.ts | 2 +-
 src/data/move.ts    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 8a50423ecdd..72c91e96e1c 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2658,7 +2658,7 @@ export default class BattleScene extends SceneBase {
         }
       }
     }
-    return true;
+    return success;
   }
 
   addEnemyModifier(modifier: PersistentModifier, ignoreUpdate?: boolean, instant?: boolean): Promise<void> {
diff --git a/src/data/move.ts b/src/data/move.ts
index 2e5a263948e..658534eb48f 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -6044,14 +6044,14 @@ export class RevivalBlessingAttr extends MoveEffectAttr {
 
   getCondition(): MoveConditionFunc {
     return (user, target, move) =>
-      (user instanceof PlayerPokemon && globalScene.getPlayerParty().findIndex((p) => p.isFainted()) > -1) ||
+      (user instanceof PlayerPokemon && globalScene.getPlayerParty().some((p) => p.isFainted())) ||
       (user instanceof EnemyPokemon &&
         user.hasTrainer() &&
-        globalScene.getEnemyParty().findIndex((p) => p.isFainted()) > -1);
+        globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss()));
   }
 
-  getUserBenefitScore(user: Pokemon, target: Pokemon, move: Move): number {
-    if (user.hasTrainer() && globalScene.getEnemyParty().findIndex(p => p.isFainted() && !p.isBoss()) > -1) {
+  override getUserBenefitScore(user: Pokemon, _target: Pokemon, _move: Move): number {
+    if (user.hasTrainer() && globalScene.getEnemyParty().some((p) => p.isFainted() && !p.isBoss())) {
       return 20;
     }