Gen 7: Fix crashing issue with Limit Pokemon and Force Change evolutions

Ajarmar · Mar 18, 2021 · 0823b70 · 0823b70
1 parent cddeeee
commit 0823b70
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/com/dabomstew/pkrandom/romhandlers/AbstractRomHandler.java b/src/com/dabomstew/pkrandom/romhandlers/AbstractRomHandler.java
@@ -4223,7 +4223,11 @@ public void randomizeEvolutions(boolean similarStrength, boolean sameType, boole
                 for (Evolution ev : pk.evolutionsFrom) {
                     oldEvoPairs.add(new EvolutionPair(ev.from, ev.to));
                     if (generationOfPokemon() >= 7 && ev.from.number == 790) { // Special case for Cosmoem to add Lunala/Solgaleo since we remove the split evo
-                        oldEvoPairs.add(new EvolutionPair(ev.from, pokemonPool.get(ev.from.number + (ev.to.number % 791))));
+                        int oppositeVersionLegendaryNumber = ev.to.number == 791 ? 792 : 791;
+                        Pokemon toPkmn = findPokemonInPoolWithSpeciesID(pokemonPool, oppositeVersionLegendaryNumber);
+                        if (toPkmn != null) {
+                            oldEvoPairs.add(new EvolutionPair(ev.from, toPkmn));
+                        }
                     }
                 }
             }