From 1c73b7c269f581a98adf399b302a86e79154bb85 Mon Sep 17 00:00:00 2001
From: Bertie690 <taylormw163@gmail.com>
Date: Fri, 25 Jul 2025 13:22:47 -0400
Subject: [PATCH] Fixed battler thingy

---
 src/data/moves/move.ts | 4 ++--
 src/field/pokemon.ts   | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/data/moves/move.ts b/src/data/moves/move.ts
index 002e46606db..976a93a4935 100644
--- a/src/data/moves/move.ts
+++ b/src/data/moves/move.ts
@@ -7257,8 +7257,8 @@ export class ReducePpMoveAttr extends MoveEffectAttr {
     const lastPpUsed = movesetMove.ppUsed;
     movesetMove.ppUsed = Math.min(lastPpUsed + this.reduction, movesetMove.getMovePp());
 
-    globalScene.eventTarget.dispatchEvent(new MovesetChangedEvent(target.id, movesetMove));
     globalScene.phaseManager.queueMessage(i18next.t("battle:ppReduced", { targetName: getPokemonNameWithAffix(target), moveName: movesetMove.getName(), reduction: (movesetMove.ppUsed) - lastPpUsed }));
+    globalScene.eventTarget.dispatchEvent(new MovesetChangedEvent(target.id, movesetMove));
 
     return true;
   }
@@ -7368,7 +7368,7 @@ export class MovesetCopyMoveAttr extends OverrideMoveEffectAttr {
     user.summonData.moveset[thisMoveIndex] = newMove;
 
     globalScene.phaseManager.queueMessage(i18next.t("moveTriggers:copiedMove", { pokemonName: getPokemonNameWithAffix(user), moveName: copiedMove.name }));
-    globalScene.eventTarget.dispatchEvent(new MovesetChangedEvent(target.id, newMove));
+    globalScene.eventTarget.dispatchEvent(new MovesetChangedEvent(user.id, newMove));
 
     return true;
   }
diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 5fc23ae51fd..1ef1488e9a8 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -108,7 +108,7 @@ import { SwitchType } from "#enums/switch-type";
 import type { TrainerSlot } from "#enums/trainer-slot";
 import { UiMode } from "#enums/ui-mode";
 import { WeatherType } from "#enums/weather-type";
-import { SummonDataResetEvent } from "#events/battle-scene";
+import { MovesetChangedEvent, SummonDataResetEvent } from "#events/battle-scene";
 import { doShinySparkleAnim } from "#field/anims";
 import {
   BaseStatModifier,
@@ -2836,6 +2836,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
     if (this.summonData.moveset) {
       this.summonData.moveset[moveIndex] = move;
     }
+    globalScene.eventTarget.dispatchEvent(new MovesetChangedEvent(this.id, move));
   }
 
   /**