diff --git a/alttp_sm_combo_randomizer_rom/src/sm/sm_msu.asm b/alttp_sm_combo_randomizer_rom/src/sm/sm_msu.asm
index 23ddc931f..6442d9764 100644
--- a/alttp_sm_combo_randomizer_rom/src/sm/sm_msu.asm
+++ b/alttp_sm_combo_randomizer_rom/src/sm/sm_msu.asm
@@ -223,18 +223,20 @@ PlayMusic:
TAX
LDA $7E079F
- ; Ridley
- CMP #2 : BNE +
- LDA #36
- bra .done
- +
-
; Draygon
CMP #4 : BNE +
LDA #35
bra .done
+
+ LDA $7E079D
+
+ ; Ridley
+ CMP #$3A : BNE +
+ LDA #36
+ bra .done
+ +
+
TXA
bra .done
diff --git a/alttp_sm_combo_randomizer_rom/src/z3/randomizer/tables.asm b/alttp_sm_combo_randomizer_rom/src/z3/randomizer/tables.asm
index e10ee3605..80a8889f8 100644
--- a/alttp_sm_combo_randomizer_rom/src/z3/randomizer/tables.asm
+++ b/alttp_sm_combo_randomizer_rom/src/z3/randomizer/tables.asm
@@ -1581,7 +1581,7 @@ ShopContentsTable:
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF
;================================================================================
org $405000 ; PC 0x185000 - 0x18503F
-MSUTrackList:
+MSUTrackFlags:
db $00,$01,$03,$03,$03,$03,$03,$03
db $01,$03,$01,$03,$03,$03,$03,$03
db $03,$03,$03,$01,$03,$03,$03,$03
diff --git a/alttp_sm_combo_randomizer_rom/src/z3/randomizer/z3_msu.asm b/alttp_sm_combo_randomizer_rom/src/z3/randomizer/z3_msu.asm
index 1a3281955..3f6d05c3c 100644
--- a/alttp_sm_combo_randomizer_rom/src/z3/randomizer/z3_msu.asm
+++ b/alttp_sm_combo_randomizer_rom/src/z3/randomizer/z3_msu.asm
@@ -164,7 +164,7 @@ msu_main:
CMP !MSU_LAST_PLAYED_TRACK : BEQ .done ; If the track is the same, ignore it
STA !MSU_LAST_PLAYED_TRACK : STA !MSU_CURRENT_TRACK ; Saves the track being played
STA !MSU_TRACK_LO : STZ !MSU_TRACK_HI ; Sets the MSU track from A
- LDA.l MSUTrackList,X : STA !MSU_REPEAT ; Sets the track repeat flag from the track table
+ LDA.l MSUTrackFlags,X : STA !MSU_REPEAT ; Sets the track repeat flag from the track table
LDA !VAL_VOLUME_FULL : STA !MSU_TARGET_VOLUME : STA !MSU_CURRENT_VOLUME : STA !MSU_VOLUME
BRA .done
diff --git a/setup/randomizer.app.iss b/setup/randomizer.app.iss
index d56f41aa4..422dc41cf 100644
--- a/setup/randomizer.app.iss
+++ b/setup/randomizer.app.iss
@@ -4,7 +4,7 @@
#include "CodeDependencies.iss"
#define MyAppName "SMZ3 Cas' Randomizer"
-#define MyAppVersion "8.0.0"
+#define MyAppVersion "8.0.1"
#define MyAppPublisher "Vivelin"
#define MyAppURL "https://github.com/Vivelin/SMZ3Randomizer"
#define MyAppExeName "Randomizer.App.exe"
diff --git a/src/Randomizer.App/Patches/zsm.ips b/src/Randomizer.App/Patches/zsm.ips
index 68e7d6d33..9dc87ba58 100644
Binary files a/src/Randomizer.App/Patches/zsm.ips and b/src/Randomizer.App/Patches/zsm.ips differ
diff --git a/src/Randomizer.App/Randomizer.App.csproj b/src/Randomizer.App/Randomizer.App.csproj
index 890751c37..45c6ef8bf 100644
--- a/src/Randomizer.App/Randomizer.App.csproj
+++ b/src/Randomizer.App/Randomizer.App.csproj
@@ -5,7 +5,7 @@