summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDabomstew <dbs.stew@gmail.com>2016-04-27 17:10:17 +1200
committerDabomstew <dbs.stew@gmail.com>2016-04-27 17:10:17 +1200
commit0e62c35b817d4b189410790fdb758cae42e509fc (patch)
tree11ecf4d382c2ab7dd0163696746c784d40611021
parent572e9639dbf974101b63b9e2c2a3c8d26f8351fd (diff)
Fix an issue where settings files inverted the "Block wild legendaries"
checkbox. Also bumped bundled settings files to 172.
-rwxr-xr-xsettings/balanced.rnqs2
-rwxr-xr-xsettings/classic.rnqs2
-rwxr-xr-xsettings/randomizer_race.rnqs2
-rwxr-xr-xsettings/super_randomizer_race.rnqs2
-rwxr-xr-xsettings/trainers_only.rnqs2
-rw-r--r--src/com/dabomstew/pkrandom/Settings.java2
-rw-r--r--src/com/dabomstew/pkrandom/SettingsUpdater.java3
7 files changed, 9 insertions, 6 deletions
diff --git a/settings/balanced.rnqs b/settings/balanced.rnqs
index 7486858..2f2dcba 100755
--- a/settings/balanced.rnqs
+++ b/settings/balanced.rnqs
@@ -1 +1 @@
-«`AQgUAQjuAfEB9AEiAMceJAACFAAAFAACBAABAAAAAAAAAgATUG9rZW1vbiBCbGFjayAyIChVKfejWmdlJ30dqEOr7mWVPPI= \ No newline at end of file
+¬TAQgUAQjuAfEB9AEiAMceJAACFAAAFAACBAABAAAAAAAAAgATUG9rZW1vbiBCbGFjayAyIChVKfejWmfrX9/R \ No newline at end of file
diff --git a/settings/classic.rnqs b/settings/classic.rnqs
index f269a52..efd3f39 100755
--- a/settings/classic.rnqs
+++ b/settings/classic.rnqs
@@ -1 +1 @@
-«`AQgEAQjuAfEB9AEEACAeJAACFAAAFABABAABAAAAAAAAAgATUG9rZW1vbiBCbGFjayAyIChVKaGk0RVlJ30dqEOr7mWVPPI= \ No newline at end of file
+¬TAQgEAQjuAfEB9AEEACQeJAACFAAAFABABAABAAAAAAAAAgATUG9rZW1vbiBCbGFjayAyIChVKUjRyG7rX9/R \ No newline at end of file
diff --git a/settings/randomizer_race.rnqs b/settings/randomizer_race.rnqs
index b9d0ce1..88fd84a 100755
--- a/settings/randomizer_race.rnqs
+++ b/settings/randomizer_race.rnqs
@@ -1 +1 @@
-«`ORgcATLuAfEB9AERAIYeJBgEKQAAKQA9CQABAAAAAAAAGpgTUG9rZW1vbiBCbGFjayAyIChVKU8yNAVlJ30dqEOr7mWVPPI= \ No newline at end of file
+¬TORgcATLuAfEB9AERAIYeJBgEKQAAKQA9CQABAAAAAAAAGpgTUG9rZW1vbiBCbGFjayAyIChVKU8yNAXrX9/R \ No newline at end of file
diff --git a/settings/super_randomizer_race.rnqs b/settings/super_randomizer_race.rnqs
index 490e959..1733bb9 100755
--- a/settings/super_randomizer_race.rnqs
+++ b/settings/super_randomizer_race.rnqs
@@ -1 +1 @@
-«`ORIaAjLuAfEB9AERAIYeJBgECQAACQA9CR8iAAAAAAAAGpgTUG9rZW1vbiBCbGFjayAyIChVKSfn/yllJ30dqEOr7mWVPPI= \ No newline at end of file
+¬TORIaAjLuAfEB9AERAIYeJBgECQAACQA9CR8iAAAAAAAAGpgTUG9rZW1vbiBCbGFjayAyIChVKSfn/ynrX9/R \ No newline at end of file
diff --git a/settings/trainers_only.rnqs b/settings/trainers_only.rnqs
index b3b2168..6c5edbb 100755
--- a/settings/trainers_only.rnqs
+++ b/settings/trainers_only.rnqs
@@ -1 +1 @@
-«`GAgEAQTuAfEB9AEEAN0eRAABFAAAFABABAABAAAAAAAAAAATUG9rZW1vbiBCbGFjayAyIChVKemmsWxlJ30dqEOr7mWVPPI= \ No newline at end of file
+¬TGAgEAQTuAfEB9AEEAN0eRAABFAAAFABABAABAAAAAAAAAAATUG9rZW1vbiBCbGFjayAyIChVKemmsWzrX9/R \ No newline at end of file
diff --git a/src/com/dabomstew/pkrandom/Settings.java b/src/com/dabomstew/pkrandom/Settings.java
index 2dbd541..e34e374 100644
--- a/src/com/dabomstew/pkrandom/Settings.java
+++ b/src/com/dabomstew/pkrandom/Settings.java
@@ -306,7 +306,7 @@ public class Settings {
// 16 wild pokemon 2
// bugfix 161
- out.write(makeByteSelected(useMinimumCatchRate, !blockWildLegendaries,
+ out.write(makeByteSelected(useMinimumCatchRate, blockWildLegendaries,
wildPokemonRestrictionMod == WildPokemonRestrictionMod.SIMILAR_STRENGTH, randomizeWildPokemonHeldItems,
banBadRandomWildPokemonHeldItems)
| ((minimumCatchRateLevel - 1) << 5));
diff --git a/src/com/dabomstew/pkrandom/SettingsUpdater.java b/src/com/dabomstew/pkrandom/SettingsUpdater.java
index 196cf1a..c796e24 100644
--- a/src/com/dabomstew/pkrandom/SettingsUpdater.java
+++ b/src/com/dabomstew/pkrandom/SettingsUpdater.java
@@ -233,6 +233,9 @@ public class SettingsUpdater {
// 171 to 172: removed separate names files in favor of one unified file
// so two of the trailing checksums are gone
actualDataLength -= 8;
+
+ // fix wild legendaries
+ dataBlock[16] = (byte) (dataBlock[16] ^ (1 << 1));
}
// fix checksum