Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern

# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct
This commit is contained in:
aerinon
2022-08-11 15:37:19 -06:00
16 changed files with 66 additions and 30 deletions

View File

@@ -315,6 +315,9 @@
"shufflelinks": [
"Include Link's House in the entrance shuffle pool. (default: %(default)s)"
],
"shuffletavern": [
"Include the back of the tavern in the entrance shuffle pool. (default: %(default)s)"
],
"overworld_map": [
"Control if and how the overworld map indicators show the locations of dungeons (default: %(default)s)"
],