diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 4a21d8bd551..c68ff0dac40 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -11,7 +11,8 @@ import { Phase } from "./phase";
 import { initGameSpeed } from "./system/game-speed";
 import { Biome } from "./data/enums/biome";
 import { Arena, ArenaBase } from "./field/arena";
-import { GameData, PlayerGender } from "./system/game-data";
+import { GameData } from "./system/game-data";
+import { PlayerGender } from "./data/enums/player-gender";
 import { TextStyle, addTextObject } from "./ui/text";
 import { Moves } from "./data/enums/moves";
 import { allMoves } from "./data/move";
diff --git a/src/battle.ts b/src/battle.ts
index f6db308d344..c857a8766ed 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -8,7 +8,7 @@ import { Moves } from "./data/enums/moves";
 import { TrainerType } from "./data/enums/trainer-type";
 import { GameMode } from "./game-mode";
 import { BattleSpec } from "./enums/battle-spec";
-import { PlayerGender } from "./system/game-data";
+import { PlayerGender } from "./data/enums/player-gender";
 import { MoneyMultiplierModifier, PokemonHeldItemModifier } from "./modifier/modifier";
 import { PokeballType } from "./data/pokeball";
 import {trainerConfigs} from "#app/data/trainer-config";
diff --git a/src/data/enums/game-data-type.ts b/src/data/enums/game-data-type.ts
new file mode 100644
index 00000000000..179817fe5be
--- /dev/null
+++ b/src/data/enums/game-data-type.ts
@@ -0,0 +1,10 @@
+/**
+ * enum for the game data types
+ */
+export enum GameDataType {
+  SYSTEM,
+  SESSION,
+  SETTINGS,
+  TUTORIALS,
+  SEEN_DIALOGUES
+}
diff --git a/src/data/enums/passive.ts b/src/data/enums/passive.ts
new file mode 100644
index 00000000000..b9c2dacd463
--- /dev/null
+++ b/src/data/enums/passive.ts
@@ -0,0 +1,7 @@
+/**
+ * enum for passive
+ */
+export enum Passive {
+  UNLOCKED = 1,
+  ENABLED = 2
+}
diff --git a/src/data/enums/player-gender.ts b/src/data/enums/player-gender.ts
new file mode 100644
index 00000000000..b6cd550b1f2
--- /dev/null
+++ b/src/data/enums/player-gender.ts
@@ -0,0 +1,8 @@
+/**
+ * enum for the players gender
+ */
+export enum PlayerGender {
+  UNSET,
+  MALE,
+  FEMALE
+}
diff --git a/src/phases.ts b/src/phases.ts
index a31cd4297aa..406d47cff22 100644
--- a/src/phases.ts
+++ b/src/phases.ts
@@ -43,7 +43,8 @@ import { EggHatchPhase } from "./egg-hatch-phase";
 import { Egg } from "./data/egg";
 import { vouchers } from "./system/voucher";
 import { loggedInUser, updateUserInfo } from "./account";
-import { PlayerGender, SessionSaveData } from "./system/game-data";
+import { SessionSaveData } from "./system/game-data";
+import { PlayerGender } from "./data/enums/player-gender";
 import { addPokeballCaptureStars, addPokeballOpenParticles } from "./field/anims";
 import { SpeciesFormChangeActiveTrigger, SpeciesFormChangeManualTrigger, SpeciesFormChangeMoveLearnedTrigger, SpeciesFormChangePostMoveTrigger, SpeciesFormChangePreMoveTrigger } from "./data/pokemon-forms";
 import { battleSpecDialogue, getCharVariantFromDialogue, miscDialogue } from "./data/dialogue";
diff --git a/src/system/game-data.ts b/src/system/game-data.ts
index 0b81c4014b5..8ed7f521507 100644
--- a/src/system/game-data.ts
+++ b/src/system/game-data.ts
@@ -36,28 +36,11 @@ import { TerrainChangedEvent, WeatherChangedEvent } from "#app/field/arena-event
 import { Device } from "#app/enums/devices.js";
 import { EnemyAttackStatusEffectChanceModifier } from "../modifier/modifier";
 import { StatusEffect } from "#app/data/status-effect.js";
+import { PlayerGender } from "#app/data/enums/player-gender";
+import { GameDataType } from "#app/data/enums/game-data-type";
 
 const saveKey = "x0i2O7WRiANTqPmZ"; // Temporary; secure encryption is not yet necessary
 
-export enum GameDataType {
-  SYSTEM,
-  SESSION,
-  SETTINGS,
-  TUTORIALS,
-  SEEN_DIALOGUES
-}
-
-export enum PlayerGender {
-  UNSET,
-  MALE,
-  FEMALE
-}
-
-export enum Passive {
-  UNLOCKED = 1,
-  ENABLED = 2
-}
-
 export function getDataTypeKey(dataType: GameDataType, slotId: integer = 0): string {
   switch (dataType) {
   case GameDataType.SYSTEM:
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index cf657d0e828..c407aff6927 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -3,7 +3,7 @@ import i18next from "i18next";
 import BattleScene from "../../battle-scene";
 import { hasTouchscreen } from "../../touch-controls";
 import { updateWindowType } from "../../ui/ui-theme";
-import { PlayerGender } from "../game-data";
+import { PlayerGender } from "#app/data/enums/player-gender";
 import { CandyUpgradeNotificationChangedEvent } from "#app/battle-scene-events.js";
 import { MoneyFormat } from "../../enums/money-format";
 import SettingsUiHandler from "#app/ui/settings/settings-ui-handler";
diff --git a/src/ui/menu-ui-handler.ts b/src/ui/menu-ui-handler.ts
index 060cb172b05..a0b0c5da66b 100644
--- a/src/ui/menu-ui-handler.ts
+++ b/src/ui/menu-ui-handler.ts
@@ -4,7 +4,7 @@ import { Mode } from "./ui";
 import * as Utils from "../utils";
 import { addWindow } from "./ui-theme";
 import MessageUiHandler from "./message-ui-handler";
-import { GameDataType } from "../system/game-data";
+import { GameDataType } from "#app/data/enums/game-data-type";
 import { OptionSelectConfig, OptionSelectItem } from "./abstact-option-select-ui-handler";
 import { Tutorial, handleTutorial } from "../tutorial";
 import { updateUserInfo } from "../account";
diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index abba4a081df..dd7a949f275 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -20,7 +20,8 @@ import { Type } from "../data/type";
 import { Button } from "../enums/buttons";
 import { GameModes, gameModes } from "../game-mode";
 import { TitlePhase } from "../phases";
-import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, Passive as PassiveAttr, StarterFormMoveData, StarterMoveset } from "../system/game-data";
+import { AbilityAttr, DexAttr, DexAttrProps, DexEntry, StarterFormMoveData, StarterMoveset } from "../system/game-data";
+import { Passive as PassiveAttr } from "#app/data/enums/passive";
 import { Tutorial, handleTutorial } from "../tutorial";
 import * as Utils from "../utils";
 import { OptionSelectItem } from "./abstact-option-select-ui-handler";
@@ -403,7 +404,8 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
     this.valueLimitLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(this.valueLimitLabel);
 
-    const startLabel = addTextObject(this.scene, 124, 162, i18next.t("starterSelectUiHandler:start"), TextStyle.TOOLTIP_CONTENT);
+    //TODO: back to translated version
+    const startLabel = addTextObject(this.scene, 124, 162, "Random", TextStyle.TOOLTIP_CONTENT);
     startLabel.setOrigin(0.5, 0);
     this.starterSelectContainer.add(startLabel);
 
diff --git a/src/ui/summary-ui-handler.ts b/src/ui/summary-ui-handler.ts
index 1133e7a755c..5a1f883d94f 100644
--- a/src/ui/summary-ui-handler.ts
+++ b/src/ui/summary-ui-handler.ts
@@ -17,7 +17,7 @@ import { StatusEffect } from "../data/status-effect";
 import { getBiomeName } from "../data/biomes";
 import { Nature, getNatureStatMultiplier } from "../data/nature";
 import { loggedInUser } from "../account";
-import { PlayerGender } from "../system/game-data";
+import { PlayerGender } from "#app/data/enums/player-gender";
 import { Variant, getVariantTint } from "#app/data/variant";
 import {Button} from "../enums/buttons";
 import { Ability } from "../data/ability.js";
diff --git a/src/ui/ui.ts b/src/ui/ui.ts
index 7640112e084..55ac06a3488 100644
--- a/src/ui/ui.ts
+++ b/src/ui/ui.ts
@@ -38,7 +38,7 @@ import OutdatedModalUiHandler from "./outdated-modal-ui-handler";
 import SessionReloadModalUiHandler from "./session-reload-modal-ui-handler";
 import {Button} from "../enums/buttons";
 import i18next, {ParseKeys} from "i18next";
-import {PlayerGender} from "#app/system/game-data";
+import { PlayerGender } from "#app/data/enums/player-gender";
 import GamepadBindingUiHandler from "./settings/gamepad-binding-ui-handler";
 import SettingsKeyboardUiHandler from "#app/ui/settings/settings-keyboard-ui-handler";
 import KeyboardBindingUiHandler from "#app/ui/settings/keyboard-binding-ui-handler";