Revert "Revert "Merge branch 'pr/151'""

This reverts commit ce23369b0b.
2020-12-04 23:52:03 +01:00
parent ce23369b0b
commit 76cdabd2cb
315 changed files with 398 additions and 70 deletions
--- a/AdjusterMain.py
+++ b/AdjusterMain.py
@@ -27,7 +27,7 @@ def adjust(args):
    palettes_options['hud']=args.hud_palettes
    palettes_options['sword']=args.sword_palettes
    palettes_options['shield']=args.shield_palettes
-    palettes_options['link']=args.link_palettes
+    # palettes_options['link']=args.link_palettesvera
    
    apply_rom_settings(rom, args.heartbeep, args.heartcolor, args.quickswap, args.fastmenu, args.disablemusic,
                       args.sprite, palettes_options)