alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove song instruments output file

Browse Source
This commit is contained in:
codemann8
2023-12-12 23:28:34 -06:00
parent f954907af8
commit 1d0045624b
3 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
AdjusterMain.py
View File

@@ -10,7 +10,6 @@ except ImportError:
from Utils import output_path from Utils import output_path
from Rom import LocalRom, apply_rom_settings from Rom import LocalRom, apply_rom_settings
from source.classes.SFX import output_song_data
from source.tools.BPS import bps_read_vlv from source.tools.BPS import bps_read_vlv
@@ -39,9 +38,6 @@ def adjust(args):
output_path.cached_path = args.outputpath output_path.cached_path = args.outputpath
rom.write_to_file(output_path('%s.sfc' % outfilebase)) rom.write_to_file(output_path('%s.sfc' % outfilebase))
if args.shuffle_songinstruments:
output_song_data(rom, output_path('OR_SPCInstruments.txt'), outfilebase)
logger.info('Done. Enjoy.') logger.info('Done. Enjoy.')
logger.debug('Total Time: %s', time.process_time() - start) logger.debug('Total Time: %s', time.process_time() - start)
@@ -77,9 +73,6 @@ def patch(args):
output_path.cached_path = args.outputpath output_path.cached_path = args.outputpath
rom.write_to_file(output_path('%s.sfc' % outfile_base)) rom.write_to_file(output_path('%s.sfc' % outfile_base))
if args.shuffle_songinstruments:
output_song_data(rom, output_path('OR_SPCInstruments.txt'), outfile_base)
logger.info('Done. Enjoy.') logger.info('Done. Enjoy.')
logger.debug('Total Time: %s', time.process_time() - start) logger.debug('Total Time: %s', time.process_time() - start)

3
Main.py
View File

@@ -35,7 +35,6 @@ from source.item.FillUtil import create_item_pool_config, massage_item_pool, dis
from source.overworld.EntranceShuffle2 import link_entrances_new from source.overworld.EntranceShuffle2 import link_entrances_new
from source.tools.BPS import create_bps_from_data from source.tools.BPS import create_bps_from_data
from source.classes.CustomSettings import CustomSettings from source.classes.CustomSettings import CustomSettings
from source.classes.SFX import output_song_data
version_number = '1.2.0.22' version_number = '1.2.0.22'
version_branch = '-u' version_branch = '-u'
@@ -406,8 +405,6 @@ def main(args, seed=None, fish=None):
if world.players > 1 or world.teams > 1: if world.players > 1 or world.teams > 1:
outfilepname += f"_{world.player_names[player][team].replace(' ', '_')}" if world.player_names[player][team] != 'Player %d' % player else '' outfilepname += f"_{world.player_names[player][team].replace(' ', '_')}" if world.player_names[player][team] != 'Player %d' % player else ''
outfilesuffix = f'_{Settings.make_code(world, player)}' if not args.outputname else '' outfilesuffix = f'_{Settings.make_code(world, player)}' if not args.outputname else ''
if args.shuffle_songinstruments:
output_song_data(rom, output_path('OR_SPCInstruments.txt'), outfilebase)
if args.bps: if args.bps:
patchfile = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.bps') patchfile = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.bps')
patch = create_bps_from_data(LocalRom(args.rom, patch=False).buffer, rom.buffer) patch = create_bps_from_data(LocalRom(args.rom, patch=False).buffer, rom.buffer)

2
source/classes/SFX.py
View File

@@ -263,7 +263,7 @@ def output_song_data(rom, filepath, outfilebase):
if tracks > 0: if tracks > 0:
outfile.write(' ' * tracks) outfile.write(' ' * tracks)
outfile.write(f' = {rom.read_byte(snes_to_pc(next(iter(change.tracks.values()))[0])):02X}') outfile.write(f' = {rom.read_byte(snes_to_pc(next(iter(change.tracks.values()))[0])):02X}')
def randomize_songinstruments(rom): def randomize_songinstruments(rom):
# categorize instruments in pools # categorize instruments in pools