diff --git a/public/fonts/pkmnems.ttf b/public/fonts/pkmnems.ttf
index b0b50d0f10f..2cc7bfeee62 100644
Binary files a/public/fonts/pkmnems.ttf and b/public/fonts/pkmnems.ttf differ
diff --git a/public/fonts/pokemon-emerald-pro.ttf b/public/fonts/pokemon-emerald-pro.ttf
index 84e49ebbc40..e4ee49dbff3 100644
Binary files a/public/fonts/pokemon-emerald-pro.ttf and b/public/fonts/pokemon-emerald-pro.ttf differ
diff --git a/public/images/pokemon/658-ash.png b/public/images/pokemon/658-ash.png
index a122df859bd..fa6ce5cb165 100644
Binary files a/public/images/pokemon/658-ash.png and b/public/images/pokemon/658-ash.png differ
diff --git a/public/images/pokemon/exp/658-ash.png b/public/images/pokemon/exp/658-ash.png
index 6bb84f3e4fd..ced4cbcec71 100644
Binary files a/public/images/pokemon/exp/658-ash.png and b/public/images/pokemon/exp/658-ash.png differ
diff --git a/public/images/pokemon/shiny/658-ash.png b/public/images/pokemon/shiny/658-ash.png
index f5de608708e..b25693fd24e 100644
Binary files a/public/images/pokemon/shiny/658-ash.png and b/public/images/pokemon/shiny/658-ash.png differ
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",
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);