Merge pull request #342 from Vivelin/fix-sm-half-magic

Fixing picking up half/quarter magic in SM
TheTrackerCouncil · Jun 5, 2023 · 4ed5812 · 4ed5812
2 parents cc402b5 + 337f050
commit 4ed5812
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/alttp_sm_combo_randomizer_rom/src/sm/items.asm b/alttp_sm_combo_randomizer_rom/src/sm/items.asm
@@ -1160,7 +1160,7 @@ alttp_item_pickup:
     lda #$80
     sta.l !SRAM_ALTTP_ITEM_BUF+$73           ; Refill Link's magic
     %a16()
-    jmp .end
+    jmp .normal_item
 
 .end
     ;lda #$0168

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 "9.2.0"
+#define MyAppVersion "9.2.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>9.2.0</Version>
+    <Version>9.2.1</Version>
     <Title>SMZ3 Cas' Randomizer</Title>
     <AssemblyTitle>SMZ3 Cas' Randomizer</AssemblyTitle>
     <Authors>Vivelin</Authors>