v14.2.1

Admentus64 · Jul 15, 2021 · 1635756 · 1635756
1 parent fbb444b
commit 1635756
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 11 deletions.
diff --git a/Files/Scripts/Common.psm1 b/Files/Scripts/Common.psm1
@@ -342,11 +342,6 @@ function ChangeGameRev() {
     if (IsSet $GameRev.script)   { $GameFiles.script = ($Paths.Scripts + "\Options\" + $GameRev.script + ".psm1") }
     else                         { $GameFiles.script = ($Paths.Scripts + "\Options\" + $GameType.mode + ".psm1") }
 
-    if (TestFile $GameFiles.script) {
-        Import-Module -Name $GameFiles.script -Global
-        LoadAdditionalOptions
-    }
-
     ChangePatchPanel
     $global:IsActiveGameField = $True
 
@@ -364,8 +359,12 @@ function ChangePatch() {
                 $PatchToolTip.SetToolTip($Patches.Button, ([string]::Format($item.tooltip, [Environment]::NewLine)))
                 GetHeader
                 GetRegion
-                if (Get-Command "AdjustGUI" -errorAction SilentlyContinue) { iex "AdjustGUI" }
                 DisablePatches
+                if ( (TestFile $GameFiles.script) -and $GamePatch.options -eq 1) {
+                    Import-Module -Name $GameFiles.script -Global
+                    LoadAdditionalOptions
+                    if (Get-Command "AdjustGUI" -errorAction SilentlyContinue) { iex "AdjustGUI" }
+                }
                 break
             }
         }

diff --git a/Files/Scripts/Options/Majora's Mask.psm1 b/Files/Scripts/Options/Majora's Mask.psm1
@@ -969,7 +969,7 @@ function CreateTabLanguage() {
     $Redux.Box.Text = CreateReduxGroup -Tag "Script" -Text "Other Text Options"
     CreateReduxCheckBox -Name "RenameTatl"   -Text "Rename Tatl"        -Info "Rename Tatl to Taya (English) or Taya to Tatl (German, French or Spanish)" -Credits "Admentus & GhostlyDark"
     CreateReduxCheckBox -Name "Comma"        -Text "Better Comma"       -Info "Make the comma not look as awful"                                          -Credits "ShadowOne333"
-    CreateReduxCheckBox -Name "AutoSkip"     -Text "Auto Skip Dialogue" -Info "Automaticially advance to the next line or end it during dialogues "       -Credits "Marcelo20XX" -Warning "This option is recommended for speedrunners or experienced players only"
+    CreateReduxCheckBox -Name "AutoSkip"     -Text "Auto Skip Dialogue" -Info "Automatically advance to the next line or end it during dialogues "        -Credits "Marcelo20XX" -Warning "This option is recommended for speedrunners or experienced players only"
 
     $Redux.Text.Restore.Add_CheckedChanged({ EnableElem -Elem $Redux.Text.OcarinaIcons -Active $this.checked })
     foreach ($i in 0.. ($Files.json.languages.length-1)) { $Redux.Language[$i].Add_CheckedChanged({ UnlockLanguageContent }) }
@@ -1097,7 +1097,7 @@ function CreateTabDifficulty() {
 
     # EASY MODE #
     CreateReduxGroup    -Tag  "EasyMode" -Text "Easy Mode"
-    CreateReduxCheckbox -Name "NoBlueBubbleRespawn" -Text "No Blue Bubble Respawn" -Info "Removes the respawn of the Blue Bubble monsters (until you re-enter the room)" -Credits "Garoh-Mastah"
+    CreateReduxCheckbox -Name "NoBlueBubbleRespawn" -Text "No Blue Bubble Respawn" -Info "Removes the respawn of the Blue Bubble monsters (until you re-enter the room)" -Credits "Garo-Mastah"
 
 }
 

diff --git a/Files/Scripts/Patch.psm1 b/Files/Scripts/Patch.psm1
@@ -995,8 +995,14 @@ function IsReduxOnly() {
 
 #==============================================================================================================================================================================================
 function GetROMVersion() {
+
+    foreach ($item in $GameType.version) {
+        if ($ROMHashSum -eq $item.hash) {
+            if     ( (IsSet $item.file) -and $CurrentGame.Rev.SelectedIndex -eq 0)   { return $GameRev }
+            elseif ($item.list -eq $GameRev.list)                                    { return $item }
+        }
+    }
 
-    foreach ($item in $GameType.version) { if ($ROMHashSum -eq $item.hash -and $item.list -eq $GameRev.list) { return $item } }
     return $null
 
 }

diff --git a/Info/Changelog.txt b/Info/Changelog.txt
@@ -1,3 +1,8 @@
+v14.2.1
+- Fixed several typos
+- Fixed Redux options not showing up
+- Fixed ROM not downgrading
+
 v14.2.0
 - Added support for patching multiple revisions
 - Added three debug revisions for OoT with "Additional Options" support

diff --git a/Patcher64+ Tool.ps1 b/Patcher64+ Tool.ps1
@@ -24,8 +24,8 @@ Add-Type -AssemblyName 'System.Drawing'
 # Setup global variables
 
 $global:ScriptName = "Patcher64+ Tool"
-$global:VersionDate = "2021-07-14"
-$global:Version     = "v14.2.0"
+$global:VersionDate = "2021-07-15"
+$global:Version     = "v14.2.1"
 $global:SystemDate  = Get-Date -Format yyyy-MM-dd-HH-mm-ss
 
 $global:CommandType = $MyInvocation.MyCommand.CommandType.ToString()