Merge branch 'Customizer' into Synthesis

# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
This commit is contained in:
aerinon
2022-08-11 16:06:50 -06:00
16 changed files with 69 additions and 34 deletions

View File

@@ -137,6 +137,7 @@
"randomizer.entrance.openpyramid": "Pre-open Pyramid Hole",
"randomizer.entrance.shuffleganon": "Include Ganon's Tower and Pyramid Hole in shuffle pool",
"randomizer.entrance.shufflelinks": "Include Link's House in the shuffle pool",
"randomizer.entrance.shuffletavern": "Include the back of the tavern in the entrance shuffle pool",
"randomizer.entrance.overworld_map": "Overworld Map",
"randomizer.entrance.overworld_map.default": "Default (no location display)",
"randomizer.entrance.overworld_map.compass": "Compass indicates location",