From 7e9717d987ba76e0db8b5eeccc5a8e14c429747c Mon Sep 17 00:00:00 2001 From: Ajarmar Date: Fri, 10 Feb 2023 19:25:08 +0100 Subject: Fix settings failing to load in some cases when they were created in a later generation --- src/com/sneed/pkrandom/Settings.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 romPokemon = rh.getPokemonInclFormes(); + List romPokemon; + if (rh.hasStarterAltFormes()) { + romPokemon = rh.getPokemonInclFormes(); + } else { + romPokemon = rh.getPokemon(); + } List romStarters = rh.getStarters(); for (int starter = 0; starter < 3; starter++) { if (this.customStarters[starter] < 0 || this.customStarters[starter] >= romPokemon.size()) { -- cgit v1.2.3