Merge branch 'Customizer' into Synthesis

# Conflicts: # BaseClasses.py # Rom.py # data/base2current.bps
2022-08-11 16:06:50 -06:00
parent 1168273e43 5dd9403afd
commit 21456b5c90
16 changed files with 69 additions and 34 deletions
--- a/resources/app/cli/args.json
+++ b/resources/app/cli/args.json
@@ -377,6 +377,10 @@
    "action": "store_true",
    "type": "bool"
  },
+  "shuffletavern": {
+    "action": "store_true",
+    "type": "bool"
+  },
  "overworld_map": {
    "choices": [
      "default",