From 43cedf40253fda36a76219d268f3b508260ac6da Mon Sep 17 00:00:00 2001
From: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
Date: Tue, 16 Dec 2025 07:46:33 -0700
Subject: [PATCH] Mix and Mega: Fix non-Mega Stone items

---
 data/mods/mixandmega/scripts.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/mods/mixandmega/scripts.ts b/data/mods/mixandmega/scripts.ts
index 24056551d9..78d85cce0b 100644
--- a/data/mods/mixandmega/scripts.ts
+++ b/data/mods/mixandmega/scripts.ts
@@ -467,7 +467,8 @@ export const Scripts: ModdedBattleScriptsData = {
 		},
 		getFormeChangeDeltas(formeChangeSpecies, pokemon) {
 			// Should be fine as long as Necrozma-U doesn't get added or Game Freak makes me sad with some convoluted forme change
-			let baseSpecies = this.dex.species.get(formeChangeSpecies.battleOnly as string);
+			let baseSpecies = this.dex.species.get(formeChangeSpecies.isMega ?
+				formeChangeSpecies.battleOnly as string : formeChangeSpecies.baseSpecies);
 			if (formeChangeSpecies.name === 'Zygarde-Mega') {
 				baseSpecies = this.dex.species.get('Zygarde-Complete');
 			}