diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 0f75447a500..5a7b2246b01 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -1016,6 +1016,7 @@ export default class BattleScene extends SceneBase {
 			case Species.ZARUDE:
 			case Species.SQUAWKABILLY:
 			case Species.TATSUGIRI:
+			case Species.GIMMIGHOUL:
 			case Species.PALDEA_TAUROS:
 				return Utils.randSeedInt(species.forms.length);
 			case Species.GRENINJA:
diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 7511b0e4162..80f62ee223e 100644
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@@ -1608,7 +1608,8 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.FROSMOTH, 1, null, new SpeciesFriendshipEvolutionCondition(90, p => p.scene.arena.getTimeOfDay() === TimeOfDay.DUSK || p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT), SpeciesWildEvolutionDelay.MEDIUM)
   ],
   [Species.GIMMIGHOUL]: [
-    new SpeciesEvolution(Species.GHOLDENGO, 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG)
+    new SpeciesFormEvolution(Species.GHOLDENGO, '', '', 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG),
+    new SpeciesFormEvolution(Species.GHOLDENGO, 'roaming', '', 1, null, new SpeciesFriendshipEvolutionCondition(70), SpeciesWildEvolutionDelay.VERY_LONG)
   ]
 };