Fix settings failing to load in some cases when they were created in a later generation

1 files changed, 6 insertions, 1 deletions

diff --git a/src/com/sneed/pkrandom/Settings.java b/src/com/sneed/pkrandom/Settings.java
index 9033d21..fb78396 100644
--- a/src/com/sneed/pkrandom/Settings.java
+++ b/src/com/sneed/pkrandom/Settings.java
@@ -913,7 +913,12 @@ public class Settings {
         }

 

         // starters

-        List<Pokemon> romPokemon = rh.getPokemonInclFormes();

+        List<Pokemon> romPokemon;

+        if (rh.hasStarterAltFormes()) {

+            romPokemon = rh.getPokemonInclFormes();

+        } else {

+            romPokemon = rh.getPokemon();

+        }

         List<Pokemon> romStarters = rh.getStarters();

         for (int starter = 0; starter < 3; starter++) {

             if (this.customStarters[starter] < 0 || this.customStarters[starter] >= romPokemon.size()) {