diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index 080b2fa4a41..44239411a59 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -3049,7 +3049,7 @@ export abstract class Pokemon extends Phaser.GameObjects.Container {
   public generateAndPopulateMoveset(): void {
     this.moveset = [];
     let movePool: [MoveId, number][] = [];
-    const allLevelMoves = this.getLevelMoves(1, true, true);
+    const allLevelMoves = this.getLevelMoves(1, true, true, this.hasTrainer());
     if (!allLevelMoves) {
       console.warn("Error encountered trying to generate moveset for:", this.species.name);
       return;
diff --git a/src/ui/containers/starter-container.ts b/src/ui/containers/starter-container.ts
index 0a155b3ddfa..59cc50f7c35 100644
--- a/src/ui/containers/starter-container.ts
+++ b/src/ui/containers/starter-container.ts
@@ -111,6 +111,7 @@ export class StarterContainer extends Phaser.GameObjects.Container {
     this.checkIconId(female, formIndex, shiny, variant);
     this.icon.setTint(0);
     this.add(this.icon);
+    this.icon.setBelow(this.label);
 
     [
       this.hiddenAbilityIcon,