diff --git a/assets b/assets
index 5f3dd3168344..ba7f0606c937 160000
--- a/assets
+++ b/assets
@@ -1 +1 @@
-Subproject commit 5f3dd316834462c609481a50c56b45eb4bd682fa
+Subproject commit ba7f0606c937ac766910c21803db786ca3654ea5
diff --git a/locales b/locales
index 148319a0bede..51f870b3ac87 160000
--- a/locales
+++ b/locales
@@ -1 +1 @@
-Subproject commit 148319a0bede2a571e72bd9969bc9f82d9a0fee5
+Subproject commit 51f870b3ac87d9c73ad1906449c9f3719183fe65
diff --git a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
index 25e480afa582..0d944d319977 100644
--- a/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
+++ b/src/data/mystery-encounters/encounters/the-pokemon-salesman-encounter.ts
@@ -94,7 +94,12 @@ export const ThePokemonSalesmanEncounter: MysteryEncounter = MysteryEncounterBui
       false,
       false,
       false,
-      s => !NON_LEGEND_PARADOX_POKEMON.includes(s.speciesId) && !NON_LEGEND_ULTRA_BEASTS.includes(s.speciesId),
+      s =>
+        !NON_LEGEND_PARADOX_POKEMON.includes(s.speciesId)
+        && !NON_LEGEND_ULTRA_BEASTS.includes(s.speciesId)
+        && Object.keys(speciesStarterCosts) // The event expects the chosen pokemon to be a valid starter,
+          .map(sId => Number.parseInt(sId)) // and will break if a non-starter is chosen
+          .includes(s.speciesId),
     );
 
     let pokemon: PlayerPokemon;