Merge remote-tracking branch 'origin/OverworldShuffle' into OverworldShuffle

resources/app/gui/randomize/entrando/widgets.json

@@ -12,10 +12,6 @@
         "full",
         "crossed",
         "insanity",
-        "restricted_legacy",
-        "full_legacy",
-        "madness_legacy",
-        "insanity_legacy",
         "dungeonsfull",
         "dungeonssimple"
       ]

resources/app/gui/randomize/gameoptions/widgets.json

@@ -2,7 +2,8 @@
   "checkboxes":   {
     "nobgm":      { "type": "checkbox" },
     "quickswap":  { "type": "checkbox" },
-    "reduce_flashing": { "type": "checkbox" }
+    "reduce_flashing": { "type": "checkbox" },
+    "shuffle_sfx": { "type": "checkbox" }
   },
   "leftRomOptionsFrame": {
     "heartcolor": {

resources/app/gui/randomize/item/widgets.json

@@ -1,7 +1,7 @@
 {
   "checkboxes": {
     "retro": { "type": "checkbox" },
-    "bomblogic": { "type": "checkbox" },    
+    "bombbag": { "type": "checkbox" },    
     "shopsanity": { "type": "checkbox" },
     "hints": {
       "type": "checkbox"

resources/app/gui/randomize/overworld/widgets.json

@@ -9,15 +9,21 @@
         "full"
       ]
     },
-    "overworldswap": {
+    "crossed": {
       "type": "selectbox",
-      "default": "mixed",
+      "default": "vanilla",
       "options": [
-        "vanilla",
-        "mixed",
-        "crossed"
+        "none",
+        "polar",
+        "grouped",
+        "limited",
+        "chaos"
       ]
     },
+    "mixed": {
+      "type": "checkbox",
+      "default": true
+    },
     "overworldflute": {
       "type": "selectbox",
       "default": "vanilla",