From 3765f843db5e10b2ad6d08d9d993c29012196963 Mon Sep 17 00:00:00 2001
From: Xavion3 <xavion333@gmail.com>
Date: Sat, 6 Sep 2025 16:12:32 +1000
Subject: [PATCH 1/2] [Refactor] Remove randSeedWeightedItem utils function.
 (#6492)

Remove randSeedWeightedItem utils function.
---
 src/field/trainer.ts | 6 ++----
 src/utils/common.ts  | 4 ----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/field/trainer.ts b/src/field/trainer.ts
index acbc8031dbc..6d427585a87 100644
--- a/src/field/trainer.ts
+++ b/src/field/trainer.ts
@@ -17,7 +17,7 @@ import { getIsInitialized, initI18n } from "#plugins/i18n";
 import type { TrainerConfig } from "#trainers/trainer-config";
 import { trainerConfigs } from "#trainers/trainer-config";
 import { TrainerPartyCompoundTemplate, type TrainerPartyTemplate } from "#trainers/trainer-party-template";
-import { randSeedInt, randSeedItem, randSeedWeightedItem } from "#utils/common";
+import { randSeedInt, randSeedItem } from "#utils/common";
 import { getRandomLocaleEntry } from "#utils/i18n";
 import { getPokemonSpecies } from "#utils/pokemon-utils";
 import { toCamelCase } from "#utils/strings";
@@ -61,9 +61,7 @@ export class Trainer extends Phaser.GameObjects.Container {
 
     this.variant = variant;
     this.partyTemplateIndex = Math.min(
-      partyTemplateIndex !== undefined
-        ? partyTemplateIndex
-        : randSeedWeightedItem(this.config.partyTemplates.map((_, i) => i)),
+      partyTemplateIndex !== undefined ? partyTemplateIndex : randSeedItem(this.config.partyTemplates.map((_, i) => i)),
       this.config.partyTemplates.length - 1,
     );
     // TODO: Rework this and add actual error handling for missing names
diff --git a/src/utils/common.ts b/src/utils/common.ts
index c8e28545046..97e61b902d8 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -133,10 +133,6 @@ export function randSeedItem<T>(items: T[]): T {
   return items.length === 1 ? items[0] : Phaser.Math.RND.pick(items);
 }
 
-export function randSeedWeightedItem<T>(items: T[]): T {
-  return items.length === 1 ? items[0] : Phaser.Math.RND.weightedPick(items);
-}
-
 /**
  * Shuffle a list using the seeded rng. Utilises the Fisher-Yates algorithm.
  * @param {Array} items An array of items.

From ddc04a7a87baca23bdaaeb4466412cd7af132141 Mon Sep 17 00:00:00 2001
From: HeeMyung Kim <hmkim735@gmail.com>
Date: Sat, 6 Sep 2025 15:40:38 +0900
Subject: [PATCH 2/2] [Bug] [UI/UX] Fix random button activation bug (#6464)

---
 src/ui/starter-select-ui-handler.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ui/starter-select-ui-handler.ts b/src/ui/starter-select-ui-handler.ts
index 049f33af5d7..3b4b2716369 100644
--- a/src/ui/starter-select-ui-handler.ts
+++ b/src/ui/starter-select-ui-handler.ts
@@ -1619,6 +1619,7 @@ export class StarterSelectUiHandler extends MessageUiHandler {
       if (!this.filterMode) {
         this.startCursorObj.setVisible(false);
         this.starterIconsCursorObj.setVisible(false);
+        this.randomCursorObj.setVisible(false);
         this.setSpecies(null);
         this.filterBarCursor = 0;
         this.setFilterMode(true);