Merge pull request #1590 from 2dos/nsak-got-screwed

I'm sorry NSAK lovers
2dos · Aug 28, 2023 · 566f277 · 566f277
2 parents df29504 + b454383
commit 566f277
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/base-hack/src/fixes/guardCatch.c b/base-hack/src/fixes/guardCatch.c
@@ -118,7 +118,7 @@ void catchWarpHandle(void) {
 
 int inRabbitRace(void) {
     if (CurrentMap == MAP_FUNGI) {
-        return *(int*)(0x807FBB64) | 4; // In Rabbit Race
+        return *(int*)(0x807FBB64) & 4; // In Rabbit Race
     }
     return 0;
 }

diff --git a/static/patches/pointer_addresses.json b/static/patches/pointer_addresses.json
diff --git a/static/patches/shrink-dk64.bps b/static/patches/shrink-dk64.bps
diff --git a/static/presets/nostyle_allkeys.json b/static/presets/nostyle_allkeys.json
@@ -1,5 +1,5 @@
 {
     "name":"No Style, All Keys",
     "description":"Alternative consistent settings focused on getting all of the keys with seed completion time under 3 hours for experienced players.",
-    "settings_string": "bKsnPMYQQSwWBuWDogPQ+qBoRDIhKlsa58B+I0eu0uXxCnTE2nBAOgVBkFup6/AkgGTQMgusllgoC6AEGAnUBA4G7AMIBHcCBIK8AUKBnkDBYO9AcMCFCGlD2AFIhRUM5EpFyRaRSUcEKiLAImIoAr1rjkbtV/vsigeAM2oGLEkWABMYABMaAA8cAA8eAAsgAAsiAAckAAcmAAcoAAcRKcuUOS4VLGEvhhKmY2mMtFkWlcsCtDlsNCcWCowEwYEY0HFNIpMiMhAA6AKoA"
+    "settings_string": "bKEGiRorPNXm8rJzzGEDEsFRIeh9UDQiGRCVLY1z4D8Ro9dpcviFmpyxNpwQDoFQZBbqev2JIBk0DILrJZYKAugBBgJ1AQOBuwDCAR3AgSCvAFCgZ5AwWDvQHDAhQhqM9vpSoUVDOVKZc2i3gZwdHqLcEKuLB4nAoCL1rjkbtV/vsigeAM2oGLEkWABMYABMaAA8cAA8eAAsgAAsiAAckAAcmAAcoAAcRKcuUOS4VLGEvoE5IMMJU2mMtFkWlcsCtDlsNCcWCowEwYEYkHFNIpMiMOgCqAA"
 }