diff --git a/src/data/custom-pokemon-data.ts b/src/data/custom-pokemon-data.ts index b70fe8291d8..c8e89fd8748 100644 --- a/src/data/custom-pokemon-data.ts +++ b/src/data/custom-pokemon-data.ts @@ -7,8 +7,11 @@ import type { Nature } from "#enums/nature"; * Includes abilities, nature, changed types, etc. */ export class CustomPokemonData { - /** The scale at which to render this Pokemon's sprite. */ - public spriteScale = 1; + // TODO: Change the default value for all these from -1 to something a bit more sensible + /** + * The scale at which to render this Pokemon's sprite. + */ + public spriteScale = -1; public ability: Abilities | -1; public passive: Abilities | -1; public nature: Nature | -1; diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts index 6b77311e924..b637a2d8b35 100644 --- a/src/field/pokemon.ts +++ b/src/field/pokemon.ts @@ -1215,6 +1215,10 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // G-Max and starmobiles have flat 1.5x scale return 1.5; } + + if (this.customPokemonData.spriteScale <= 0) { + return 1; + } return this.customPokemonData.spriteScale; } diff --git a/src/system/version_migration/versions/v1_9_0.ts b/src/system/version_migration/versions/v1_9_0.ts index 064e9503d33..9505a7138f8 100644 --- a/src/system/version_migration/versions/v1_9_0.ts +++ b/src/system/version_migration/versions/v1_9_0.ts @@ -27,17 +27,14 @@ const migratePartyData: SessionSaveMigrator = { // only edit summondata moveset if exists pkmnData.summonData.moveset &&= pkmnData.summonData.moveset.filter(m => !!m).map(m => PokemonMove.loadMove(m)); - if (pkmnData.customPokemonData) { - // revert all "-1" sprite scales to a minimum value of 1 - pkmnData.customPokemonData.spriteScale = Math.max(1, pkmnData.customPokemonData.spriteScale); - if ( - "hitsRecCount" in pkmnData.customPokemonData && - typeof pkmnData.customPokemonData["hitsRecCount"] === "number" - ) { - // transfer old hit count stat to battleData. - pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"]; - pkmnData.customPokemonData["hitsRecCount"] = null; - } + if ( + pkmnData.customPokemonData && + "hitsRecCount" in pkmnData.customPokemonData && + typeof pkmnData.customPokemonData["hitsRecCount"] === "number" + ) { + // transfer old hit count stat to battleData. + pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"]; + pkmnData.customPokemonData["hitsRecCount"] = null; } return pkmnData; };