diff --git a/src/battle-tooltips.ts b/src/battle-tooltips.ts index f03701540..47303c29d 100644 --- a/src/battle-tooltips.ts +++ b/src/battle-tooltips.ts @@ -2070,7 +2070,7 @@ class BattleTooltips { return value; } - getPokemonTypes(pokemon: Pokemon | ServerPokemon, preterastallized?: boolean): ReadonlyArray { + getPokemonTypes(pokemon: Pokemon | ServerPokemon, preterastallized = false): ReadonlyArray { if (!(pokemon as Pokemon).getTypes) { return this.battle.dex.species.get(pokemon.speciesForme).types; } diff --git a/src/battle.ts b/src/battle.ts index 6ddf4df7b..ca93ca3c3 100644 --- a/src/battle.ts +++ b/src/battle.ts @@ -473,8 +473,8 @@ export class Pokemon implements PokemonDetails, PokemonHealth { pokemon.side.battle.scene.removeTransform(pokemon); pokemon.statusStage = 0; } - copyTypesFrom(pokemon: Pokemon) { - const [types, addedType] = pokemon.getTypes(); + copyTypesFrom(pokemon: Pokemon, preterastallized = false) { + const [types, addedType] = pokemon.getTypes(undefined, preterastallized); this.addVolatile('typechange' as ID, types.join('/')); if (addedType) { this.addVolatile('typeadd' as ID, addedType); @@ -482,7 +482,7 @@ export class Pokemon implements PokemonDetails, PokemonHealth { this.removeVolatile('typeadd' as ID); } } - getTypes(serverPokemon?: ServerPokemon, preterastallized?: boolean): [ReadonlyArray, TypeName | ''] { + getTypes(serverPokemon?: ServerPokemon, preterastallized = false): [ReadonlyArray, TypeName | ''] { let types: ReadonlyArray; if (this.terastallized && !preterastallized) { types = [this.terastallized as TypeName]; @@ -538,7 +538,7 @@ export class Pokemon implements PokemonDetails, PokemonHealth { } return ability.name; } - getTypeList(serverPokemon?: ServerPokemon, preterastallized?: boolean) { + getTypeList(serverPokemon?: ServerPokemon, preterastallized = false) { const [types, addedType] = this.getTypes(serverPokemon, preterastallized); return addedType ? types.concat(addedType) : types; } @@ -2417,7 +2417,7 @@ export class Battle { } poke.boosts = {...tpoke.boosts}; - poke.copyTypesFrom(tpoke); + poke.copyTypesFrom(tpoke, true); poke.ability = tpoke.ability; poke.timesAttacked = tpoke.timesAttacked; const targetForme = tpoke.volatiles.formechange;