Merge pull request #511 from andrewbenington/species-form-fix

[FIX] species/form regression fix

Author: andrewbenington

src/core/pkm/OHPKM.ts

@@ -55,6 +55,7 @@ import {
   statsPreSplitToWasm,
   trainerMemoryToWasm,
 } from './convert'
+import { isEvolution } from './Lookup'
 import { adjustMovePPBetweenFormats, generateIVs, getAbilityFromNumber, ivsFromDVs } from './util'
 
 export class OHPKM extends OhpkmV2Wasm implements PKMInterface {
@@ -696,7 +697,13 @@ export class OHPKM extends OhpkmV2Wasm implements PKMInterface {
     this.movePP = adjustMovePPBetweenFormats(this, other)
     this.movePPUps = other.movePPUps as FourMoves
 
-    this.speciesAndForme = new SpeciesAndForme(other.dexNum, other.formeNum)
+    if (this.dexNum !== other.dexNum && isEvolution(this, other)) {
+      this.speciesAndForme = new SpeciesAndForme(other.dexNum, other.formeNum)
+    }
+
+    if (this.dexNum === other.dexNum || isEvolution(this, other)) {
+      this.speciesAndForme = new SpeciesAndForme(other.dexNum, other.formeNum)
+    }
 
     this.heldItemIndex = other.heldItemIndex
     if (other.ability && !FORMATS_WITHOUT_ABILITIES.includes(other.format)) {