Fix teambuilder move display for formes (#2258)

* Fix teambuilder move display for formes https://www.smogon.com/forums/threads/bug-report-teambuilder.3746541/ This bug was caused by my assumption that the client gets changesFrom the same way the server does. * Update battle-dex-search.ts Linter got upset
smogon · Jul 7, 2024 · 0b2844f · 0b2844f
1 parent 0774605
commit 0b2844f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/play.pokemonshowdown.com/src/battle-dex-data.ts b/play.pokemonshowdown.com/src/battle-dex-data.ts
@@ -1554,10 +1554,11 @@ class Species implements Effect {
 		this.canGigantamax = !!data.canGigantamax;
 		this.cannotDynamax = !!data.cannotDynamax;
 		this.forceTeraType = data.forceTeraType || '';
-		this.battleOnly = data.battleOnly || undefined;
+		this.battleOnly = data.battleOnly || (this.isMega ? this.baseSpecies : undefined);
 		this.isNonstandard = data.isNonstandard || null;
 		this.unreleasedHidden = data.unreleasedHidden || false;
-		this.changesFrom = data.changesFrom || undefined;
+		this.changesFrom = data.changesFrom ||
+			(this.battleOnly !== this.baseSpecies ? this.battleOnly : this.baseSpecies);
 		if (!this.gen) {
 			if (this.num >= 906 || this.formeid.startsWith('-paldea')) {
 				this.gen = 9;

diff --git a/play.pokemonshowdown.com/src/battle-dex-search.ts b/play.pokemonshowdown.com/src/battle-dex-search.ts
@@ -1603,7 +1603,8 @@ class BattleMoveSearch extends BattleTypedSearch<'move'> {
 					const originalSpecies = dex.species.get(species.id);
 					if (
 						currentSpecies.baseSpecies !== originalSpecies.baseSpecies && !originalSpecies.prevo &&
-						!originalSpecies.changesFrom && (!learnsetEntry.includes('e') || dex.gen !== 9)
+						(!originalSpecies.changesFrom || originalSpecies.name === "Greninja-Ash") &&
+						(!learnsetEntry.includes('e') || dex.gen !== 9)
 					) {
 						continue;
 					}