Singularity SFX shuffle

Author: PoryGone

worlds/smw/Aesthetics.py

@@ -582,8 +582,7 @@ def generate_shuffled_sfx(rom, world: World):
     rom.write_bytes(0x06D41 + 0x05, bytearray([0xEA, 0xEA, 0xEA, 0xEA]))    # nop #4
 
     # Manually add "Map: Stepping onto a level tile" random SFX
-    random_sfx = world.random.randint(0, len(valid_sfxs)-1)
-    selected_sfx = valid_sfxs[random_sfx]
+    selected_sfx = world.random.choice(valid_sfxs)
     rom.write_byte(0x2169F + 0x01, selected_sfx[0])
     rom.write_byte(0x2169F + 0x04, selected_sfx[1] + 0xF9)
 
@@ -593,8 +592,8 @@ def generate_shuffled_sfx(rom, world: World):
     # Randomize SFX calls
     for address in game_sfx_calls:
         # Get random SFX
-        random_sfx = world.random.randint(0, len(valid_sfxs)-1)
-        selected_sfx = valid_sfxs[random_sfx]
+        if world.options.sfx_shuffle != "singularity":
+            selected_sfx = world.random.choice(valid_sfxs)
         # Write randomized SFX num
         rom.write_byte(address + 0x01, selected_sfx[0])
         # Write randomized SFX port

worlds/smw/Options.py

@@ -273,12 +273,18 @@ class MusicShuffle(Choice):
     default = 0
 
 
-class SFXShuffle(Toggle):
+class SFXShuffle(Choice):
     """
     Shuffles almost every instance of sound effect playback
     Archipelago elements that play sound effects aren't randomized
+    None: No Music is shuffled
+    Full: Each individual SFX call has a random SFX
+    Singularity: The entire game uses one SFX for every SFX call
     """
-    display_name = "Sound effect shuffle"
+    display_name = "Sound Effect Shuffle"
+    option_none = 0
+    option_full = 1
+    option_singularity = 2
     default = 0
 
 

worlds/smw/Rom.py

@@ -2820,7 +2820,7 @@ def patch_rom(world: World, rom, player, active_level_dict):
     if world.options.overworld_palette_shuffle == "on_curated":
         generate_curated_map_palette_data(rom, world)
 
-    if world.options.sfx_shuffle:
+    if world.options.sfx_shuffle != "none":
         generate_shuffled_sfx(rom, world)
 
     if world.options.swap_donut_gh_exits: