From b03a2b47d207c0fdbcfdda145cfd3fec84ac1f88 Mon Sep 17 00:00:00 2001
From: Annika <56906084+AnnikaCodes@users.noreply.github.com>
Date: Sat, 11 Mar 2023 18:10:40 -0800
Subject: [PATCH] Gen I: Fix |-mustrecharge| messages

---
 data/mods/gen1/scripts.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/gen1/scripts.ts b/data/mods/gen1/scripts.ts
index 952feab277..ad9d8ff94a 100644
--- a/data/mods/gen1/scripts.ts
+++ b/data/mods/gen1/scripts.ts
@@ -207,10 +207,10 @@ export const Scripts: ModdedBattleScriptsData = {
 						// We remove recharge
 						if (pokemon.volatiles['mustrecharge']) pokemon.removeVolatile('mustrecharge');
 						delete pokemon.volatiles['partialtrappinglock'];
-					} else if (pokemon.hp) {
-						this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
+					} else {
+						if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);
+						if (pokemon.hp) this.battle.runEvent('AfterMoveSelf', pokemon, target, move);
 					}
-					if (pokemon.volatiles['mustrecharge']) this.battle.add('-mustrecharge', pokemon);
 
 					// For partial trapping moves, we are saving the target
 					if (move.volatileStatus === 'partiallytrapped' && target && target.hp > 0) {