Merge remote-tracking branch 'upstream/DoorDevUnstable' into OverworldShuffleDev

This commit is contained in:
codemann8
2021-05-01 12:57:41 -05:00
10 changed files with 162 additions and 40 deletions

2
CLI.py
View File

@@ -187,7 +187,7 @@ def parse_settings():
"quickswap": False,
"heartcolor": "red",
"heartbeep": "normal",
"sprite": os.path.join(".", "data", "sprites", "official", "001.link.1.zspr"),
"sprite": None,
"fastmenu": "normal",
"ow_palettes": "default",
"uw_palettes": "default",