diff --git a/src/data/battler-tags.ts b/src/data/battler-tags.ts index ada0354a050..f499fcf38ec 100644 --- a/src/data/battler-tags.ts +++ b/src/data/battler-tags.ts @@ -1279,9 +1279,9 @@ export class CursedTag extends BattlerTag { export class FriendGuardTag extends BattlerTag { public powerMultiplier: number; - constructor(powerMultiplier: number) { - super(BattlerTagType.FRIEND_GUARD, BattlerTagLapseType.PRE_MOVE, 1, undefined); - this.powerMultiplier = 1 - powerMultiplier; + constructor() { + super(BattlerTagType.FRIEND_GUARD, BattlerTagLapseType.TURN_END, 1, undefined); + this.powerMultiplier = 0.75; } /** @@ -1406,7 +1406,7 @@ export function getBattlerTag(tagType: BattlerTagType, turnCount: integer, sourc case BattlerTagType.MINIMIZED: return new MinimizeTag(); case BattlerTagType.FRIEND_GUARD: - return new FriendGuardTag(0.25); + return new FriendGuardTag(); case BattlerTagType.NONE: default: return new BattlerTag(tagType, BattlerTagLapseType.CUSTOM, turnCount, sourceMove, sourceId); diff --git a/src/phases.ts b/src/phases.ts index 5a69e06d1d9..c1918fe36bd 100644 --- a/src/phases.ts +++ b/src/phases.ts @@ -1640,7 +1640,6 @@ export class TurnInitPhase extends FieldPhase { this.scene.getField().forEach((pokemon, i) => { if (pokemon?.isActive()) { - applyAbAttrs(FriendGuardAbAttr, pokemon, undefined); if (pokemon.isPlayer()) this.scene.currentBattle.addParticipant(pokemon as PlayerPokemon); @@ -2028,6 +2027,8 @@ export class TurnStartPhase extends FieldPhase { if (turnCommand.skip) continue; + applyAbAttrs(FriendGuardAbAttr, pokemon, undefined); + switch (turnCommand.command) { case Command.FIGHT: const queuedMove = turnCommand.move;