From 7a7d486df9472f0f9fd07c279e3ada2a82fb0303 Mon Sep 17 00:00:00 2001
From: MattEqualsCoder <mattequalscoder@gmail.com>
Date: Thu, 5 Jan 2023 20:54:31 -0500
Subject: [PATCH 1/2] Fix for Golden Chorizo playing the Ridley music

---
 .../src/sm/sm_msu.asm                         |  14 ++++++++------
 .../src/z3/randomizer/tables.asm              |   2 +-
 .../src/z3/randomizer/z3_msu.asm              |   2 +-
 src/Randomizer.App/Patches/zsm.ips            | Bin 1451509 -> 1451513 bytes
 4 files changed, 10 insertions(+), 8 deletions(-)

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/src/Randomizer.App/Patches/zsm.ips b/src/Randomizer.App/Patches/zsm.ips
index 68e7d6d33a7bc040f3518684865f827488430d37..9dc87ba587e5cf007100b0799ddd0ea3688f625a 100644
GIT binary patch
delta 230
zcmWm1!Ab&A0EJ<$_fDFYR;KGIqZe@J6S#2^v~cCNw~z}%jErT<MIkH(!Ac!rW;f3;
z%*OLD32qusi;r{u-?V#3yHO~GF_G+u2lFRy#MaoVDSGBnwV%{Zts6QHKlA;h#eb&*
zPp>wi&lYT3&lAbL)h4mH_j>5*frDqb@bH3HjPQmrCNP*{hIh>I0Urx2@r7^vV1+dT
qCsS^w1m#H5e_M1yc`DE;6{$pLbWUZe&;?!66;<h)YH_COd;17xQ*Ign

delta 254
zcmWm2J5B;o0EOYX+<O_`Z&0flk+=aiK|^OjSPWc4;$y^2bYdVe1OW+;kPIDbn9z7y
z_hDf}JQiR6ob!9^{2V*`PzpcT%eH6-CwVE>fvcLL8{DW?KlY_I4ReSTdu2k;?6%?5
z?nQ#zHPcA4bu)@Idu@Er4Ewmn0C#x6BRo7|h-dhC!7JV{!Wi$E-~%(vvA`#mSV3u}
z<CdLBrqY>gE?+2GrE;}WJ3F^729CaWw4fMCQuP1D$)*G)DMe|@P?mC(rveqJL}jW_
K_2B5*xBCZ8B3Z!z


From 4eb71497f7b03df30d3fad28234f7855c981e66c Mon Sep 17 00:00:00 2001
From: MattEqualsCoder <mattequalscoder@gmail.com>
Date: Thu, 5 Jan 2023 20:55:13 -0500
Subject: [PATCH 2/2] Updating version number

---
 setup/randomizer.app.iss                 | 2 +-
 src/Randomizer.App/Randomizer.App.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/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 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>chozo20.ico</ApplicationIcon>
-    <Version>8.0.0</Version>
+    <Version>8.0.1</Version>
     <Title>SMZ3 Cas' Randomizer</Title>
     <AssemblyTitle>SMZ3 Cas' Randomizer</AssemblyTitle>
     <Authors>Vivelin</Authors>