From 9e013ae52c5bf7d91bc6780c972eccc67462e7b2 Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Wed, 26 Mar 2025 01:42:07 +0100
Subject: [PATCH] =?UTF-8?q?Trainer=20Pok=C3=A9mon=20cannot=20be=20shiny=20?=
 =?UTF-8?q?unless=20explicitly=20requested=20(maybe)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/data/trainer-config.ts | 4 ++--
 src/field/trainer.ts       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 0417e7abc32..2dce046a800 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -1716,7 +1716,7 @@ export function getRandomPartyMemberFunc(
       level,
       trainerSlot,
       undefined,
-      false,
+      true, // Shiny lock all trainer Pokémon #TODO: does this affect Ivy's Ray?
       undefined,
       postProcess,
     );
@@ -1742,7 +1742,7 @@ function getSpeciesFilterRandomPartyMemberFunc(
         .getTrainerSpeciesForLevel(level, true, strength, waveIndex),
     );
 
-    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, false, undefined, postProcess);
+    return globalScene.addEnemyPokemon(species, level, trainerSlot, undefined, true, undefined, postProcess);
   };
 }
 
diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index 98919ebfa93..1cd14dc5848 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -422,6 +422,8 @@ export default class Trainer extends Phaser.GameObjects.Container {
           species,
           level,
           !this.isDouble() || !(index % 2) ? TrainerSlot.TRAINER : TrainerSlot.TRAINER_PARTNER,
+          false,
+          true, // shiny locking all trainer mons
         );
       },
       this.config.hasStaticParty