From 1867ac4a9e37a49389dd3db6da6c33806258eb77 Mon Sep 17 00:00:00 2001
From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com>
Date: Sun, 17 Nov 2024 12:34:41 -0500
Subject: [PATCH] [Dev] Minor Version Migration Tweaks (#4727)

* [P3] Prevent Unintended ME Migration Application

* Change Patch Value from 4 to 5

* Bump Game Version

* Fix Imports, Use `isNullOrUndefined`
---
 .../version_migration/version_converter.ts    |  2 +-
 .../version_migration/versions/v1_0_4.ts      | 24 +++++++++++++++
 .../version_migration/versions/v1_1_0.ts      | 29 +------------------
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts
index e96afb5cbd4..d0c69dc3213 100644
--- a/src/system/version_migration/version_converter.ts
+++ b/src/system/version_migration/version_converter.ts
@@ -129,7 +129,7 @@ class SessionVersionConverter extends VersionConverter {
 
     if (curMajor === 1) {
       if (curMinor === 0) {
-        if (curPatch <= 4) {
+        if (curPatch <= 5) {
           console.log("Applying v1.0.4 session data migration!");
           this.callMigrators(data, v1_0_4.sessionMigrators);
         }
diff --git a/src/system/version_migration/versions/v1_0_4.ts b/src/system/version_migration/versions/v1_0_4.ts
index d6e5baf0c84..95f0337ecdd 100644
--- a/src/system/version_migration/versions/v1_0_4.ts
+++ b/src/system/version_migration/versions/v1_0_4.ts
@@ -1,6 +1,7 @@
 import { SettingKeys } from "#app/system/settings/settings";
 import { AbilityAttr, defaultStarterSpecies, DexAttr, SystemSaveData, SessionSaveData  } from "#app/system/game-data";
 import { allSpecies } from "#app/data/pokemon-species";
+import { CustomPokemonData } from "#app/data/custom-pokemon-data";
 import { isNullOrUndefined } from "#app/utils";
 
 export const systemMigrators = [
@@ -134,5 +135,28 @@ export const sessionMigrators = [
         m.className = "ResetNegativeStatStageModifier";
       }
     });
+  },
+  /**
+   *  Converts old Pokemon natureOverride and mysteryEncounterData
+   *  to use the new conjoined {@linkcode Pokemon.customPokemonData} structure instead.
+   *  @param data {@linkcode SessionSaveData}
+   */
+  function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) {
+    // Fix Pokemon nature overrides and custom data migration
+    data.party.forEach(pokemon => {
+      if (pokemon["mysteryEncounterPokemonData"]) {
+        pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]);
+        pokemon["mysteryEncounterPokemonData"] = null;
+      }
+      if (pokemon["fusionMysteryEncounterPokemonData"]) {
+        pokemon.fusionCustomPokemonData = new CustomPokemonData(pokemon["fusionMysteryEncounterPokemonData"]);
+        pokemon["fusionMysteryEncounterPokemonData"] = null;
+      }
+      pokemon.customPokemonData = pokemon.customPokemonData ?? new CustomPokemonData();
+      if (!isNullOrUndefined(pokemon["natureOverride"]) && pokemon["natureOverride"] >= 0) {
+        pokemon.customPokemonData.nature = pokemon["natureOverride"];
+        pokemon["natureOverride"] = -1;
+      }
+    });
   }
 ] as const;
diff --git a/src/system/version_migration/versions/v1_1_0.ts b/src/system/version_migration/versions/v1_1_0.ts
index aac554c4531..5d6247aeaa2 100644
--- a/src/system/version_migration/versions/v1_1_0.ts
+++ b/src/system/version_migration/versions/v1_1_0.ts
@@ -1,32 +1,5 @@
-import { SessionSaveData } from "../../game-data";
-import { CustomPokemonData } from "#app/data/custom-pokemon-data";
-
 export const systemMigrators = [] as const;
 
 export const settingsMigrators = [] as const;
 
-export const sessionMigrators = [
-  /**
-   *  Converts old Pokemon natureOverride and mysteryEncounterData
-   *  to use the new conjoined {@linkcode Pokemon.customPokemonData} structure instead.
-   *  @param data {@linkcode SessionSaveData}
-   */
-  function migrateCustomPokemonDataAndNatureOverrides(data: SessionSaveData) {
-    // Fix Pokemon nature overrides and custom data migration
-    data.party.forEach(pokemon => {
-      if (pokemon["mysteryEncounterPokemonData"]) {
-        pokemon.customPokemonData = new CustomPokemonData(pokemon["mysteryEncounterPokemonData"]);
-        pokemon["mysteryEncounterPokemonData"] = null;
-      }
-      if (pokemon["fusionMysteryEncounterPokemonData"]) {
-        pokemon.fusionCustomPokemonData = new CustomPokemonData(pokemon["fusionMysteryEncounterPokemonData"]);
-        pokemon["fusionMysteryEncounterPokemonData"] = null;
-      }
-      pokemon.customPokemonData = pokemon.customPokemonData ?? new CustomPokemonData();
-      if (pokemon["natureOverride"] && pokemon["natureOverride"] >= 0) {
-        pokemon.customPokemonData.nature = pokemon["natureOverride"];
-        pokemon["natureOverride"] = -1;
-      }
-    });
-  }
-] as const;
+export const sessionMigrators = [] as const;