Merge remote-tracking branch 'origin/DoorDevUnstable' into DoorDevUnstable

This commit is contained in:
aerinon
2021-01-04 13:23:34 -07:00

View File

@@ -222,9 +222,6 @@ def main(args, seed=None, fish=None):
if use_enemizer: if use_enemizer:
base_patch = LocalRom(args.rom) # update base2current.json base_patch = LocalRom(args.rom) # update base2current.json
if use_enemizer:
base_patch = LocalRom(args.rom) # update base2current.json
rom = JsonRom() if args.jsonout or use_enemizer else LocalRom(args.rom) rom = JsonRom() if args.jsonout or use_enemizer else LocalRom(args.rom)
if use_enemizer and (args.enemizercli or not args.jsonout): if use_enemizer and (args.enemizercli or not args.jsonout):