diff --git a/public/images/ui/cursor_tera.png b/public/images/ui/cursor_tera.png
new file mode 100644
index 00000000000..34cbe095895
Binary files /dev/null and b/public/images/ui/cursor_tera.png differ
diff --git a/public/images/ui/legacy/cursor_tera.png b/public/images/ui/legacy/cursor_tera.png
new file mode 100644
index 00000000000..f2e77046137
Binary files /dev/null and b/public/images/ui/legacy/cursor_tera.png differ
diff --git a/src/loading-scene.ts b/src/loading-scene.ts
index de1df784b2b..183b38c49e5 100644
--- a/src/loading-scene.ts
+++ b/src/loading-scene.ts
@@ -101,6 +101,7 @@ export class LoadingScene extends SceneBase {
     this.loadImage("icon_lock", "ui", "icon_lock.png");
     this.loadImage("icon_stop", "ui", "icon_stop.png");
     this.loadImage("icon_tera", "ui");
+    this.loadImage("cursor_tera", "ui");
     this.loadImage("type_tera", "ui");
     this.loadAtlas("type_bgs", "ui");
     this.loadAtlas("button_tera", "ui");
diff --git a/src/system/version_migration/versions/v1_7_0.ts b/src/system/version_migration/versions/v1_7_0.ts
index 2acb9d8151a..bdb9e6aab9f 100644
--- a/src/system/version_migration/versions/v1_7_0.ts
+++ b/src/system/version_migration/versions/v1_7_0.ts
@@ -1,8 +1,29 @@
-import { getPokemonSpeciesForm } from "#app/data/pokemon-species";
-import type { SessionSaveData } from "#app/system/game-data";
+import { getPokemonSpecies, getPokemonSpeciesForm } from "#app/data/pokemon-species";
+import { globalScene } from "#app/global-scene";
+import { DexAttr, type SessionSaveData, type SystemSaveData } from "#app/system/game-data";
 import * as Utils from "#app/utils";
 
-export const systemMigrators = [] as const;
+export const systemMigrators = [
+  /**
+   * If a starter is caught, but the only forms registered as caught are not starterSelectable,
+   * unlock the default form.
+   * @param data {@linkcode SystemSaveData}
+   */
+  function migrateUnselectableForms(data: SystemSaveData) {
+    if (data.starterData && data.dexData) {
+      Object.keys(data.starterData).forEach(sd => {
+        const caughtAttr = data.dexData[sd]?.caughtAttr;
+        const species = getPokemonSpecies(Number(sd));
+        if (caughtAttr && species.forms?.length > 1) {
+          const selectableForms = species.forms.filter((form, formIndex) => form.isStarterSelectable && (caughtAttr & globalScene.gameData.getFormAttr(formIndex)));
+          if (selectableForms.length === 0) {
+            data.dexData[sd].caughtAttr += DexAttr.DEFAULT_FORM;
+          }
+        }
+      });
+    }
+  },
+] as const;
 
 export const settingsMigrators = [] as const;
 
diff --git a/src/ui/fight-ui-handler.ts b/src/ui/fight-ui-handler.ts
index 1c1dceb24a5..8e8b197117c 100644
--- a/src/ui/fight-ui-handler.ts
+++ b/src/ui/fight-ui-handler.ts
@@ -226,7 +226,9 @@ export default class FightUiHandler extends UiHandler implements InfoToggle {
     }
 
     if (!this.cursorObj) {
-      this.cursorObj = globalScene.add.image(0, 0, "cursor");
+      const isTera = this.fromCommand === Command.TERA;
+      this.cursorObj = globalScene.add.image(0, 0, isTera ? "cursor_tera" : "cursor");
+      this.cursorObj.setScale(isTera ? 0.7 : 1);
       ui.add(this.cursorObj);
     }