1 files changed, 4 insertions, 6 deletions

diff --git a/src/com/sneed/pkrandom/Settings.java b/src/com/sneed/pkrandom/Settings.java
index 6088348..7bbff05 100644
--- a/src/com/sneed/pkrandom/Settings.java
+++ b/src/com/sneed/pkrandom/Settings.java
@@ -424,8 +424,7 @@ public class Settings {
         // 16 wild pokemon 2

         out.write(makeByteSelected(useMinimumCatchRate, blockWildLegendaries,

                 wildPokemonRestrictionMod == WildPokemonRestrictionMod.SIMILAR_STRENGTH, randomizeWildPokemonHeldItems,

-                banBadRandomWildPokemonHeldItems, false, false, balanceShakingGrass)

-                | ((minimumCatchRateLevel - 1) << 5));

+                banBadRandomWildPokemonHeldItems, false, false, balanceShakingGrass));

 

         // 17 static pokemon

         out.write(makeByteSelected(staticPokemonMod == StaticPokemonMod.UNCHANGED,

@@ -580,8 +579,8 @@ public class Settings {
                 pickupItemsMod == PickupItemsMod.UNCHANGED, banBadRandomPickupItems,

                 banIrregularAltFormes));

 

-        // 50 elite four unique pokemon (3 bits)

-        out.write(eliteFourUniquePokemonNumber);

+        // 50 elite four unique pokemon (3 bits) + catch rate level (3 bits)

+        out.write(eliteFourUniquePokemonNumber | ((minimumCatchRateLevel - 1) << 3));

 

         try {

             byte[] romName = this.romName.getBytes("US-ASCII");

@@ -701,8 +700,6 @@ public class Settings {
         settings.setBlockWildLegendaries(restoreState(data[16], 1));

         settings.setRandomizeWildPokemonHeldItems(restoreState(data[16], 3));

         settings.setBanBadRandomWildPokemonHeldItems(restoreState(data[16], 4));

-

-        settings.setMinimumCatchRateLevel(((data[16] & 0x60) >> 5) + 1);

         settings.setBalanceShakingGrass(restoreState(data[16], 7));

 

         settings.setStaticPokemonMod(restoreEnum(StaticPokemonMod.class, data[17], 0, // UNCHANGED

@@ -872,6 +869,7 @@ public class Settings {
         settings.setBanIrregularAltFormes(restoreState(data[49], 3));

 

         settings.setEliteFourUniquePokemonNumber(data[50] & 0x7);

+        settings.setMinimumCatchRateLevel(((data[50] & 0x38) >> 3) + 1);

 

         int romNameLength = data[LENGTH_OF_SETTINGS_DATA] & 0xFF;

         String romName = new String(data, LENGTH_OF_SETTINGS_DATA + 1, romNameLength, "US-ASCII");