From 1d0045624b2b59dad574dd72ddaabf3ff0605128 Mon Sep 17 00:00:00 2001
From: codemann8 <codemann8@gmail.com>
Date: Tue, 12 Dec 2023 23:28:34 -0600
Subject: [PATCH] Remove song instruments output file

---
 AdjusterMain.py       | 7 -------
 Main.py               | 3 ---
 source/classes/SFX.py | 2 +-
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/AdjusterMain.py b/AdjusterMain.py
index a3a08924..2bb071f3 100644
--- a/AdjusterMain.py
+++ b/AdjusterMain.py
@@ -10,7 +10,6 @@ except ImportError:
 
 from Utils import output_path
 from Rom import LocalRom, apply_rom_settings
-from source.classes.SFX import output_song_data
 from source.tools.BPS import bps_read_vlv
 
 
@@ -39,9 +38,6 @@ def adjust(args):
     output_path.cached_path = args.outputpath
     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.debug('Total Time: %s', time.process_time() - start)
 
@@ -77,9 +73,6 @@ def patch(args):
     output_path.cached_path = args.outputpath
     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.debug('Total Time: %s', time.process_time() - start)
 
diff --git a/Main.py b/Main.py
index 8c8e3a16..bda0e6c9 100644
--- a/Main.py
+++ b/Main.py
@@ -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.tools.BPS import create_bps_from_data
 from source.classes.CustomSettings import CustomSettings
-from source.classes.SFX import output_song_data
 
 version_number = '1.2.0.22'
 version_branch = '-u'
@@ -406,8 +405,6 @@ def main(args, seed=None, fish=None):
                     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 ''
                     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:
                         patchfile = output_path(f'{outfilebase}{outfilepname}{outfilesuffix}.bps')
                         patch = create_bps_from_data(LocalRom(args.rom, patch=False).buffer, rom.buffer)
diff --git a/source/classes/SFX.py b/source/classes/SFX.py
index 4b6aa4ed..08085aff 100644
--- a/source/classes/SFX.py
+++ b/source/classes/SFX.py
@@ -263,7 +263,7 @@ def output_song_data(rom, filepath, outfilebase):
             if tracks > 0:
                 outfile.write(' ' * tracks)
             outfile.write(f' = {rom.read_byte(snes_to_pc(next(iter(change.tracks.values()))[0])):02X}')
-            
+
 
 def randomize_songinstruments(rom):
     # categorize instruments in pools