From acb15221388a8b5f07f93cc0faa09d9c4d4574c0 Mon Sep 17 00:00:00 2001 From: Xavion3 Date: Tue, 9 Sep 2025 06:06:12 +1000 Subject: [PATCH 1/3] [Balance] Allow enemy trainer pokemon to use relearn moves (#6515) --- src/field/pokemon.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From b4cbbf1b8f46f9b413a3b0e2976338162f294697 Mon Sep 17 00:00:00 2001 From: Fabi <192151969+fabske0@users.noreply.github.com> Date: Wed, 10 Sep 2025 00:35:09 +0200 Subject: [PATCH 2/3] [Bug] remove `node:console` import (#6530) --- src/field/mystery-encounter-intro.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/field/mystery-encounter-intro.ts b/src/field/mystery-encounter-intro.ts index 5af4dcf028f..cf0a0f30529 100644 --- a/src/field/mystery-encounter-intro.ts +++ b/src/field/mystery-encounter-intro.ts @@ -6,7 +6,6 @@ import type { MysteryEncounter } from "#mystery-encounters/mystery-encounter"; import { loadPokemonVariantAssets } from "#sprites/pokemon-sprite"; import type { Variant } from "#sprites/variant"; import { isNullOrUndefined } from "#utils/common"; -import console from "node:console"; import type { GameObjects } from "phaser"; type PlayAnimationConfig = Phaser.Types.Animations.PlayAnimationConfig; From df223bfbc88b65799c066be49ccb5512f3ec6418 Mon Sep 17 00:00:00 2001 From: Madmadness65 <59298170+Madmadness65@users.noreply.github.com> Date: Tue, 9 Sep 2025 18:26:23 -0500 Subject: [PATCH 3/3] [Misc] [Bug] Remove `summary_overlay_shiny` from loading scene (#6532) Remove `summary_overlay_shiny` from loading scene This file was renamed and moved in PR #6433 so this loadImage is no longer needed here. --- src/loading-scene.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/loading-scene.ts b/src/loading-scene.ts index 232c2abca29..c01c5287dc5 100644 --- a/src/loading-scene.ts +++ b/src/loading-scene.ts @@ -131,7 +131,6 @@ export class LoadingScene extends SceneBase { this.loadAtlas("party_transfer", "ui"); this.loadImage("summary_bg", "ui"); - this.loadImage("summary_overlay_shiny", "ui"); this.loadImage("summary_profile", "ui"); this.loadImage("summary_profile_prompt_z", "ui"); // The pixel Z button prompt this.loadImage("summary_profile_prompt_a", "ui"); // The pixel A button prompt