From cedeaf866852e57c54899838dea4aa8346c6b2c6 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Fri, 2 May 2025 19:55:48 -0700
Subject: [PATCH] [Bug] Fix crash when loading a save with a statused Pokemon
 (#5756)

---
 src/system/pokemon-data.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/system/pokemon-data.ts b/src/system/pokemon-data.ts
index 7e71dffde5e..ef1f30830f0 100644
--- a/src/system/pokemon-data.ts
+++ b/src/system/pokemon-data.ts
@@ -4,7 +4,7 @@ import type { Gender } from "../data/gender";
 import { Nature } from "#enums/nature";
 import { PokeballType } from "#enums/pokeball";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "../data/pokemon-species";
-import type { Status } from "../data/status-effect";
+import { Status } from "../data/status-effect";
 import Pokemon, { EnemyPokemon, PokemonBattleData, PokemonMove, PokemonSummonData } from "../field/pokemon";
 import { TrainerSlot } from "#enums/trainer-slot";
 import type { Variant } from "#app/sprites/variant";
@@ -105,7 +105,9 @@ export default class PokemonData {
     // TODO: Can't we move some of this verification stuff to an upgrade script?
     this.nature = source.nature ?? Nature.HARDY;
     this.moveset = source.moveset.map((m: any) => PokemonMove.loadMove(m));
-    this.status = source.status ?? null;
+    this.status = source.status
+      ? new Status(source.status.effect, source.status.toxicTurnCount, source.status.sleepTurnsRemaining)
+      : null;
     this.friendship = source.friendship ?? getPokemonSpecies(this.species).baseFriendship;
     this.metLevel = source.metLevel || 5;
     this.metBiome = source.metBiome ?? -1;