Hppefully fixed -1 sprite scale glitch

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. */
+  // TODO: Change the default value for all these from -1 to something a bit more sensible
-  public spriteScale = 1;
+  /**
+   * 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;

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;
   }
 

src/system/version_migration/versions/v1_9_0.ts

@@ -27,10 +27,8 @@ 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 (
+        pkmnData.customPokemonData &&
         "hitsRecCount" in pkmnData.customPokemonData &&
         typeof pkmnData.customPokemonData["hitsRecCount"] === "number"
       ) {
@@ -38,7 +36,6 @@ const migratePartyData: SessionSaveMigrator = {
         pkmnData.battleData.hitCount = pkmnData.customPokemonData["hitsRecCount"];
         pkmnData.customPokemonData["hitsRecCount"] = null;
       }
-      }
       return pkmnData;
     };