From f59fb23897ca2ef8fd7774c0d2ec7ed81225f8eb Mon Sep 17 00:00:00 2001 From: AJ Fontaine Date: Sat, 30 Nov 2024 15:53:24 -0500 Subject: [PATCH] Fix starterAmount using friendship instead of adjusted amount --- src/field/pokemon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 414fb64cb96..788596a6045 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -4285,7 +4285,7 @@ export class PlayerPokemon extends Pokemon { if (this.scene.eventManager.isEventActive()) { candyFriendshipMultiplier *= this.scene.eventManager.getFriendshipMultiplier(); } - const starterAmount = new Utils.NumberHolder(Math.floor(friendship * (this.scene.gameMode.isClassic ? candyFriendshipMultiplier : 1) / (fusionStarterSpeciesId ? 2 : 1))); + const starterAmount = new Utils.NumberHolder(Math.floor(amount.value * (this.scene.gameMode.isClassic ? candyFriendshipMultiplier : 1) / (fusionStarterSpeciesId ? 2 : 1))); // Add friendship to this PlayerPokemon this.friendship = Math.min(this.friendship + amount.value, 255);