From bfcd8b4c4031a3d8dbf3cddbfde692aa5481c2a5 Mon Sep 17 00:00:00 2001
From: DeviPotato <jschrip@gmail.com>
Date: Thu, 25 Apr 2024 02:26:26 -0700
Subject: [PATCH] Change Unnerve to on-summon message

---
 src/data/ability.ts      | 3 ++-
 src/modifier/modifier.ts | 1 -
 src/phases.ts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/ability.ts b/src/data/ability.ts
index e129bf8ec2e..4bed7e9bff6 100644
--- a/src/data/ability.ts
+++ b/src/data/ability.ts
@@ -2802,7 +2802,8 @@ export function initAbilities() {
       .attr(StatChangeMultiplierAbAttr, -1)
       .ignorable(),
     new Ability(Abilities.UNNERVE, 5)
-      .attr(PreventBerryUseAbAttr),
+      .attr(PreventBerryUseAbAttr)
+      .attr(PostSummonMessageAbAttr, (pokemon: Pokemon) => getPokemonMessage(pokemon, ' prevents eating berries!')),
     new Ability(Abilities.DEFIANT, 5)
       .attr(PostStatChangeStatChangeAbAttr, (target, statsChanged, levels) => levels < 0, [BattleStat.ATK], 2),
     new Ability(Abilities.DEFEATIST, 5)
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index 941c72e9d1d..775aedd5c8f 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -878,7 +878,6 @@ export class BerryModifier extends PokemonHeldItemModifier {
     pokemon.getOpponents().map(opp => applyAbAttrs(PreventBerryUseAbAttr, opp, cancelled));
 
     if (cancelled.value) {
-      pokemon.scene.queueMessage(getPokemonMessage(pokemon, ' is too\nnervous to eat berries!'));
       return false;
     }
 
diff --git a/src/phases.ts b/src/phases.ts
index 3b3d3e7d94c..c6da47bb155 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -3813,8 +3813,8 @@ export class BerryPhase extends CommonAnimPhase {
             berryModifier.consumed = false;
           this.scene.updateModifiers(this.player);
         }
+        return super.start();
       }
-      return super.start();
     }
 
     this.end();