Merge branch 'OriginOverworldShuffle' into OverworldShuffle

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

@@ -9,6 +9,7 @@
         "full",
         "lite",
         "lean",
+        "district",
         "swapped",
         "crossed",
         "insanity",

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

@@ -2,10 +2,11 @@
   "checkboxes":   {
     "nobgm":      { "type": "checkbox" },
     "msu_resume": { "type": "checkbox" },
-    "collection_rate": {"type":  "checkbox"},
     "quickswap":  { "type": "checkbox" },
     "reduce_flashing": { "type": "checkbox" },
-    "shuffle_sfx": { "type": "checkbox" }
+    "shuffle_sfx": { "type": "checkbox" },
+    "shuffle_sfxinstruments": { "type": "checkbox" },
+    "shuffle_songinstruments": { "type": "checkbox" }
   },
   "leftRomOptionsFrame": {
     "heartcolor": {

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

@@ -1,11 +1,11 @@
 {
   "widgets": {
-    "saveonexit": {
+    "settingsonload": {
       "type": "selectbox",
       "options": [
-        "ask",
-        "always",
-        "never"
+        "default",
+        "saved",
+        "lastused"
       ]
     }
   }

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

@@ -2,6 +2,7 @@
   "checkboxes": {
     "hints": { "type": "checkbox" },
     "pseudoboots": { "type": "checkbox" },
+    "collection_rate": {"type":  "checkbox"},
     "race": { "type": "checkbox" }
   },
   "leftItemFrame": {
@@ -20,6 +21,7 @@
         "noglitches",
         "minorglitches",
         "owglitches",
+        "hybridglitches",
         "nologic"
       ]
     },

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

@@ -17,8 +17,7 @@
         "none",
         "grouped",
         "polar",
-        "limited",
-        "chaos"
+        "unrestricted"
       ]
     },
     "mixed": {