Merge pull request #254 from Vivelin/golden-chorizo-music

Fix for Golden Chorizo playing Ridley music
TheTrackerCouncil · Jan 6, 2023 · 9c68858 · 9c68858
2 parents 736df10 + 4eb7149
commit 9c68858
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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>