diff --git a/public/locales b/public/locales
index 74de730a642..090bfefaf7e 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 74de730a64272c8e9ca0a4cdcf3426cbf1b0aeda
+Subproject commit 090bfefaf7e9d4efcbca61fa78a9cdf5d701830b
diff --git a/src/@types/save-data.ts b/src/@types/save-data.ts
index 4c20d63da53..da839c1d7c9 100644
--- a/src/@types/save-data.ts
+++ b/src/@types/save-data.ts
@@ -89,11 +89,11 @@ export interface StarterMoveData {
   [key: number]: StarterMoveset | StarterFormMoveData;
 }
 
-export interface StarterAttributes {
+export interface StarterPreferences {
   nature?: number;
-  ability?: number;
+  abilityIndex?: number;
   variant?: number;
-  form?: number;
+  formIndex?: number;
   female?: boolean;
   shiny?: boolean;
   favorite?: boolean;
diff --git a/src/ui/containers/starter-container.ts b/src/ui/containers/starter-container.ts
index 59cc50f7c35..c6b265532ed 100644
--- a/src/ui/containers/starter-container.ts
+++ b/src/ui/containers/starter-container.ts
@@ -1,7 +1,7 @@
 import { globalScene } from "#app/global-scene";
 import type { PokemonSpecies } from "#data/pokemon-species";
 import { TextStyle } from "#enums/text-style";
-import type { DexAttrProps } from "#system/game-data";
+import type { DexAttrProps } from "#types/save-data";
 import { addTextObject } from "#ui/text";
 
 export class StarterContainer extends Phaser.GameObjects.Container {
diff --git a/src/ui/containers/starter-summary.ts b/src/ui/containers/starter-summary.ts
index f6595e6b8f6..d9a96788273 100644
--- a/src/ui/containers/starter-summary.ts
+++ b/src/ui/containers/starter-summary.ts
@@ -16,8 +16,8 @@ import { SpeciesId } from "#enums/species-id";
 import { TextStyle } from "#enums/text-style";
 import { getVariantIcon, getVariantTint, type Variant } from "#sprites/variant";
 import { achvs } from "#system/achv";
-import type { StarterMoveset, StarterPreferences } from "#system/game-data";
 import type { Ability } from "#types/ability-types";
+import type { StarterMoveset, StarterPreferences } from "#types/save-data";
 import { BooleanHolder, getLocalizedSpriteKey, isNullOrUndefined, padInt, rgbHexToRgba } from "#utils/common";
 import { getPokemonSpecies, getPokemonSpeciesForm } from "#utils/pokemon-utils";
 import { toCamelCase, toTitleCase } from "#utils/strings";
diff --git a/src/ui/handlers/starter-select-ui-handler.ts b/src/ui/handlers/starter-select-ui-handler.ts
index c9ae66be193..28e1b007da5 100644
--- a/src/ui/handlers/starter-select-ui-handler.ts
+++ b/src/ui/handlers/starter-select-ui-handler.ts
@@ -41,27 +41,20 @@ import { BattleSceneEventType } from "#events/battle-scene";
 import type { Variant } from "#sprites/variant";
 import { getVariantIcon, getVariantTint } from "#sprites/variant";
 import { achvs } from "#system/achv";
-import type { DexAttrProps, StarterMoveset, StarterPreferences } from "#types/save-data";
 import { RibbonData } from "#system/ribbons/ribbon-data";
 import { SettingKeyboard } from "#system/settings-keyboard";
 import type { DexEntry } from "#types/dex-data";
-import {
-  DropDown,
-  DropDownLabel,
-  DropDownOption,
-  DropDownState,
-  DropDownType,
-  SortCriteria,
-} from "#ui/dropdown";
+import type { DexAttrProps, StarterMoveset, StarterPreferences } from "#types/save-data";
+import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
+import { DropDown, DropDownLabel, DropDownOption, DropDownState, DropDownType, SortCriteria } from "#ui/dropdown";
 import { FilterBar } from "#ui/filter-bar";
+import { MessageUiHandler } from "#ui/message-ui-handler";
 import { MoveInfoOverlay } from "#ui/move-info-overlay";
+import { PokemonIconAnimHelper, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-helper";
 import { ScrollBar } from "#ui/scroll-bar";
 import { StarterContainer } from "#ui/starter-container";
-import { StatsContainer } from "#ui/stats-container";
-import type { OptionSelectItem } from "#ui/abstract-option-select-ui-handler";
-import { MessageUiHandler } from "#ui/message-ui-handler";
-import { PokemonIconAnimHelper, PokemonIconAnimMode } from "#ui/pokemon-icon-anim-helper";
-import { addBBCodeTextObject, addTextObject, getTextColor } from "#ui/text";
+import { StarterSummary } from "#ui/starter-summary";
+import { addTextObject, getTextColor } from "#ui/text";
 import { addWindow } from "#ui/ui-theme";
 import {
   getDexAttrFromPreferences,
@@ -85,7 +78,6 @@ import { getPokemonSpecies, getPokemonSpeciesForm, getPokerusStarters } from "#u
 import { argbFromRgba } from "@material/material-color-utilities";
 import i18next from "i18next";
 import type { GameObjects } from "phaser";
-import { StarterSummary } from "#ui/starter-summary";
 
 const COLUMNS = 9;
 const ROWS = 9;
diff --git a/src/ui/utils/starter-select-ui-utils.ts b/src/ui/utils/starter-select-ui-utils.ts
index 70ab9fa4a38..4272127ffbe 100644
--- a/src/ui/utils/starter-select-ui-utils.ts
+++ b/src/ui/utils/starter-select-ui-utils.ts
@@ -15,8 +15,8 @@ import { Passive } from "#enums/passive";
 import type { PokemonType } from "#enums/pokemon-type";
 import type { SpeciesId } from "#enums/species-id";
 import type { Variant } from "#sprites/variant";
-import type { DexAttrProps, StarterDataEntry, StarterPreferences } from "#system/game-data";
 import type { DexEntry } from "#types/dex-data";
+import type { DexAttrProps, StarterDataEntry, StarterPreferences } from "#types/save-data";
 import { applyChallenges, checkStarterValidForChallenge } from "#utils/challenge-utils";
 import { isNullOrUndefined, NumberHolder } from "#utils/common";
 import i18next from "i18next";
diff --git a/test/ui/pokedex.test.ts b/test/ui/pokedex.test.ts
index b991013c5e5..cab8264329b 100644
--- a/test/ui/pokedex.test.ts
+++ b/test/ui/pokedex.test.ts
@@ -7,7 +7,7 @@ import { PokemonType } from "#enums/pokemon-type";
 import { SpeciesId } from "#enums/species-id";
 import { UiMode } from "#enums/ui-mode";
 import { GameManager } from "#test/test-utils/game-manager";
-import { StarterPreferences } from "#types/save-data";
+import type { StarterPreferences } from "#types/save-data";
 import { FilterTextRow } from "#ui/filter-text";
 import { PokedexPageUiHandler } from "#ui/pokedex-page-ui-handler";
 import { PokedexUiHandler } from "#ui/pokedex-ui-handler";