Update v17.2.3

Admentus64 · Mar 6, 2022 · 930a521 · 930a521
1 parent c83114d
commit 930a521
Show file tree

Hide file tree

Showing 11 changed files with 44 additions and 12 deletions.
diff --git a/Files/Games/A Link to the Past/Compressed/Optional/green_agahnim_new_gfx.ips b/Files/Games/A Link to the Past/Compressed/Optional/green_agahnim_new_gfx.ips
diff --git a/.../Games/A Link to the Past/Compressed/Optional/green_agahnim_triforce_subtitle_new_gfx.ips b/.../Games/A Link to the Past/Compressed/Optional/green_agahnim_triforce_subtitle_new_gfx.ips
diff --git a/Files/Games/A Link to the Past/Compressed/Optional/triforce_subtitle_new_gfx.ips b/Files/Games/A Link to the Past/Compressed/Optional/triforce_subtitle_new_gfx.ips
diff --git a/Files/Games/A Link to the Past/Compressed/redux.ips b/Files/Games/A Link to the Past/Compressed/redux.ips
diff --git a/Files/Games/A Link to the Past/Compressed/redux_new_gfx.ips b/Files/Games/A Link to the Past/Compressed/redux_new_gfx.ips
diff --git a/Files/Games/A Link to the Past/Patches.json b/Files/Games/A Link to the Past/Patches.json
@@ -2,7 +2,7 @@
 	"title"		: "A Link to the Past",
 	"redux" : {
 		"options"	: 1,
-		"vc_title"	: "ALTTP Redux (v9.2)",
+		"vc_title"	: "ALTTP Redux (v9.3)",
 		"vc_gameID"	: "JAD0",
 		"file"		: "Compressed\\redux.ips",
 		"file_v2"	: "Compressed\\redux_new_gfx.ips",

diff --git a/Files/Scripts/Options/Ocarina of Time.psm1 b/Files/Scripts/Options/Ocarina of Time.psm1
@@ -664,7 +664,7 @@ function ByteOptions() {
     # WALLET CAPACITY #
 
     if (IsChecked $Redux.Capacity.EnableWallet) {
-        $Wallet1 = Get16Bit ($Redux.Capacity.Wallet1.Text); $Wallet2 = Get16Bit ($Redux.Capacity.Wallet2.Text); $Wallet3 = Get16Bit ($Redux.Capacity.Wallet3.Text); $Wallet4 = Get16Bit ($Redux.Capacity.Wallet4.Text)
+        $Wallet1 = Get16Bit $Redux.Capacity.Wallet1.Text; $Wallet2 = Get16Bit $Redux.Capacity.Wallet2.Text; $Wallet3 = Get16Bit $Redux.Capacity.Wallet3.Text; $Wallet4 = Get16Bit $Redux.Capacity.Wallet4.Text
         ChangeBytes -Offset "B6EC4C" -Values @($Wallet1.Substring(0, 2), $Wallet1.Substring(2) )
         ChangeBytes -Offset "B6EC4E" -Values @($Wallet2.Substring(0, 2), $Wallet2.Substring(2) )
         ChangeBytes -Offset "B6EC50" -Values @($Wallet3.Substring(0, 2), $Wallet3.Substring(2) )
@@ -691,8 +691,15 @@ function ByteOptions() {
         ChangeBytes -Offset "AE675B" -IsDec -Values $Redux.Capacity.DekuSticks.Text
         ChangeBytes -Offset "B6D4C9" -IsDec -Values ($Redux.Capacity.Bombs1x.Text,    $Redux.Capacity.Bombs2x.Text,  $Redux.Capacity.Bombs3x.Text, $Redux.Capacity.Bombs4x.Text) -Interval 2
         ChangeBytes -Offset "B6D4D9" -IsDec -Values ($Redux.Capacity.DekuNuts1x.Text, $Redux.Capacity.DekuNuts2x.Text)                                                           -Interval 2
-        $RupeeG = Get16Bit ($Redux.Capacity.RupeeG.Text); $RupeeB = Get16Bit ($Redux.Capacity.RupeeB.Text); $RupeeR = Get16Bit ($Redux.Capacity.RupeeR.Text); $RupeeP = Get16Bit ($Redux.Capacity.RupeeP.Text); $RupeeO = Get16Bit ($Redux.Capacity.RupeeO.Text)
-        ChangeBytes -Offset "B6D4DC" -IsDec -Values @($RupeeR, $RupeeB, $RupeeR, $RupeeP, $RupeeO)                                                                               -Interval 2
+        $RupeeG = Get16Bit $Redux.Capacity.RupeeG.Text; $RupeeB = Get16Bit $Redux.Capacity.RupeeB.Text; $RupeeR = Get16Bit $Redux.Capacity.RupeeR.Text; $RupeeP = Get16Bit $Redux.Capacity.RupeeP.Text; $RupeeO = Get16Bit $Redux.Capacity.RupeeO.Text
+
+        Write-Host $RupeeG   $RupeeG.Substring(0, 2)   $RupeeG.Substring(2)
+        Write-Host $RupeeB   $RupeeB.Substring(0, 2)   $RupeeB.Substring(2)
+        Write-Host $RupeeR   $RupeeR.Substring(0, 2)   $RupeeR.Substring(2)
+        Write-Host $RupeeP   $RupeeP.Substring(0, 2)   $RupeeP.Substring(2)
+        Write-Host $RupeeO   $RupeeO.Substring(0, 2)   $RupeeO.Substring(2)
+
+        ChangeBytes -Offset "B6D4DC" -Values @($RupeeG.Substring(0, 2), $RupeeG.Substring(2), $RupeeB.Substring(0, 2), $RupeeB.Substring(2), $RupeeR.Substring(0, 2), $RupeeR.Substring(2), $RupeeP.Substring(0, 2), $RupeeP.Substring(2), $RupeeO.Substring(0, 2), $RupeeO.Substring(2) )
     }
 
 

diff --git a/Files/Scripts/Updater.psm1 b/Files/Scripts/Updater.psm1
@@ -1,3 +1,27 @@
+function PerformUpdate() {
+
+    $Files.json.repo = SetJSONFile ($Paths.Master + "\repo.json")
+    if (IsSet $Settings.Core) {
+        if ($Settings.Core.DisableUpdates -ne $True) { AutoUpdate }
+        if ($Settings.Core.DisableAddons -ne $True) {
+            foreach ($addon in $Files.json.repo.addons) {
+                CheckAddon  -Title $addon.title
+                UpdateAddon -Title $addon.title -Uri $addon.uri -Version $addon.version }
+        }
+    }
+    else {
+        AutoUpdate
+        foreach ($addon in $Files.json.repo.addons) {
+            CheckAddon  -Title $addon.title
+            UpdateAddon -Title $addon.title -Uri $addon.uri -Version $addon.version
+        }
+    }
+
+}
+
+
+
+#==============================================================================================================================================================================================
 function InvokeWebRequest([string]$Uri, [String]$OutFile) {
 
     $ProgressPreference = 'SilentlyContinue'

diff --git a/Files/version.txt b/Files/version.txt
@@ -1,2 +1,2 @@
-17.2.2
-2022-03-05
+17.2.3
+2022-03-06
diff --git a/Info/Changelog.txt b/Info/Changelog.txt
@@ -1,3 +1,8 @@
+v17.2.3
+- Updated Redux for "A Link to the Past" to v9.3
+- Updated Auto-Updater
+- Fixed Rupee Quantity options for OoT
+
 v17.2.2
 - Added Item Drops Quantity options for OoT
 - Added support for extracting zipped ROM files prior to patching

diff --git a/Patcher64+ Tool.ps1 b/Patcher64+ Tool.ps1
@@ -231,12 +231,8 @@ $Fonts.Editor         = New-Object System.Drawing.Font("Consolas", 16, [System.D
 # Hide the PowerShell console from the user
 ShowPowerShellConsole ($Settings.Debug.Console -eq $True)
 
-$Files.json.repo = SetJSONFile ($Paths.Master + "\repo.json")
-if ($Settings.Core.DisableUpdates -ne $True) { AutoUpdate }
-foreach ($addon in $Files.json.repo.addons) {
-    CheckAddon  -Title $addon.title
-    if ($Settings.Core.DisableAddons -ne $True) { UpdateAddon -Title $addon.title -Uri $addon.uri -Version $addon.version }
-}
+# Auto-Updater
+PerformUpdate
 
 # Ask for default interface mode on first time use
 if ($Settings.Core.Interface -ne 1 -and $Settings.Core.Interface -ne 2 -and $Settings.Core.Interface -ne 3 -and !$FatalError) {