feat!: Hotfix 1.12.0.1 (#7426)

SirzBenjie · DayKev · damocleas · web-flow · commit 833ac0c5b201 · 2026-06-24T18:56:31.000-05:00
* fix: Starmie no longer has the wrong attack stat No idea how this got through, some pr probably ignored that we had it at 100 and it was missed in a lot of other changes. * chore!: update version to `1.12.0.1` * Balance Fixes, Update Submodules - Battle Bond Greninja is now set as a Sub-Legendary to prevent it from generating too early and other effects - Fixed Mega Delphox passive * fix: fix pokedex console spam (#7422) * fix!: block saving if dex data doesn't match starter data (#7420) * misc: block saving if dex data doesn't match starter data * Use `for...of` instead of `for...in` * Add migrator to unlock starters that are missing dex data * Remove classic win count from hasStarterData validation * Remove classic win count check in buggy migrator data. --------- Co-authored-by: Sirz Benjie <142067137+SirzBenjie@users.noreply.github.com> * test: fix parameter types/doc comments of matchers (#7424) * misc: add alert screen when rejecting saving due to invalid save #7428 * Add alert screen when rejecting saving due to invalid save * Remove obsolete `savingIcon.hide()` call * Update locales * Remove testing log --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> * fix(beta): make text box for new save reload alert wider * extra day for event * dev: disable debug log in `species-data-registry.ts` due to pokedex --------- Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com> Co-authored-by: damocleas <damocleas25@gmail.com> Co-authored-by: Fabi <192151969+fabske0@users.noreply.github.com> Co-authored-by: Bertie690 <136088738+Bertie690@users.noreply.github.com>
diff --git a/assets b/assets
@@ -1 +1 @@
-Subproject commit d0b60ec4f4afbd49f7403aff04dc72ec7aa0a8cc
+Subproject commit 31799aa6be6b6df826b266f70f3fc96209a151a2
diff --git a/locales b/locales
@@ -1 +1 @@
-Subproject commit 24d01ef0736292939fb259b26a97badc7827ac71
+Subproject commit 6c78a7a802fc522ee05aea9357560e7cb60da63b
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pokemon-rogue-battle",
   "private": true,
-  "version": "1.12.0.0",
+  "version": "1.12.0.1",
   "type": "module",
   "scripts": {
     "start:prod": "vite --mode production",
diff --git a/src/data/balance/species/generation-01.ts b/src/data/balance/species/generation-01.ts
@@ -12049,7 +12049,7 @@ export function initGenerationOne(): SpeciesDataMapConfig {
           abilityHidden: AbilityId.HUGE_POWER,
           baseTotal: 660,
           baseHp: 60,
-          baseAtk: 140,
+          baseAtk: 100,
           baseDef: 105,
           baseSpatk: 130,
           baseSpdef: 105,
diff --git a/src/data/balance/species/generation-06.ts b/src/data/balance/species/generation-06.ts
@@ -600,7 +600,7 @@ export function initGenerationSix(): SpeciesDataMapConfig {
     ],
     passives: {
       0: AbilityId.NEUROFORCE,
-      1: AbilityId.NEUROFORCE,
+      1: AbilityId.MAGICIAN,
     },
     levelMoves: [
       [RELEARN_MOVE, MoveId.SHADOW_BALL],
diff --git a/src/data/balance/species/generation-07.ts b/src/data/balance/species/generation-07.ts
@@ -12009,6 +12009,7 @@ export function initGenerationSeven(): SpeciesDataMapConfig {
     species: new PokemonSpecies({
       id: SpeciesId.BATTLE_BOND_GRENINJA,
       generation: 7,
+      subLegendary: true,
       category: "Ninja Pokémon",
       type1: PokemonType.WATER,
       type2: PokemonType.DARK,
diff --git a/src/data/balance/timed-events.ts b/src/data/balance/timed-events.ts
@@ -12,7 +12,7 @@ export const timedEvents: readonly TimedEvent[] = [
     name: "Mega Pride 2026",
     eventType: EventType.SHINY,
     startDate: new Date(Date.UTC(2026, 5, 23)),
-    endDate: new Date(Date.UTC(2026, 6, 13)),
+    endDate: new Date(Date.UTC(2026, 6, 14)),
     bannerKey: "pride2026",
     scale: 0.21,
     availableLangs: [
diff --git a/src/data/species-data-registry.ts b/src/data/species-data-registry.ts
@@ -155,7 +155,7 @@ export class SpeciesDataRegistry {
     const tms = [...speciesData.tms, ...(speciesData.formTms?.[formKey] ?? [])];
     const prevo = this.getPrevolution(speciesId);
     if (prevo !== null) {
-      const prevoTms = this.getTms(prevo, formKey);
+      const prevoTms = this.getTms(prevo, form ? formKey : undefined);
       tms.push(...prevoTms);
     }
 
@@ -438,7 +438,6 @@ export class SpeciesDataRegistry {
     }
 
     if (form == null) {
-      console.debug(`No form requested for ${speciesId} (${this.getSpecies(speciesId).name}), returning base form.`);
       return forms[0].formKey;
     }
 
diff --git a/src/enums/ui-mode.ts b/src/enums/ui-mode.ts
@@ -47,4 +47,5 @@ export enum UiMode {
   ADMIN,
   MYSTERY_ENCOUNTER,
   CHANGE_PASSWORD_FORM,
+  ALERT_MODAL,
 }
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
@@ -74,7 +74,7 @@ import { RUN_HISTORY_LIMIT } from "#ui/run-history-ui-handler";
 import { applyChallenges } from "#utils/challenge-utils";
 import { fixedInt, NumberHolder, randInt, randSeedItem } from "#utils/common";
 import { decrypt, encrypt } from "#utils/data";
-import { getEnumKeys } from "#utils/enums";
+import { getEnumKeys, getEnumValues } from "#utils/enums";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { toCamelCase } from "#utils/strings";
 import { AES, enc } from "crypto-js";
@@ -214,10 +214,81 @@ export class GameData {
     return this.unlocks[unlockable];
   }
 
+  /**
+   * @returns Whether the system data is valid
+   */
+  private validateSystemData(data: SystemSaveData): boolean {
+    if (data.starterData == null) {
+      console.error("Starter data missing!");
+      return false;
+    }
+
+    for (const speciesId of getEnumValues(SpeciesId)) {
+      if (!speciesDataRegistry.isStarter(speciesId) || defaultStarterSpecies.includes(speciesId)) {
+        continue;
+      }
+
+      const starterEntry = data.starterData[speciesId];
+      const dexEntry = data.dexData[speciesId];
+
+      const species = SpeciesId[speciesId];
+
+      if (starterEntry == null) {
+        console.error("Missing starter data for %s (%d)!", species, speciesId);
+        return false;
+      }
+      if (dexEntry == null) {
+        console.error("Missing dex data for %s (%d)!", species, speciesId);
+        return false;
+      }
+
+      const hasStarterData =
+        starterEntry.abilityAttr > 1
+        || starterEntry.eggMoves > 0
+        || starterEntry.moveset != null
+        || starterEntry.passiveAttr > 0
+        || starterEntry.valueReduction > 0;
+
+      const noDexData = dexEntry.caughtCount === 0 && dexEntry.hatchedCount === 0 && dexEntry.caughtAttr === 0n;
+
+      if (hasStarterData && noDexData) {
+        console.error("Corrupt save data detected, save rejected!");
+        console.warn("Species: %s (%d)", species, speciesId);
+        console.warn(starterEntry);
+        console.warn(dexEntry);
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  private async showInvalidSaveModal<const T>(returnValue: T): Promise<T> {
+    const { promise, resolve } = Promise.withResolvers<T>();
+    await globalScene.ui.setMode(UiMode.ALERT_MODAL, i18next.t("gameData:failedSaveValidation"));
+    // TODO: This is a temporary hacky solution to ensure the modal displays when saving
+    // on the starter select UI, which change the UI mode without awaiting this async call..
+    globalScene.time.delayedCall(fixedInt(1000), () => {
+      // on the pokedex page, which changes the UiMode after calling this so the
+      // user never sees the alert modal.
+      if (globalScene.ui.getMode() === UiMode.ALERT_MODAL) {
+        globalScene.time.delayedCall(fixedInt(4000), () => resolve(returnValue));
+      } else {
+        globalScene.ui.setMode(UiMode.ALERT_MODAL, i18next.t("gameData:failedSaveValidation"));
+        globalScene.time.delayedCall(fixedInt(4000), () => resolve(returnValue));
+      }
+    });
+    return promise;
+  }
+
   public async saveSystem(): Promise<boolean> {
-    globalScene.ui.savingIcon.show();
     const data = this.getSystemSaveData();
 
+    if (!this.validateSystemData(data)) {
+      return this.showInvalidSaveModal(false);
+    }
+    globalScene.ui.savingIcon.show();
+
     const maxIntAttrValue = 0x80000000;
     const systemData = JSON.stringify(data, (_k: any, v: any) =>
       typeof v === "bigint" ? (v <= maxIntAttrValue ? Number(v) : v.toString()) : v,
@@ -1240,10 +1311,6 @@ export class GameData {
       }
     }
 
-    if (sync) {
-      globalScene.ui.savingIcon.show();
-    }
-
     const sessionData = useCachedSession
       ? this.parseSessionData(
           decrypt(localStorage.getItem(getSessionDataLocalStorageKey(globalScene.sessionSlotId))!, bypassLogin),
@@ -1256,6 +1323,15 @@ export class GameData {
       ? GameData.parseSystemData(decrypt(localStorage.getItem(`data_${loggedInUser?.username}`)!, bypassLogin))
       : this.getSystemSaveData(); // TODO: is this bang correct?
 
+    if (!this.validateSystemData(systemData)) {
+      return this.showInvalidSaveModal(false);
+    }
+
+    // Saving icon should go after validation to avoid confusing users.
+    if (sync) {
+      globalScene.ui.savingIcon.show();
+    }
+
     const request = {
       system: systemData,
       session: sessionData,
diff --git a/src/system/version-migration/version-converter.ts b/src/system/version-migration/version-converter.ts
@@ -66,6 +66,7 @@ import * as v1_9_0 from "#system/v1_9_0";
 import * as v1_10_0 from "#system/v1_10_0";
 import * as v1_11_19 from "#system/v1_11_19";
 import * as v1_12_0_0 from "#system/v1_12_0_0";
+import * as v1_12_0_1 from "#system/v1_12_0_1";
 
 // To add a new set of migrators, add them to the appropriate array of migrators
 
@@ -75,6 +76,7 @@ const systemMigrators: SystemSaveMigrator[] = [
   ...v1_7_0.systemMigrators,
   ...v1_8_3.systemMigrators,
   ...v1_12_0_0.systemMigrators,
+  ...v1_12_0_1.systemMigrators,
 ];
 
 /** All session save migrators */
diff --git a/src/system/version-migration/versions/v1_12_0_1.ts b/src/system/version-migration/versions/v1_12_0_1.ts
@@ -0,0 +1,55 @@
+import { defaultStarterSpecies } from "#app/constants";
+import { speciesDataRegistry } from "#app/global-species-data-registry";
+import { DexAttr } from "#enums/dex-attr";
+import { SpeciesId } from "#enums/species-id";
+import type { SystemSaveMigrator } from "#types/save-migrators";
+import { getEnumValues } from "#utils/enums";
+
+const fixDexData: SystemSaveMigrator = {
+  version: "1.12.0.1",
+  migrate: (data): void => {
+    const defaultStarterAttr =
+      DexAttr.NON_SHINY | DexAttr.MALE | DexAttr.FEMALE | DexAttr.DEFAULT_VARIANT | DexAttr.DEFAULT_FORM;
+
+    for (const speciesId of getEnumValues(SpeciesId)) {
+      if (!speciesDataRegistry.isStarter(speciesId) || defaultStarterSpecies.includes(speciesId)) {
+        continue;
+      }
+
+      const starterEntry = data.starterData[speciesId];
+      const dexEntry = data.dexData[speciesId];
+
+      const species = SpeciesId[speciesId];
+
+      if (starterEntry == null) {
+        console.warn("Missing starter data for %s (%d)!", species, speciesId);
+      }
+      if (dexEntry == null) {
+        console.warn("Missing dex data for %s (%d)!", species, speciesId);
+      }
+
+      const hasStarterData =
+        starterEntry.abilityAttr > 1
+        || starterEntry.eggMoves > 0
+        || starterEntry.moveset != null
+        || starterEntry.passiveAttr > 0
+        || starterEntry.valueReduction > 0;
+
+      const noDexData = dexEntry.caughtCount === 0 && dexEntry.hatchedCount === 0 && dexEntry.caughtAttr === 0n;
+
+      if (hasStarterData && noDexData) {
+        console.warn("Missing dex data for %s (%d), creating backup data.");
+
+        data.dexData[speciesId] = {
+          ...data.dexData[speciesId],
+          caughtCount: 1,
+          caughtAttr: defaultStarterAttr,
+          natureAttr: 1,
+          ivs: [15, 15, 15, 15, 15, 15],
+        };
+      }
+    }
+  },
+};
+
+export const systemMigrators: readonly SystemSaveMigrator[] = [fixDexData] as const;
diff --git a/src/ui/handlers/alert-modal-ui-handler.ts b/src/ui/handlers/alert-modal-ui-handler.ts
@@ -0,0 +1,65 @@
+import { TextStyle } from "#enums/text-style";
+import type { UiMode } from "#enums/ui-mode";
+import type { ModalConfig } from "#ui/modal-ui-handler";
+import { ModalUiHandler } from "#ui/modal-ui-handler";
+import { addTextObject } from "#ui/text";
+import i18next from "i18next";
+
+export class AlertModalUiHandler extends ModalUiHandler {
+  private label: Phaser.GameObjects.Text;
+
+  constructor(mode: UiMode | null = null) {
+    super(mode);
+  }
+
+  getModalTitle(): string {
+    return "";
+  }
+
+  getWidth(): number {
+    return 250;
+  }
+
+  getHeight(): number {
+    return 32;
+  }
+
+  getMargin(): [number, number, number, number] {
+    return [0, 0, 48, 0];
+  }
+
+  getButtonLabels(): string[] {
+    return [];
+  }
+
+  setup(): void {
+    super.setup();
+
+    this.label = addTextObject(
+      //
+      this.getWidth() / 2,
+      this.getHeight() / 2,
+      i18next.t("alert"),
+      TextStyle.WINDOW,
+      { fontSize: "48px", align: "center" },
+    ) //
+      .setOrigin(0.5, 0.5);
+
+    this.modalContainer.add(this.label);
+  }
+
+  /**
+   * Show the alert modal with the specified message.
+   * @param args - The message that will be displayed in the alert box.
+   */
+  show(args: [message: string]): boolean {
+    const config: ModalConfig = { buttonActions: [] };
+
+    const msg = args[0];
+    if (msg) {
+      this.label.setText(args[0]);
+    }
+
+    return super.show([config]);
+  }
+}
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
@@ -7,6 +7,7 @@ import { TextStyle } from "#enums/text-style";
 import { UiMode } from "#enums/ui-mode";
 import { AchvBar } from "#ui/achv-bar";
 import { AchvsUiHandler } from "#ui/achvs-ui-handler";
+import { AlertModalUiHandler } from "#ui/alert-modal-ui-handler";
 import { AutoCompleteUiHandler } from "#ui/autocomplete-ui-handler";
 import { AwaitableUiHandler } from "#ui/awaitable-ui-handler";
 import { BallUiHandler } from "#ui/ball-ui-handler";
@@ -108,6 +109,7 @@ const noTransitionModes = [
   UiMode.MYSTERY_ENCOUNTER,
   UiMode.RUN_INFO,
   UiMode.CHANGE_PASSWORD_FORM,
+  UiMode.ALERT_MODAL,
 ];
 
 // biome-ignore lint/style/useNamingConvention: a unique case (only 2 letters)
@@ -182,6 +184,7 @@ export class UI extends Phaser.GameObjects.Container {
       new AdminUiHandler(),
       new MysteryEncounterUiHandler(),
       new ChangePasswordFormUiHandler(),
+      new AlertModalUiHandler(),
     ];
   }
 
diff --git a/test/@types/vitest.d.ts b/test/@types/vitest.d.ts
diff --git a/test/matchers/to-have-effective-stat.ts b/test/matchers/to-have-effective-stat.ts

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "pokemon-rogue-battle",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.12.0.0",`
	`4`	`+ "version": "1.12.0.1",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"start:prod": "vite --mode production",`
Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ export class SpeciesDataRegistry {`
`155`	`155`	`const tms = [...speciesData.tms, ...(speciesData.formTms?.[formKey] ?? [])];`
`156`	`156`	`const prevo = this.getPrevolution(speciesId);`
`157`	`157`	`if (prevo !== null) {`
`158`		`- const prevoTms = this.getTms(prevo, formKey);`
	`158`	`+ const prevoTms = this.getTms(prevo, form ? formKey : undefined);`
`159`	`159`	`tms.push(...prevoTms);`
`160`	`160`	`}`
`161`	`161`
`@@ -438,7 +438,6 @@ export class SpeciesDataRegistry {`
`438`	`438`	`}`
`439`	`439`
`440`	`440`	`if (form == null) {`
`441`		- console.debug(`No form requested for ${speciesId} (${this.getSpecies(speciesId).name}), returning base form.`);
`442`	`441`	`return forms[0].formKey;`
`443`	`442`	`}`
`444`	`443`
Original file line number	Diff line number	Diff line change
`@@ -47,4 +47,5 @@ export enum UiMode {`
`47`	`47`	`ADMIN,`
`48`	`48`	`MYSTERY_ENCOUNTER,`
`49`	`49`	`CHANGE_PASSWORD_FORM,`
	`50`	`+ ALERT_MODAL,`
`50`	`51`	`}`