From 9b1a222935a032a65432103c8875c46439b6a3e9 Mon Sep 17 00:00:00 2001
From: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com>
Date: Mon, 12 May 2025 15:33:52 -0500
Subject: [PATCH] [Bug] Fix old session load modifier crash (#5814)

Fix inability to load saves due to modifier type being nulled
---
 src/battle-scene.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 9f70b33b296..5835ee08af5 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -2921,7 +2921,10 @@ export default class BattleScene extends SceneBase {
     instant?: boolean,
     cost?: number,
   ): boolean {
-    if (!modifier) {
+    // We check against modifier.type to stop a bug related to loading in a pokemon that has a form change item, which prior to some patch
+    // that changed form change modifiers worked, had previously set the `type` field to null.
+    // TODO: This is not the right place to check for this; it should ideally go in a session migrator.
+    if (!modifier || !modifier.type) {
       return false;
     }
     let success = false;