Merge remote-tracking branch 'remotes/multi/multiworld_31' into Dev

This commit is contained in:
compiling
2020-01-04 20:07:29 +11:00
52 changed files with 3306 additions and 1394 deletions

View File

@@ -1,8 +1,9 @@
import os
import re
import time
import logging
from Utils import output_path
from Utils import output_path, parse_names_string
from Rom import LocalRom, Sprite, apply_rom_settings
@@ -26,7 +27,7 @@ def adjust(args):
else:
raise RuntimeError('Provided Rom is not a valid Link to the Past Randomizer Rom. Please provide one for adjusting.')
apply_rom_settings(rom, args.heartbeep, args.heartcolor, args.quickswap, args.fastmenu, args.disablemusic, sprite)
apply_rom_settings(rom, args.heartbeep, args.heartcolor, args.quickswap, args.fastmenu, args.disablemusic, sprite, parse_names_string(args.names))
rom.write_to_file(output_path('%s.sfc' % outfilebase))