From 90f6ae7e6d4adc00062ec398419d8863ececc120 Mon Sep 17 00:00:00 2001
From: chaosgrimmon <31082757+chaosgrimmon@users.noreply.github.com>
Date: Sun, 16 Jun 2024 18:40:47 -0400
Subject: [PATCH] [Bug] Friendship-based moves have Base Power -1 when Pokemon
 is wild (#2291)

Affects RETURN, FRUSTRATION, PIKA_POW, and VEEVEE_VOLLEY.
---
 src/data/move.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/data/move.ts b/src/data/move.ts
index 3116bf58f56..31ddd7b14ff 100644
--- a/src/data/move.ts
+++ b/src/data/move.ts
@@ -3034,10 +3034,8 @@ export class FriendshipPowerAttr extends VariablePowerAttr {
   apply(user: Pokemon, target: Pokemon, move: Move, args: any[]): boolean {
     const power = args[0] as Utils.NumberHolder;
 
-    if (user instanceof PlayerPokemon) {
-      const friendshipPower = Math.floor(Math.min(user.friendship, 255) / 2.5);
-      power.value = Math.max(!this.invert ? friendshipPower : 102 - friendshipPower, 1);
-    }
+    const friendshipPower = Math.floor(Math.min(user instanceof PlayerPokemon ? user.friendship : user.species.baseFriendship, 255) / 2.5);
+    power.value = Math.max(!this.invert ? friendshipPower : 102 - friendshipPower, 1);
 
     return true;
   }