From 8f884a7ef04411098f081185703c91746d256d4e Mon Sep 17 00:00:00 2001
From: Asuka Kuwahara <42548220+asukakuwahara@users.noreply.github.com>
Date: Sun, 29 Dec 2024 21:09:11 -0500
Subject: [PATCH 1/9] [BUG] fix #5038 update shedinja's gender to genderless on
 evolution (#5039)

* update shedinja's gender to genderless

* update unit test
---
 src/field/pokemon.ts       | 1 +
 src/test/evolution.test.ts | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/field/pokemon.ts b/src/field/pokemon.ts
index fcfc2ff7536..30856ab416a 100644
--- a/src/field/pokemon.ts
+++ b/src/field/pokemon.ts
@@ -4484,6 +4484,7 @@ export class PlayerPokemon extends Pokemon {
         newPokemon.moveset = this.moveset.slice();
         newPokemon.moveset = this.copyMoveset();
         newPokemon.luck = this.luck;
+        newPokemon.gender = Gender.GENDERLESS;
         newPokemon.metLevel = this.metLevel;
         newPokemon.metBiome = this.metBiome;
         newPokemon.metSpecies = this.metSpecies;
diff --git a/src/test/evolution.test.ts b/src/test/evolution.test.ts
index 3046d103cbc..10748899d59 100644
--- a/src/test/evolution.test.ts
+++ b/src/test/evolution.test.ts
@@ -78,12 +78,15 @@ describe("Evolution", () => {
     const nincada = game.scene.getPlayerPokemon()!;
     nincada.abilityIndex = 2;
     nincada.metBiome = -1;
+    nincada.gender = 1;
 
     nincada.evolve(pokemonEvolutions[Species.NINCADA][0], nincada.getSpeciesForm());
     const ninjask = game.scene.getPlayerParty()[0];
     const shedinja = game.scene.getPlayerParty()[1];
     expect(ninjask.abilityIndex).toBe(2);
     expect(shedinja.abilityIndex).toBe(1);
+    expect(ninjask.gender).toBe(1);
+    expect(shedinja.gender).toBe(-1);
     // Regression test for https://github.com/pagefaultgames/pokerogue/issues/3842
     expect(shedinja.metBiome).toBe(-1);
   });

From 6946abadb8e25f7a4e73c7bd07e0afa22741360c Mon Sep 17 00:00:00 2001
From: Wlowscha <54003515+Wlowscha@users.noreply.github.com>
Date: Mon, 30 Dec 2024 16:35:45 +0100
Subject: [PATCH 2/9] [UI/UX] Add cursor memory option (#5028)

* Adding a new key determining whether the command cursor resets at the beginning of each new battle.

* Allowing user to toggle commandCursorReset on and off.

* Changing option name to commandCursorMemory

* Fixed caps in settings.ts

* Moved Command_Cursor_Memory from Display settings to General settings
---
 src/battle-scene.ts             |  1 +
 src/phases/command-phase.ts     |  8 +++++++-
 src/system/settings/settings.ts | 11 +++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index c430a12ae3e..11950f0a47f 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -147,6 +147,7 @@ export default class BattleScene extends SceneBase {
   public damageNumbersMode: integer = 0;
   public reroll: boolean = false;
   public shopCursorTarget: number = ShopCursorTarget.REWARDS;
+  public commandCursorMemory: boolean = false;
   public showMovesetFlyout: boolean = true;
   public showArenaFlyout: boolean = true;
   public showTimeOfDayWidget: boolean = true;
diff --git a/src/phases/command-phase.ts b/src/phases/command-phase.ts
index eab76282908..fa85f2427e5 100644
--- a/src/phases/command-phase.ts
+++ b/src/phases/command-phase.ts
@@ -35,8 +35,14 @@ export class CommandPhase extends FieldPhase {
     this.scene.updateGameInfo();
 
     const commandUiHandler = this.scene.ui.handlers[Mode.COMMAND];
+
+    // If one of these conditions is true, we always reset the cursor to Command.FIGHT
+    const cursorResetEvent = this.scene.currentBattle.battleType === BattleType.MYSTERY_ENCOUNTER ||
+                              this.scene.currentBattle.battleType === BattleType.TRAINER ||
+                              this.scene.arena.biomeType === Biome.END;
+
     if (commandUiHandler) {
-      if (this.scene.currentBattle.turn === 1 || commandUiHandler.getCursor() === Command.POKEMON) {
+      if ((this.scene.currentBattle.turn === 1 && (!this.scene.commandCursorMemory || cursorResetEvent)) || commandUiHandler.getCursor() === Command.POKEMON) {
         commandUiHandler.setCursor(Command.FIGHT);
       } else {
         commandUiHandler.setCursor(commandUiHandler.getCursor());
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index 64ddfdae5cf..ebdcad1c4f9 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -157,6 +157,7 @@ export const SettingKeys = {
   Move_Animations: "MOVE_ANIMATIONS",
   Show_Stats_on_Level_Up: "SHOW_LEVEL_UP_STATS",
   Shop_Cursor_Target: "SHOP_CURSOR_TARGET",
+  Command_Cursor_Memory: "COMMAND_CURSOR_MEMORY",
   Candy_Upgrade_Notification: "CANDY_UPGRADE_NOTIFICATION",
   Candy_Upgrade_Display: "CANDY_UPGRADE_DISPLAY",
   Move_Info: "MOVE_INFO",
@@ -339,6 +340,13 @@ export const Setting: Array<Setting> = [
     default: 0,
     type: SettingType.GENERAL
   },
+  {
+    key: SettingKeys.Command_Cursor_Memory,
+    label: i18next.t("settings:commandCursorMemory"),
+    options: OFF_ON,
+    default: 0,
+    type: SettingType.GENERAL
+  },
   {
     key: SettingKeys.Enable_Retries,
     label: i18next.t("settings:enableRetries"),
@@ -827,6 +835,9 @@ export function setSetting(scene: BattleScene, setting: string, value: integer):
       const selectedValue = shopCursorTargetIndexMap[value];
       scene.shopCursorTarget = selectedValue;
       break;
+    case SettingKeys.Command_Cursor_Memory:
+      scene.commandCursorMemory = Setting[index].options[value].value === "On";
+      break;
     case SettingKeys.EXP_Gains_Speed:
       scene.expGainsSpeed = value;
       break;

From 1b6374f4697c2cdb77c30eca694acf4a43ece8e9 Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 30 Dec 2024 18:55:28 -0800
Subject: [PATCH 3/9] [UI/UX] Change label for music settings (#5053)

Changes from "Consistent/Mixed" to "Gen V + PMD"/"All Gens"

Update `MusicPreferences` enum

* Update locales submodule
---
 public/locales                                     |  2 +-
 src/battle-scene.ts                                |  2 +-
 src/battle.ts                                      |  6 +++---
 .../encounters/global-trade-system-encounter.ts    |  2 +-
 src/system/settings/settings.ts                    | 14 +++++++-------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/locales b/public/locales
index 6c6f0af398a..b28ba1255c8 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85
+Subproject commit b28ba1255c8db12cb07947f88635cb6be0143a15
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 11950f0a47f..327ab1cc926 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -174,7 +174,7 @@ export default class BattleScene extends SceneBase {
   public uiTheme: UiTheme = UiTheme.DEFAULT;
   public windowType: integer = 0;
   public experimentalSprites: boolean = false;
-  public musicPreference: number = MusicPreference.MIXED;
+  public musicPreference: number = MusicPreference.ALLGENS;
   public moveAnimations: boolean = true;
   public expGainsSpeed: ExpGainsSpeed = ExpGainsSpeed.DEFAULT;
   public skipSeenDialogues: boolean = false;
diff --git a/src/battle.ts b/src/battle.ts
index 75f0dff2534..38ee7b5eae0 100644
--- a/src/battle.ts
+++ b/src/battle.ts
@@ -222,7 +222,7 @@ export default class Battle {
       if (!this.started && this.trainer?.config.encounterBgm && this.trainer?.getEncounterMessages()?.length) {
         return `encounter_${this.trainer?.getEncounterBgm()}`;
       }
-      if (scene.musicPreference === MusicPreference.CONSISTENT) {
+      if (scene.musicPreference === MusicPreference.GENFIVE) {
         return this.trainer?.getBattleBgm() ?? null;
       } else {
         return this.trainer?.getMixedBattleBgm() ?? null;
@@ -239,7 +239,7 @@ export default class Battle {
         return "battle_final_encounter";
       }
       if (pokemon.species.legendary || pokemon.species.subLegendary || pokemon.species.mythical) {
-        if (scene.musicPreference === MusicPreference.CONSISTENT) {
+        if (scene.musicPreference === MusicPreference.GENFIVE) {
           switch (pokemon.species.speciesId) {
             case Species.REGIROCK:
             case Species.REGICE:
@@ -256,7 +256,7 @@ export default class Battle {
               }
               return "battle_legendary_unova";
           }
-        } else if (scene.musicPreference === MusicPreference.MIXED) {
+        } else if (scene.musicPreference === MusicPreference.ALLGENS) {
           switch (pokemon.species.speciesId) {
             case Species.ARTICUNO:
             case Species.ZAPDOS:
diff --git a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
index fa445d75d4f..b7376c2bfd2 100644
--- a/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
+++ b/src/data/mystery-encounters/encounters/global-trade-system-encounter.ts
@@ -107,7 +107,7 @@ export const GlobalTradeSystemEncounter: MysteryEncounter =
 
       // Load bgm
       let bgmKey: string;
-      if (scene.musicPreference === MusicPreference.CONSISTENT) {
+      if (scene.musicPreference === MusicPreference.GENFIVE) {
         bgmKey = "mystery_encounter_gen_5_gts";
         scene.loadBgm(bgmKey, `${bgmKey}.mp3`);
       } else {
diff --git a/src/system/settings/settings.ts b/src/system/settings/settings.ts
index ebdcad1c4f9..0a11648c171 100644
--- a/src/system/settings/settings.ts
+++ b/src/system/settings/settings.ts
@@ -181,8 +181,8 @@ export const SettingKeys = {
 };
 
 export enum MusicPreference {
-  CONSISTENT,
-  MIXED
+  GENFIVE,
+  ALLGENS
 }
 
 /**
@@ -670,15 +670,15 @@ export const Setting: Array<Setting> = [
     label: i18next.t("settings:musicPreference"),
     options: [
       {
-        value: "Consistent",
-        label: i18next.t("settings:consistent")
+        value: "Gen V + PMD",
+        label: i18next.t("settings:musicGenFive")
       },
       {
-        value: "Mixed",
-        label: i18next.t("settings:mixed")
+        value: "All Gens",
+        label: i18next.t("settings:musicAllGens")
       }
     ],
-    default: MusicPreference.MIXED,
+    default: MusicPreference.ALLGENS,
     type: SettingType.AUDIO,
     requireReload: true
   },

From 14902cdb60908eb98d01c3cd52134387f8061c7e Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 30 Dec 2024 20:20:23 -0800
Subject: [PATCH 4/9] [Hotfix] Prevent Keldeo from changing forms in Daily Run
 (#5060)

* [Hotfix] Prevent Keldeo from changing forms in Daily Run

* Update patch version
---
 package-lock.json         | 4 ++--
 package.json              | 2 +-
 src/data/pokemon-forms.ts | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ef89a8831f..c3c08a9ec00 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.4.1",
+			"version": "1.4.2",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index 980bcd2034e..d484927e5fc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.4.1",
+	"version": "1.4.2",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
diff --git a/src/data/pokemon-forms.ts b/src/data/pokemon-forms.ts
index a1b2d7896d7..d3cccbefdba 100644
--- a/src/data/pokemon-forms.ts
+++ b/src/data/pokemon-forms.ts
@@ -770,8 +770,8 @@ export const pokemonFormChanges: PokemonFormChanges = {
     new SpeciesFormChange(Species.KYUREM, "", "white", new SpeciesFormChangeItemTrigger(FormChangeItem.LIGHT_STONE), false, getSpeciesDependentFormChangeCondition(Species.RESHIRAM))
   ],
   [Species.KELDEO]: [
-    new SpeciesFormChange(Species.KELDEO, "ordinary", "resolute", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD)),
-    new SpeciesFormChange(Species.KELDEO, "resolute", "ordinary", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD, false))
+    new SpeciesFormChange(Species.KELDEO, "ordinary", "resolute", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD), false, new SpeciesFormChangeCondition((p) => p.scene.gameMode.isDaily !== true)),
+    new SpeciesFormChange(Species.KELDEO, "resolute", "ordinary", new SpeciesFormChangeMoveLearnedTrigger(Moves.SECRET_SWORD, false), false, new SpeciesFormChangeCondition((p) => p.scene.gameMode.isDaily !== true))
   ],
   [Species.MELOETTA]: [
     new SpeciesFormChange(Species.MELOETTA, "aria", "pirouette", new MeloettaFormChangePostMoveTrigger(Moves.RELIC_SONG), true),

From ec5dadb4f4095edb999905119286ea172c0270be Mon Sep 17 00:00:00 2001
From: AJ Fontaine <36677462+Fontbane@users.noreply.github.com>
Date: Fri, 3 Jan 2025 18:42:06 -0500
Subject: [PATCH 5/9] [Misc] Undo winter holiday event changes (#5068)

---
 src/data/balance/starters.ts                              | 2 +-
 .../mystery-encounters/encounters/delibirdy-encounter.ts  | 5 ++---
 src/data/mystery-encounters/mystery-encounters.ts         | 8 ++++----
 src/phases/trainer-victory-phase.ts                       | 2 +-
 .../encounters/delibirdy-encounter.test.ts                | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/data/balance/starters.ts b/src/data/balance/starters.ts
index abbe3897908..ec66401675b 100644
--- a/src/data/balance/starters.ts
+++ b/src/data/balance/starters.ts
@@ -4,7 +4,7 @@ export const POKERUS_STARTER_COUNT = 5;
 
 // #region Friendship constants
 export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 3;
-export const FRIENDSHIP_GAIN_FROM_BATTLE = 4;
+export const FRIENDSHIP_GAIN_FROM_BATTLE = 3;
 export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 6;
 export const FRIENDSHIP_LOSS_FROM_FAINT = 5;
 
diff --git a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
index 1df87a3d17f..99668c76143 100644
--- a/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
+++ b/src/data/mystery-encounters/encounters/delibirdy-encounter.ts
@@ -34,7 +34,7 @@ const OPTION_3_DISALLOWED_MODIFIERS = [
   "PokemonBaseStatTotalModifier"
 ];
 
-const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 1.5;
+const DELIBIRDY_MONEY_PRICE_MULTIPLIER = 2;
 
 const doEventReward = (scene: BattleScene) => {
   const event_buff = scene.eventManager.activeEvent()?.delibirdyBuff ?? [];
@@ -60,8 +60,7 @@ const doEventReward = (scene: BattleScene) => {
  */
 export const DelibirdyEncounter: MysteryEncounter =
   MysteryEncounterBuilder.withEncounterType(MysteryEncounterType.DELIBIRDY)
-    .withMaxAllowedEncounters(4)
-    .withEncounterTier(MysteryEncounterTier.COMMON) //Change back after event!
+    .withEncounterTier(MysteryEncounterTier.GREAT)
     .withSceneWaveRangeRequirement(...CLASSIC_MODE_MYSTERY_ENCOUNTER_WAVES)
     .withSceneRequirement(new MoneyRequirement(0, DELIBIRDY_MONEY_PRICE_MULTIPLIER)) // Must have enough money for it to spawn at the very least
     .withPrimaryPokemonRequirement(
diff --git a/src/data/mystery-encounters/mystery-encounters.ts b/src/data/mystery-encounters/mystery-encounters.ts
index 8a747cd4cd4..44feabeeaea 100644
--- a/src/data/mystery-encounters/mystery-encounters.ts
+++ b/src/data/mystery-encounters/mystery-encounters.ts
@@ -177,7 +177,7 @@ export const allMysteryEncounters: { [encounterType: number]: MysteryEncounter }
 const extremeBiomeEncounters: MysteryEncounterType[] = [];
 
 const nonExtremeBiomeEncounters: MysteryEncounterType[] = [
-  // MysteryEncounterType.FIELD_TRIP, Disabled for holiday event
+  // MysteryEncounterType.FIELD_TRIP, Disabled
   MysteryEncounterType.DANCING_LESSONS, // Is also in BADLANDS, DESERT, VOLCANO, WASTELAND, ABYSS
 ];
 
@@ -185,14 +185,14 @@ const humanTransitableBiomeEncounters: MysteryEncounterType[] = [
   MysteryEncounterType.MYSTERIOUS_CHALLENGERS,
   MysteryEncounterType.SHADY_VITAMIN_DEALER,
   MysteryEncounterType.THE_POKEMON_SALESMAN,
-  // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled for holiday event
+  // MysteryEncounterType.AN_OFFER_YOU_CANT_REFUSE, Disabled
   MysteryEncounterType.THE_WINSTRATE_CHALLENGE,
   MysteryEncounterType.THE_EXPERT_POKEMON_BREEDER
 ];
 
 const civilizationBiomeEncounters: MysteryEncounterType[] = [
-  // MysteryEncounterType.DEPARTMENT_STORE_SALE, Disabled for holiday event
-  // MysteryEncounterType.PART_TIMER, Disabled for holiday event
+  MysteryEncounterType.DEPARTMENT_STORE_SALE,
+  MysteryEncounterType.PART_TIMER,
   MysteryEncounterType.FUN_AND_GAMES,
   MysteryEncounterType.GLOBAL_TRADE_SYSTEM
 ];
diff --git a/src/phases/trainer-victory-phase.ts b/src/phases/trainer-victory-phase.ts
index 456d548a9ba..d797e4360ac 100644
--- a/src/phases/trainer-victory-phase.ts
+++ b/src/phases/trainer-victory-phase.ts
@@ -39,7 +39,7 @@ export class TrainerVictoryPhase extends BattlePhase {
     // Validate Voucher for boss trainers
     if (vouchers.hasOwnProperty(TrainerType[trainerType])) {
       if (!this.scene.validateVoucher(vouchers[TrainerType[trainerType]]) && this.scene.currentBattle.trainer?.config.isBoss) {
-        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
+        this.scene.unshiftPhase(new ModifierRewardPhase(this.scene, [ modifierTypes.VOUCHER, modifierTypes.VOUCHER, modifierTypes.VOUCHER_PLUS, modifierTypes.VOUCHER_PREMIUM ][vouchers[TrainerType[trainerType]].voucherType]));
       }
     }
     // Breeders in Space achievement
diff --git a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
index 71fb695111a..c226d60a9b4 100644
--- a/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
+++ b/src/test/mystery-encounter/encounters/delibirdy-encounter.test.ts
@@ -56,7 +56,7 @@ describe("Delibird-y - Mystery Encounter", () => {
     await game.runToMysteryEncounter(MysteryEncounterType.DELIBIRDY, defaultParty);
 
     expect(DelibirdyEncounter.encounterType).toBe(MysteryEncounterType.DELIBIRDY);
-    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.COMMON);
+    expect(DelibirdyEncounter.encounterTier).toBe(MysteryEncounterTier.GREAT);
     expect(DelibirdyEncounter.dialogue).toBeDefined();
     expect(DelibirdyEncounter.dialogue.intro).toStrictEqual([{ text: `${namespace}:intro` }]);
     expect(DelibirdyEncounter.dialogue.outro).toStrictEqual([{ text: `${namespace}:outro` }]);

From 355e70328c7e079e7deaf598059108885b91c8e5 Mon Sep 17 00:00:00 2001
From: "Amani H." <109637146+xsn34kzx@users.noreply.github.com>
Date: Fri, 3 Jan 2025 19:27:26 -0500
Subject: [PATCH 6/9] [Misc] `1.4.3` Version Bump + Locales Update (#5077)

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 public/locales    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c3c08a9ec00..52cc628872a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.4.2",
+	"version": "1.4.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.4.2",
+			"version": "1.4.3",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index d484927e5fc..e52c5928da7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.4.2",
+	"version": "1.4.3",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
diff --git a/public/locales b/public/locales
index b28ba1255c8..2e03bc8f273 160000
--- a/public/locales
+++ b/public/locales
@@ -1 +1 @@
-Subproject commit b28ba1255c8db12cb07947f88635cb6be0143a15
+Subproject commit 2e03bc8f2736269bfa365faad587c3ec54a37621

From 1be95e8a1a36ec8ac9ac8b112d45b0abc61af496 Mon Sep 17 00:00:00 2001
From: Lugiad <2070109+Adri1@users.noreply.github.com>
Date: Sat, 4 Jan 2025 23:43:40 +0100
Subject: [PATCH 7/9] [Localization] [UI/UX] Updates for pokemon-emerald-pro &
 pkmnems (#4968)

* Add files via upload

* Add files via upload
---
 public/fonts/pkmnems.ttf             | Bin 26132 -> 26504 bytes
 public/fonts/pokemon-emerald-pro.ttf | Bin 93528 -> 93816 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/fonts/pkmnems.ttf b/public/fonts/pkmnems.ttf
index b0b50d0f10ff8a64753acb663781be30d9b0213d..2cc7bfeee62569b1190a20ad91dcfada349b0d32 100644
GIT binary patch
delta 1094
zcmY*YZ){Ul6hG(ny|!)*ZIL33+P?R0``SlzZflDKQBjwM5dH`(laRskwv`pLjfRzF
z`hgN-3?a)TmJlOu*@p$^mkBgXd>_!@6ojc{A7-+U*p!42N%&?&*6}>|ZA5*^x#!>g
zoqK-woqJ{mPyUJpKmhQ-32?xcbh>3nf93rgKz9#CgS+;=)Z~4X8V10v<hOSA8oA>m
z2g(3W4}fr`+vv|(79pX#i}LR7p7#!ojNX_8sHp<9B(oW#>#vU%3Y426*^s3`?E!Zq
z)f35&WP9_4!3U9=7bq|WAimpkq|<15aJWLXrs;r<y~bb;HP}S?I0587qc`(vaB>Qu
zy#c`SPVPv5Ucde^<vLChe%>ZSgp409kF<L?{|U8jf&pAOyX`U8caL>716XOX&Gm#_
zHweWQsJrSo4%d}l!w($AG09V$7FQJ~Bv0v%_!br>i6FnEAc*jZt$h^nz;Uq9fnjXK
zz1S(D=oWX2`{cFSn{*}AD~zFlA#A`scu)k<Df+}#%5JeN>#lXp`p!CUowWu4s=rik
zR==-)TjnT!&cC0Jo55wDJ2&B$?ajc?xR!R;mCifAK<^FsX?YVVTvKdwzmC^SpS#at
z;m7Bzp^c$jXejhq=xXR*SPkzC_k>S}uY}9thjNX)UfwSE$)Cy-@{D{>2`c-PL1jXj
zQy!{LRaVpLesxeCSEtl@=445>on_exHp;HDN<@exBZnfxkxP*~Q6aiA+7NAx4n?m;
zE1FN+thH!IwIS_NlQykYVk=^DtT~p8jmD;8v#~$o?zk4;7SF~{#m#tGU#U0i`}G0+
zj6R{yudgeWYhHXMBM}o*xKF>y0WPQoFRUYKsYF0wsf0hJ1SEybgkSL|{ESv6)SHX5
zriu9{LtMCJnxtLLrmgK2^9$ob{o*VQFt1-cm1ae0ldtJNU^1WXH%;mGQ>S`xsp8@+
z$D3xUHvOegu+l=kblYyx3!ns8>gB|949TFT81LX4q$cc|REgJH7#G`Ubomqt_odZj
zJp+Ly?6ZUmFb8oA5FtMi<rTOr@#5NcrPU^p73xc0Z5>|2=hpZTSJ5nr@Cg2f$M73m
zfQzsI)#6;o=_KyJowy6%hOcoq?s3s0&1D;t&Nn)aW(G1&!&a_ieTN$wH#9BlL@D3d
XE-<=rnq`3x6$$)4cZ;6x|6kKTDlJBg

delta 714
zcmXX^Ur19?82`?8S!**j(V1@Cf4hICq~@}enFUe{1kEx`25MKG4sp5K9@dK!>A^sv
zxY9#OL=1!wS>7l}DY3E;so{%06j(|4;DZlprWe*X>A>Nf-}n2@kMsS$Z}=-2T_iCe
z0B{5b!3d3B@74Nn%*_J$cQNX?c>aPH)`=bQ3S#<FQ<*z!_tZTA(t^0TGpK|*Z-%V^
zrVIc>yhjO#QYlmde-e3fPv7nC_YKx+0Lv=Cm9>Ch>H6c;%8>hp`*a}Sk15txa|sIO
zVn7H4Bhl~8mg9&M0F<w<zf;kdj}D?1V#A4`5)Ba^JjhpJK6^t6`fD7MuK-#<02r@@
z`oodwr8ygb;=uPW4~oMACpH#q+Oy7VgVl`B01^-D_R{CC9D{x9!Di(lTRM~EYo%n!
zs5TlXb%x4SCyZt_X~@tvsFS4f5tfy<$^jG%;8_US7_s0zMHo^}nn*iEC^L1LYGDhc
zTC@TG2TxU>$(|Qajiw^0UVTBI*Wc;WtNX|i^@l0{Fol;q+&1lvX`E!u!zZNvFOsW<
z%;(5QEn$94VoS7zmgow)g&w45=yfKWsbaiL2Q$RPnR#ZD1y*3svJp1HCOP0rIWO17
zMY$*36qn?5K9hIzZTtuy=V$p9e#dEZdYnGzi1V%Uw_p(}1fS3=3=5OOnph}$#DF*|
zPKXQQnq-k2l1J*6qQ%mf^jX@GGv#8rR=zF|$j{_i`KK$#Rpsh+jk%^=UtAkSP~<MU
zrRkQEYHiy)ZqV4eyT{Pg=N)&jzq{}k_Fx$j@B;QhCq_c4wO#i!;Weoz4To@8LV@xM
k&E#)4hy?vJ9Qcic1=!C6G>0k#{ZAuYYF|%*F~`334+*=!J^%m!

diff --git a/public/fonts/pokemon-emerald-pro.ttf b/public/fonts/pokemon-emerald-pro.ttf
index 84e49ebbc40def70813370e460324d84e021cc69..e4ee49dbff37948936b7770f697ab143b9f434d5 100644
GIT binary patch
delta 4252
zcmb7HdsI_Nny-6{gzyk~h4(uFF(M$35W>R?LO{R}0TB^mfDl3mA!5XcKte=74Co52
zw8PpC!yx0b3=6a}3`?gOn{`+Z%V9kpn{^okn)Y~TWLTPJZN;smS?%e6_G~4$>U-4p
z`yTcEQT1$=wDp{%0vG_m5=}+`a5x!9etr8lj{qiBBdJSjdO(nf_)jYUutvlS3QF_j
z<v)H|4S>}n0LYAj3WWy-Z~_1)Ez(m&@}kn+LjiXIu-^axFD%MCBY*!MK!m5%>x-o4
zMaF@dLjZU+0?hrHxG+y8^e%M%cjUkvZD5L#grp&FAwCZAbaAOd`ETF8t3mur0Cvww
z%L?*n;j<Lvunhp?_0l}0oJ0dWq!*+89<sdB!m+O-?En@l0KnwW^0G6E0ruN}1z3t7
zQYXvH3+4Um`)rYY4%+W8FApk{*DO0RP=p-_<hh|5s2HD#9z8v^JMw$n43!0qIi9_X
zeqB8GWo2t17H0f|eka@-lwtlxI0go9lRC*5XstDMZgqi_L4o;e5;i)>vo69C{^jlX
z#{G?d+UN&h>B`cXrE&z5wa8mcT})VvT6A4>UNl)GEkZrKek|NvC|Qs!B<blFqc4VD
z{NsyG6hP|Wwv98UdaoBF&j4Z&-=UEyG=d~FlXoP>kOEB%`%IzKu$Dp@(wD&jIEdCE
z__;xPA3lJ?i2nl|fq#UfJJ$aU$KV$Ry$*f}$C3U|JDP_naBheE3!F!a7jVI_adAhw
z1i#s#mf^|{^&MP=e}(Hi+<!sT8t{9#34a(|q9$W1C6I#xAOvDq2`a#6Kn5hpp8^yk
zfO^mlm%(X>Ab<#*g>%T^JT?Kp1tp*o`#tCe!$1Y{K`HzOi-E7;Uw{-`fT&%78e9aQ
zVAhxoM43YcJPYOUG<X323ckQt@Cy7rY=oEfL72kx;2bQ66;S<~VSA{;EpabA4OioL
z@KJmLe+wBf4d%m2*a7?CG~6<ZHOeunG3qoLHJUM6CYh7GNK6u!q#<1+4UnFYHprG_
zHd#o%PVOR)lIM+qG1EB9xW>4}xZhZ3ykNXaAyep-Xo`TMq}-wmQJzyaOvom56Rt_N
zNrj2lMAd6DVKQg3Vd`T_m}Zz(nBFp-Hr+6@Gh>@^%p_*@X6<H^X6xo`bD_D?TxUMB
z%VigHSNSf@uIXLRcWqf%Td*vI7L^t^Ecz@)EG8}HEZ*#9?pE%eu=KFxSV}FgTaH?;
zSXo;URsyRgt9w?HR%_Ol)`8YM>k8`|*2C6oDjO%8I2(mckIjrN#WvbD-?rYi-}VU=
zr+QISs0wNab&|Sm=VO;;*J3wpw`^}~&#_n7Ywf%2b@tC3tR12q#17XT#vL{tJseq%
zBFB2iZpX)tD^5;MOedjJol}p~Q)jX>!<p+`<$TY1&c)J&<sxutbD3~ibG3F2aaCow
z%3a%Cb*>w3mToM!47Vz`PPZrSrtY!smF`3Ca~|d%ksjq9?H)RhIgf2mU(X~@k*Cu0
zj^~)?tmmp1#mm+!(o5`h&1=|elg6NB&}6iF+HG1tZHl%;dqcON`_T!yjNU>Yq0f4o
zdk1-Ede?a0@*eYE@Uivb_*ANV`h2GL;Cq;RGWRs?>D{yJYwjE8tM(n+3-&Vi%J=r|
zU1OLt{24q(IYZ0nV?5tS-siI~cAs=#+rIIAD}GLXaehKSwcmi>@_wiN-2GMid-p%{
zH}d!M&-ZWhzvn;gzZT#SKm_Cmr~|qJ9tNxjx&$T#$^*55qk$_2><*|R4~PzE4~!gG
z3UUZa3{nPl1<eHG!K`3;@KEq-h;0ZvL>V#^vJ`3;$_v$o4u`&BMlu!5Ugk^Yc9>Tf
zJB%OJ6xJCw8a5NQ#KKt)tUy*Ii^~$Q<g6-IJFA;D&YEMbg;T;A;gR9oa7nl_ye|Ak
zcz5_%_+<Dz8&|O{*bH_eTgYx?_p|5NZz60Xm=T-^aYRi-SHwufY{Y7$S0pD=9N84v
z9XS#CEOH~tDatR38>NW47c~{N8EqFG7o8v77Tq5`9=&#uaxmy%#zFPL-h<B%t`pXT
z8<9vziAJJ_cuu^Hv4~;Bq{YZ$)G@bXbTON;4zVguEI+nB_FnANA^cF#p|nHghpr#$
zJv0*s;%wtW;!@&dao6Me;#T6F;uGWf@yhtN`1|n_@$>PU9A8c*N6G2pJmah+SR~LB
z;u10w$`fuR^dvk^SWom#Boea{Wr<CR-H8*4^M@&i0}p2%t~lIrc<k`w!!MIelR}d6
zlQgQNzNBYKE6L``9?3*<TCy~`CHYSB!{k>f9x1F8Zi+BPozjsqlJX?w?Gdjd#1Yw%
zjw9noo^x?-2$#d<bE~+wxjOEAs$FVqsywwmwI_8lb(Lq!WAU<i*LV}Wmq$&HGL9x5
z%|0qQsyW(zbUF>B1*HkoZlz76t))Apt76lo>5b`~=_BdW>022d8L=6{jFybyjE!Ud
z$5M`oj@2LQIyQRj$+7uNmrP!!EK{4=lR2Kba2y=>JDzo1c)aQO!10+ZN|t|CTGq9!
ziLC7t%oF?*^(Tf-%x9Zshh%4DE3$jCXHOcP^gqczsXf_$a^~cAj&Dv{jwGikr%#om
z%XyqLm$Q)zaxHURazk>7Tv={iZddO8+^O8z+;u*M@6TuRx%_heb$&O0lK+gqddlJy
z<5b)!;i<Y)eWzwlEep&A3_+xTD-Z~zf*L`mU{bK2XPL*!%g<}f>&ctU+sdcsXXoF_
zpDM5}NGnhj^c5@%$-*FEj!>l(b_&OYPlc<6wuS7%?83^zu0mbmE0Lv$Ey@wqi*Ad?
zMN35%ML|XUqMD+vB3;qbqNSoOF<l%ejuvN$C1RzxNjxf^60a0fiv5Z?#o5K0;(NvS
ziys$nNyrkqgel=kB$7Hwr$i@tE?FrtEuojNOSmPXl9rM&Rmrl{P8uzhNjs!t(uGo^
zQbuWJX-nyF>6*+%mL}849?CY$7-flNm1XT^lVvaEc5*^qCGVC$k*}S0IL$mQIITVX
z@bqfAUwLMETlrY|)*0V3@-rQ0o}5`z7%4myECpXtr?{t>J`2vW&q~gAoqbYaS`l5L
zsTi(UJ*V<ImwB$~+}OEQrJFKGc}w|7xq069y#IObdCB?q^W*2&DxE6hDkYVjl}{_T
zFL+(xU8uRxePQatRu#P}r|L#kXH{R-NY&%2`Kpa-a<x-6yE?nNvieqafAv)LZ1t<^
z%^GrzOO0=hv}UYkx@JXXt)i<4l}Od7>QQZ~?NsVOb&8s=u25fB52zojw`!eg{cG8^
zDYe4ds@iL{y|ud9C5@%VR}-tr*Hmh{H4~ay&9Y|eqUA;3i@b}9iyaq7F3#6k*Co|S
z>gwux>!$0rE?Hh8F3B%lzchSlvz}G2tnaO#X&^W78q^JU8Xh&QG)6YwyG*_;xU9H*
z^4jHr%L`59CRUTYskdqM3jK=o%J7wmE3dRhS|4q+Hd8Cp)@ui}PqfR;4$buDxMp6n
zrn#?qruk)yQA<dRs72G#(=y#M*Rp<<ewDbIakc7d|JA9h=r%H__WB&Qdf#<U4hs#Y
z?!!WZZGKv)R*2tYg;<+lD~M<vp(Y3-HdYf$=%R5Q9<4(xL11b$ZKF?(5!*V$ryeZx
zVIEMS%NM#n68f7MFa|cj9ylW&A$ih5gP~Qh;YSOl{p5)n9Et(rJwQl=4*k)<(Mr4n
zICzgPmfHXcfI){~4VOBMzzGAk8Q2XRf$K+fS1dR*0=aTUUnuex8f>L^yyHNJydZew
z%z%iTpaj%vlma4j7-9z_vV2Hf!!`Fq0%j<I58>+_U{;<~PiioghUSmRm>yP#UI03T
zgT^})BuYp}w7&MUvvviZe+vRzJx8go|7(td+Sc#=d1T<`-$BfNfd2_zgzosrn%JqR
zK5MEW?_Xk~RHHDIHq{f=*aofM==+%u^#><9LyRa$G}MF+(`};zZCz_{bl7b;F?T@w
zWxO#0`;d=Vh6DRWG2f{Ts7R_qnA>W7ivZC2w$5Qtns*u||6g@Qr$r0(q|&TD2K^qW
z)fhUXk5wfw9XhR6;--U-K0|#^=?_KUSNi%91oDleML)IyrrsXp6ed$zv2%{CZr@O%
z414vJ+3CZdw}(!rZxF*F=nVEh)yGgAeSvhXKWg0nKPccQlx_Wr0ev^?zgE==??ImI
zYm?TzWcxsU03VY0d0+qqg0k5O>O%oqbph_-)W1C(3?)NF)kEFBV`WGL*ZV~Sg|2Te
z{XE#Kj4!Z5&o!U}C?tSd3RRn?504mp{U4k%WAxrcG2*TMc3(XBF&VQV6R;HwfI-*>
z?t=&5A^ZdkfzQEL@CML;anJy7!gly6_y>3kOu%2Em%-n|+we1Z2mTt2fiGYu7`@3&
z!=z;RHPC|3ZtBvoKqh(swSyjT3w#P*L;WM@x8OSH&_9I0UHAjI3fjOYa0~u7_yc?c
ze}r%0JGc$sKcJ^$m<1kt=z)74#x}iqvIKL3=neXysstlps{42g!0>PJZ-E*98h?f6
zHGB<_@NIkxm_ZeK`<cNys0Jk1052iB5jI+xp?A+^cQe=on~>xRyaJ4&7HSdQ44VOj
zZSX3ZZ=jrwP@XrDydAb9t54yl$f^te3TeCHZ;|$H7QBnpJ+KF<e+Peu)Fbd7ayAD4
yh~$5QIy8R;ze18f!wE#cfU{^`fD6cY1ui1`JNO;4U4^U2_Ivmmn7u~>fd2u4HEhQK

delta 3617
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
Ku>OPyfd2zVR<#!Z


From 197b264fb0bf07ece381bd7e9488f3e8048b058b Mon Sep 17 00:00:00 2001
From: NightKev <34855794+DayKev@users.noreply.github.com>
Date: Mon, 6 Jan 2025 16:24:08 -0800
Subject: [PATCH 8/9] [Bug] Gimmighoul & Eevee eggs will now properly randomize
 their forms (#5080)

---
 src/battle-scene.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 327ab1cc926..ae992f5c00f 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1424,6 +1424,8 @@ export default class BattleScene extends SceneBase {
       return 0;
     }
 
+    const isEggPhase: boolean = [ "EggLapsePhase", "EggHatchPhase" ].includes(this.getCurrentPhase()?.constructor.name ?? "");
+
     switch (species.speciesId) {
       case Species.UNOWN:
       case Species.SHELLOS:
@@ -1455,7 +1457,7 @@ export default class BattleScene extends SceneBase {
         }
         return Utils.randSeedInt(8);
       case Species.EEVEE:
-        if (this.currentBattle?.battleType === BattleType.TRAINER && this.currentBattle?.waveIndex < 30) {
+        if (this.currentBattle?.battleType === BattleType.TRAINER && this.currentBattle?.waveIndex < 30 && !isEggPhase) {
           return 0; // No Partner Eevee for Wave 12 Preschoolers
         }
         return Utils.randSeedInt(2);
@@ -1483,7 +1485,7 @@ export default class BattleScene extends SceneBase {
         return 0;
       case Species.GIMMIGHOUL:
       // Chest form can only be found in Mysterious Chest Encounter, if this is a game mode with MEs
-        if (this.gameMode.hasMysteryEncounters) {
+        if (this.gameMode.hasMysteryEncounters && !isEggPhase) {
           return 1; // Wandering form
         } else {
           return Utils.randSeedInt(species.forms.length);

From 07b69c9485841063a4fc0353c48460eaf1e8083e Mon Sep 17 00:00:00 2001
From: Unicornpowerstar <gabriella.pahankala@hotmail.se>
Date: Tue, 7 Jan 2025 01:26:00 +0100
Subject: [PATCH 9/9] [Sprite] Fix Issues with the 658-ash.json to display
 sprite correctly (#5055)

* [Sprite][Color] Fixing Issues with the 658-ash.json to display sprite correctly

- Fix colors not being shown correctly in the json.
   - Said fix are adding a new entry to separate the whites that are F8f8f8 by adding f4f4f4
   - Changed the wrong color into the correct one on the rare.

---------

Co-authored-by: NightKev <34855794+DayKev@users.noreply.github.com>
---
 public/images/pokemon/658-ash.png             | Bin 1244 -> 1246 bytes
 public/images/pokemon/exp/658-ash.png         | Bin 2468 -> 2472 bytes
 public/images/pokemon/shiny/658-ash.png       | Bin 1247 -> 1247 bytes
 public/images/pokemon/variant/658-ash.json    |   4 +++-
 .../images/pokemon/variant/exp/658-ash.json   |   2 ++
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/public/images/pokemon/658-ash.png b/public/images/pokemon/658-ash.png
index a122df859bd0ed45c2bd78ee2d024b343a4cdc88..fa6ce5cb16521b9b690cd05cd6192b31b198b3fc 100644
GIT binary patch
delta 1121
zcmV-n1fKic3El~iHUro1^pQC^3iR~!@E90I;80ePd?kM<Nkl<ZScR?FiISTz3;@u`
zVL2j0AkO~(uU3Z-FqhrdGuzJW!b38)rR4F*2kw6JPXli}0Qip{!0T1z;dtS(R>xg=
zqE&PD<ObC$x!jwkX`|J0TW^})Z&+)8!I2kkB2Bocy`Vk4k(LGSmj;EW9>C<eq`ja&
z^EeLrN$-EMZIjo5*MxiBb4V0g;?iWby@={{ooG`BTkhBsje{Hc<``fvB8um^uG=Jg
z$R!PNvlR&>5!j0yfh(@tdofeQWtq2cpTUkiyW*k;eI6e27<I6=%$U7k276HM&3{ZD
z3>)r4V>}!?5R{uNuK)~OKMX0`&&PegUj-qJy~lr`defxu3tn<S(Q}5xeVudS+09W1
zJXf131Rzkow}Ns$!LZI2C^iB)oP76XM=eJJ5}*78k7qAMhvG?gw}k=V>wI`RBUVp5
z8J@GFpQ^jM!12+uH9T;f6xg_2o=*l*cU6%l>AK(%Cy@ot5J(yi%-7jzw&XcKea>m7
z@3((OXV7ak)s1F`Js~AL$8Tp+&?;B1i6|Z)R*r)Eb^d)kgICMFBp}+t(?r^@3!3+;
zIrb)<^x;>+gXY;p?pX)Y{2BFdUglu{*=$YIh$n&8fu?z~C&$lXjA<Go*)#lJCGjfI
zG(Y5Fz*v%hjjobvkUTRbjPg{@`a%i(3ow5*-cQ6ra1GC$9tfZhr~rRttb=3Dh7%@$
zrJ{*k)O4lL5$M72>vE7WKXE2(vmw-@0P^2%HQMvWJXNFX%{*h`{E-iFdhbXnf7Tiu
z$gA3e(23^{{RCc;zL@eZZ9$~uwNzMA6<LF)QyFSAZ~C?ukiBrMw4LPa!A!j1cqf0f
zbSr~%oWBQmV0{Af5YIT>S8dN=%r=};Dh80mpT;k)+~ZO#wO;Szxu;GBGmn#AwK0;k
zF4xSHlDcW#_%5n$t8^bJ#8`{N*37t%R(vh@T)cYUkyzLl4Hj3Oku0q&+mG}k?D-B1
zW#(-tkRxu28YO+&mTS7)FF7jwv7LV-OyZ(m(Q?Dchw~=sOAtnC=ZG79=ZZc}_GCrU
z4|j5jY;OV#aV-l--46367K$dLw3z!2hd8TUTnuoGvp`&2pk*S6W&MBhUM0r}Za!h$
ziu`oD9^uaLn)<N@l$7CsOJM$)rOI2~wed<pgf+LF_bk975c$=H9xuBgdi;OEquArV
zWz{MlfV|VcA1DH;H9o&i`)2tZ!`*#Rmx@<wK{m2Kh}bKL@Y0j%_$cR`?8y=k&#$6c
zqkPqaqGt6vKrRX&(Z1@HfY;Y>|L^3}RvCEbDe1re*suBn(3XGsN7v$=SP<aaTV@f@
z%?gj(rDfR_)XgO*hsV_e*PKOOiaQU(@P|jyeosvP`0e2~9-J<R<1`EQ<|TZWQu}S|
n$&>yY<_FePu98voQcK1kWmZ-b^{S?i00000NkvXXu0mjf#V0qZ

delta 1119
zcmV-l1fcug3ET;gHUj_v0FgO43i$Z=@E91BQ=k8ld?kM-Nkl<ZScR?F3zM555CGsT
z@zlwp(cu06zuJB95R3|KnYng))z4i7c9X}W9C-N6KMlO`0N_7*0Iye*htq|}S{rxe
ziPp^7lN(fP<VtUz=S*wma&MmBZ`f;p!I2kkB2Bocy`Vq6k(LD>mj;EW9>DCmq`hD~
z^EeLrN$-EM?~^xx*MxiBb4V0g;?iXGqloGagJ|;rIrrTYjf0!`<{028B8um^VaSsG
z$|Vgk+lmB|2<%0Uz#TUny_hNDx-R+KXK*0T?zrf|ScZo@CLOG;3l=Y!!4Z^u^M57}
zwv7AGn7)n!2+GZtR{#cX+_seM=i|0*QxMWPdJKQ6H_!UM;3WqXJ!ebY=A0AHW=A3L
zTxC-TK%jbW1?7B#ZJ#aui$M;j+<nDS%aMS@CqKdC*-O!(c#_?1VW3Ey4^L;r>WL@A
zb9VAmbypWSK6<u>2ab~h8<)%T$sp>ks?sD~7d+x5vcMSvN#lX#Iy=plJm;s+InDI_
z*64o>dab3p(af+Xq=e`A?aT^V<?1yN#pA=uQE<P`zmI3|TDg}5L|b^CN&9s{^IkK@
z-mH_p{YrSyJ-f&~+d!H>qaH5nvTY!nt?N4RB+xd{bWir=_*soHT}LE)hTp3s-UOQN
zhdc}zOY*1DRniQSXXb=ap2}HYD1m<grp15ziC74(<GIrV0rUY4;E#-baLn0o!UV8Z
zG?9y%t`s@~Js5sn4>IN_&V+5Yg?bb~{=Zv|_PjAq)#!S&ESNZd<U^d^J5tJ@wMGZ>
zs`elZ;`u{AftRE&ro2mg5Gi>*6_!**_TcGMhT6=Vz8?i-FB~iVAUS)m5HC312|a(^
z%HR^`@4+3|n7}f`GfwwaKQb7z4d;}K0VMIK^NXwWxD-pR*ZX+xsguFN<D_?Oj3lkg
zweX~*X003FMb&MW?jwa5YjN0`1^3a4ujQVL*XTPE3&*0t;;u82rB!76k$!|d-+`gb
zybT3%!mOxK(x+{?rpx`3qrxBCIl_M=F6tF6H;jBZXGvdzFi|^4+~hk~^l7puE0TV=
zlS^cO6JUsIT|w%0m^ZOdG#RzU+;=#{S?%ItfK!|W;^G3W6G1HN|C0AAIYu!1gmEkK
z)9rqQJHu-lrxs9BhA&(K%g-!L-tMl<s|6AETt4qbfK?#!s|`I~aYOX@gGYb0$9>DL
zRsI6<PTxLI1yXB#ex3Hs@;QdP`>HM#uhxQWWPcE`R}tZ*C)4p!&N<nWH6Wf}MYBfv
zss~lg>UDrz6h5MD>eYbP*Kq&u<kMCic;_kUzyCO{`Y)iZ|MHKn#XGSgz`eIFBA%NK
z9=A*DdMK#bB`Al-)dTmOUW!8p55w?>N7a5$O!@fyaGSoIE?>uK7VIr+_%5aO+t!mO
l{Wr`HY^hu|qw1yBj6c9cS26bNh?M{U002ovPDHLkV1k{3Ky?5B

diff --git a/public/images/pokemon/exp/658-ash.png b/public/images/pokemon/exp/658-ash.png
index 6bb84f3e4fd622689fb60ec1c06599aad87670a7..ced4cbcec716965af329c30e41f496414ccc6716 100644
GIT binary patch
delta 2351
zcmYk2dpy&P7sp*zy2z7DAuUBHml2Q1vsRQSx5qDcZHO6JQ(}faecN(-atq-_7IIl4
zWNtAmdq$eMq-5CG!>}^;ESHe{*01M}-}&Rb&*!|(Ij?h0nesE`hpw{A%gdQ=$3dp+
zhto3gI)M1{MQb-)A^+N+S*4aLDVJ>&G$J0ZZ~K8eQIDBB7rgdkJ=`ho<F@a!#4YkK
z=mGMAtr^Y4Yqt#I?WdW8^{`pap4**zuQ<`T`U0MIZD?@x5pJsQYQYWcM_%t0Cp3nt
z`(Qi<r`;R{Un~D306WK9nfb6XeJu7}7DEVy0^XspHAP_#s|m66wD4Oox1_A|st^X9
z_DCKp5K_5}sJBMtW!q_U=vrP5a&A?t+Vgar-)VzJgUSZ>KgB{F=zuV1>rivv-nbXW
z*F#QMr?+P{J%FJF*aJ__>GN~8u3*Dh2#9R`QQtZDw~OyP$Rc9tQ{jz2iC=vvV;C1;
zf<X@J+<DTkmaJAM)TUOt9&1w-daU#{VHi<;y1R3vWBxdc1iV%i5jZy=f@eS<%sy7n
z1-}y=o~EB%!qH5!FxLl{n*@j1QXnMu=egmR?UO7a)(mT#lsP_`_%UW*+7*Y;iIK+j
zMFz>Z!JJJtiwi4A<UF_bAvUC<0KO_uy_8aVefh?f>D7P*aa7aSWp;dSg)pn&whzIZ
z4WqWW^5|#49QFczw9&Ju$hk16`S8}ev=x`G6!3wko#q}SwoU%#o<#F1{mr5B%}<l@
zs^|2ro{zJhDeu#PxW%bi9tm{_?e{%}0F)8mp6!QEPkb7vGeI>CVjDdH;_~X+$(YAU
zc_#W}1tEtt5W{K}J@jOQvXw*ai(gViN|zEk!y=fEs%uJmE7Rb}zDu!NuDIQ$HiZkh
zkX8++Rq{(pL?k8~lLzdVOh1hCvCru6uM88exJ*-hVk*P-`6fyBkux(g&o57g0bV3a
zu*(Z}U;&3kcW|l&OfdW}E8p;-BB~2ndHB@LJ(IIMoeIyw^y3-EhJLoLh0bFpuZ)r(
z{CV{f^0P>3*uWXZ(j&Pmb#EIvqARf$zZkP>u)gm}?ySH*{WhA;yxdd!;&BMnA@8qf
zShEMINm&O4>5qS@85TV*s&2(~T(}*)+?eUjudyX@EW3enks(~s#X<u?hP=BqRB*Gs
zK>J?DP#u<&F)gT|-`TLAGM&DTGlCy38nS!qqqthVbvx`>KgNxi!i$RZxDMht;$*D?
zV-j8cfCG$w=4Y#LFeGY(Ynt-Z#iGjjEkl&JF?*69fs=!w)6~d+4H55|W~yYRFOSr;
z)cHDi1AkQpwlYK;0#@%dvVt#?!3Ws1h1jY_mirfx#_QjI8Z#$qT_GWT<(GcP-6fA|
zb$yv}+CSE&(;913i_V*QRkbGWDn#1*(J;(Q<gNq}zBACK=iq@OLuX*WeSLD?&VH`u
zKYNc622Qujo=tg$#rF6usXUHRd#Un78K+QH3h3zQrSpvv=47B0&X=IrStuOQi($@U
zJW?m?2M+f4_fi~ADDoQpZk-1kcbsr-{CrB0$ChG6L%APPp>}pwFjZ^bz6m8k)US6-
z7OJUSvnsx*5C*t$gW)X0=R+@IgK#ANP)0R$t<xjn_osHz^D42MJr4)6RaFsW%tfHb
zpyDFRa~p}q1$-4RJfJ9jkKL20&^@r%_^2_2Y65zZXz^T0ct1T}WP`aNuJPo1>@Yaf
zLK!ThJnEo+71>07*xVXH=ltQLXX}A`y)5sd6AI)~AtpyjrSfk#VbuG#o+FH3SKajH
z?U*^qpAdUr+%DB~CcTOH&Rm({#{+gfzxP!1eMzep$%qSmBlOt@+F}GdJMX{~9Ti90
zGe{?H1C)_*bpann5bi$nHeAnzpU@MZquqeG)Ajfv>WNAtc08rjE9ORWEuAv0*Nyf|
zQhoRlcBTIQ-4{v=i8IJV3uj|(Xi@EEP}~RR#^0a~aebF|$4hpq2pZEq0PLI49o<*3
z1)*MO2CTcXWn<|1YJ!xKhMwQ9;q=j~OwsY)I~nSBnxVS|JJKziBc2(Zqn@NpCiIAd
zwym3MGisiNhbz)U=C$Z4W%LBQ+VhU#Aqe%UX7~BaKzv7;DCjuY5W2a#)E92{sUUGu
z+DqQVh`OuwQEv)+I5;B&SpLlIMh}ZVAQeceTqUq2v@|@ptU-%~n%L7wjT1S%zJpET
zF$Q^EzFIT<LW`6(^=9vlZ=!?qG#+^NyA(rTg}AiI$-nFE7ld1ntmJ`nIrWzUCKuKQ
zK$Vej+^NVZQL-yzdv_Vvqkr#vOx`3sQjUGX${(i~fB$9<9ylv(?VZuJZ=Dg9DJhey
zb4@&soGrk$Qxodk1%K1CBQnzumM<LgOtqp^7S5FJa6C%dZT#5TYLwa6LXU1^fBjf%
zi|S%lXiV6+5k3zdtuW<UfWMseTMSqD`%Q3NxK*}nDtakW{;r&~ZBuk>zV)`M;CrW3
zUdFe)Hpg$Bmw~Zdg)}FoU6z1$Zw=+&=13c@!Ov(|nM`e|k3y79MvOFj%P$17#F=<2
z6aOvs{77ZEuK(1AS^d0jtE0cv8mf92DI?o*PIdw*BPYQ)vi<=)2-w-g1pRXB2ZF$D
zwD0ohyk09T;m6Eu_XVv@vpTqLNb#l_4S?%<RSy;s7EG;W$BU#FC7388ESkQS`5&Yu
zO0l>N6`4PEtZqv^u(j>Yys5YB==W4<((Ef#R6b1_qA3`DMLJDpg7)58e{(P0*ihW+
zNZUUp&Xfihh1{8+qUB~33kL7yWt<lb((*En{_B6{fkCfwJm`|#&Q?6gA!$bw9^}+a
z^z>TaRiJQlgxjKTFNrWZl!szPOYp%_vEr}bF~bH)(Z3BlTks&qq@T?{Vh)n{f8hR9
z5_Iq3YoE9Jb;MY+_xZGx>@^ti$E9!>5h$1aseW8asF{`uOcN^xf#nWXJ<6cX|Jb_t
zvt^y+%`^$TO7I}x9>NaEn-M((Mg?Dc^8Iap>BWJ2A8-2;j5V#_y(SoGS`U}JT!JVY
z()ijUi1Myg4pOGOpJ_)Mja%QPMs1sFAP7ciTuDM|$wEW@iFvk2_5Mbc!o<jHc`1oq
MwspQ(W8+W!FK)QLu>b%7

delta 2347
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
D;d-~P

diff --git a/public/images/pokemon/shiny/658-ash.png b/public/images/pokemon/shiny/658-ash.png
index f5de608708eb8b505f1e837a4a697ad7e2c3f4cd..b25693fd24e91b07e97e897fe743ab36853a84b1 100644
GIT binary patch
delta 690
zcmV;j0!{tj3Ev5jbqe(K^zaxM=HIC{k$*S^0;V8X=aIZ3f4JYPJe*EE*6O%3Pqb>z
z9NeH<C6{~iJSSQ$mwNO3c)(Wsf+Nr0M4E6xyTk49Mp_oQUm6sidH}QIqIQSj$m2NZ
z6`$qp7QG&vCfxlqheV+vE>6~U5K+Cp7j5n#<=%Uuac~pgd<me4D4yf`K1ud17d6CW
zD-uW|uopN2lU)G^f9txWPoKe_JhS0~2SXkn@|bk6wl0`GU<L<J?!mu|9*hb1q%pl6
zI}ntc4X*(7+%S$Y+vn51UM~e9j=jgAdh@K$3+_^&=zYe>y{xt3nWPi~&s8#o00gS{
zP*Ca<jN5F1Vk3~l$#-8?YB>^+_~hk1p1l|yiYM89JQx684AzCGGh(#j$#9&R+>`GC
zFkA6((Y3O8jj1`^XlB?GQo^(RbY=z9`cW#1$HmH0aKF|)4@wrk;_ea<ZQ*$)?bmwE
zdDR?yvrhUrD%Z80=di5<Y5p4Za9Nje)Xmm)op^}sR)I~|vM1$dZIgNe905m@mjXxv
z%Yu{P0zv{@!jmNfNdc*oZvzz!lzxOg*Ma#g-2pjalaK=(ElkwT5jVNc6(M@EBI(7Q
zTqJKF0`zgME9J;7wD;IT(PWgCQrF=SXS9n80Zx<I0~`XFYLoW^E`R=dLJ>%<@$q%q
zH_PW3?(U1aR6JV?vXNaOVy_^=Q%|PjshqX4Crdy)zKUjz@>LJ=s`y2Kd?-9cd#P6f
zo?pZLzm-p0W#A`IN%#H7e$~GLP5GC9bS-`o3j*AF>muT@S>bWJw641YHMs=!16s*9
zkm&X~;LbxoT=6K{?>mvn-##sF)0^t@b{uBG-m?1dQfj|#J$R=-!`#4{ldEJDJ=Bu%
Y4<Q;{`&r-D5C8xG07*qoM6N<$g1ux_4FCWD

delta 690
zcmV;j0!{tj3Ev5jbqe_S`0yAQ9y>eqk$*S^f~Fu?=8?Q2e|S8qJRDCv*6O%3Pqb>z
z9NeH<C6{~CG$mRsmwMCme8N`yf+Nr0M4E6xd%*4RMp_oQUm6sidH|E-qV|B{$m2NZ
z6`$qp7QG&vCfwsQheV+vE>6~U5K+Cp7j5bx<=%Uuad0Ewd<me4D4yf`K1ud17d6CW
zD-uW|uopN2lU)G^f6FqbPoKe_JhS0~2SXkn@)&inw#=A4U<L<J?#aK59^4b|MPqzB
zb|5G>8D0VCx#50~*}h(OT~`Gmj=jgAdefxO3m#IS=zZ>yTdlR?nWPi~&s8#o00gS{
zR8Z;@+_%{R#YP~9lkdK))N&*s@yW}3JbN)Z6i>4IcrXC04AzCGGh(#j$#9$*-IMPD
zFkAU_(Y3O8jj1`^XlB?GQo^(RbS4GU`cW#1$HmH0aKF|)4@wrk;vNzZZQ*Gm?bmwE
zdDR?ylTP}&D%Z80=di5<Y5p4Za9-wh)y>v*op^}sR)I~|vM1$dX_I;a905g>mjXxv
z^Nf?>0zv|u!;>WgNdcvkZvzz!l756e*Ma#g-2pjblaK=(EsWI85jVQd6(M@EBI(7Q
zTqJKF0`ze$3+2cywD;IT(PWgCQrF=SXS9n80gjW|0~`VvYm@f_E`Pqhpa`Va`1m^Q
zo8@y1clSkIDxR$c*~qRCu~!h`sVCF%QqEf0lO-S?Uq!P<`KkwbRs14AJ``S}t?HG4
z=htxmZ{^cg8TiRl(tZE2U-fT5Q~u>2U5lT@f&jPPGK+X@R(RYlEz9meO)f$GfL8Ji
zB)WYLxbx5tS3HXLdpl(Ew@-`P_@=tN9fw)4H!uFXl-h4w58mm|FgLK~<SH3O54B|c
Y1DqgTCxw0n761SM07*qoM6N<$g2fF_2><{9

diff --git a/public/images/pokemon/variant/658-ash.json b/public/images/pokemon/variant/658-ash.json
index 29b5bd2560b..1845b2b1bea 100644
--- a/public/images/pokemon/variant/658-ash.json
+++ b/public/images/pokemon/variant/658-ash.json
@@ -4,6 +4,7 @@
 		"3f4447": "466698",
 		"de3431": "3fca9f",
 		"f8f8f8": "a1e9f0",
+		"f4f4f4": "d7eff4",
 		"7b282e": "0e3e81",
 		"6b1d1d": "206d74",
 		"4ebdd9": "41a7b0",
@@ -11,7 +12,7 @@
 		"bfbfbf": "8cc7d4",
 		"ffb2bf": "b7e9ff",
 		"bf4c60": "4386df",
-		"fff0a6": "271f4c",
+		"fff0a6": "208698",
 		"3e7acc": "6b4592",
 		"18335c": "170738",
 		"f2798d": "8dcfff",
@@ -25,6 +26,7 @@
 		"3f4447": "466698",
 		"de3431": "9ceec6",
 		"f8f8f8": "89d2b8",
+		"f4f4f4": "d7eff4",
 		"7b282e": "152a5c",
 		"6b1d1d": "356e8d",
 		"4ebdd9": "2f6e74",
diff --git a/public/images/pokemon/variant/exp/658-ash.json b/public/images/pokemon/variant/exp/658-ash.json
index 96b60b02adf..79cad7ea42d 100644
--- a/public/images/pokemon/variant/exp/658-ash.json
+++ b/public/images/pokemon/variant/exp/658-ash.json
@@ -4,6 +4,7 @@
 		"3f4447": "466698",
 		"de3431": "3fca9f",
 		"f8f8f8": "a1e9f0",
+		"f4f4f4": "d7effa",
 		"7b282e": "0e3e81",
 		"6b1d1d": "206d74",
 		"4ebdd9": "41a7b0",
@@ -25,6 +26,7 @@
 		"3f4447": "466698",
 		"de3431": "9ceec6",
 		"f8f8f8": "89d2b8",
+		"f4f4f4": "d7effa",
 		"7b282e": "152a5c",
 		"6b1d1d": "356e8d",
 		"4ebdd9": "2f6e74",