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

5
CLI.py
View File

@@ -119,8 +119,8 @@ def parse_cli(argv, no_defaults=False):
'mapshuffle', 'compassshuffle', 'keyshuffle', 'bigkeyshuffle', 'startinventory',
'usestartinventory', 'bombbag', 'overworld_map', 'restrict_boss_items',
'triforce_pool_min', 'triforce_pool_max', 'triforce_goal_min', 'triforce_goal_max',
'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'pseudoboots',
'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
'triforce_min_difference', 'triforce_goal', 'triforce_pool', 'shufflelinks', 'shuffletavern',
'pseudoboots', 'retro', 'accessibility', 'hints', 'beemizer', 'experimental', 'dungeon_counters',
'shufflebosses', 'shuffleenemies', 'enemy_health', 'enemy_damage', 'shufflepots',
'ow_palettes', 'uw_palettes', 'sprite', 'disablemusic', 'quickswap', 'fastmenu', 'heartcolor',
'heartbeep', 'remote_items', 'shopsanity', 'dropshuffle', 'pottery', 'keydropshuffle',
@@ -171,6 +171,7 @@ def parse_settings():
"shuffleganon": True,
"shuffle": "vanilla",
"shufflelinks": False,
"shuffletavern": False,
"overworld_map": "default",
"pseudoboots": False,