v13.2.1

Admentus64 · Apr 10, 2021 · a7b8762 · a7b8762
1 parent 88fd894
commit a7b8762
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 33 deletions.
diff --git a/Files/Scripts/Files.psm1 b/Files/Scripts/Files.psm1
@@ -25,34 +25,34 @@ function SetFileParameters() {
 
 
     # Store all tool files
-    $Files.tool.Compress64                  = [System.String](Get-Location) + "\Files\Tools\Compression\Compress64.exe"
-    $Files.tool.Compress32                  = [System.String](Get-Location) + "\Files\Tools\Compression\Compress32.exe"
-    $Files.tool.Decompress                  = [System.String](Get-Location) + "\Files\Tools\Compression\Decompress.exe"
-    $Files.tool.ndec                        = [System.String](Get-Location) + "\Files\Tools\Compression\ndec.exe"
-    $Files.tool.sm64extend                  = [System.String](Get-Location) + "\Files\Tools\Compression\sm64extend.exe"
-    $Files.tool.TabExt64                    = [System.String](Get-Location) + "\Files\Tools\Compression\TabExt64.exe"
-    $Files.tool.TabExt32                    = [System.String](Get-Location) + "\Files\Tools\Compression\TabExt32.exe"
-
-    $Files.tool.flips                       = [System.String](Get-Location) + "\Files\Tools\Patching\flips.exe"
-    $Files.tool.ups                         = [System.String](Get-Location) + "\Files\Tools\Patching\ups.exe"
-    $Files.tool.xdelta                      = [System.String](Get-Location) + "\Files\Tools\Patching\xdelta.exe"
-    $Files.tool.xdelta3                     = [System.String](Get-Location) + "\Files\Tools\Patching\xdelta3.exe"
-    $Files.tool.applyPPF3                   = [System.String](Get-Location) + "\Files\Tools\Patching\ApplyPPF3.exe"
-
-    $Files.tool.rn64crc                     = [System.String](Get-Location) + "\Files\Tools\Verification\rn64crc.exe"
-
-    $Files.tool.wadpacker                   = [System.String](Get-Location) + "\Files\Tools\Wii VC\wadpacker.exe"
-    $Files.tool.wadunpacker                 = [System.String](Get-Location) + "\Files\Tools\Wii VC\wadunpacker.exe"
-    $Files.tool.wszst                       = [System.String](Get-Location) + "\Files\Tools\Wii VC\wszst.exe"
-    $Files.tool.cygcrypto                   = [System.String](Get-Location) + "\Files\Tools\Wii VC\cygcrypto-0.9.8.dll"
-    $Files.tool.cyggccs1                    = [System.String](Get-Location) + "\Files\Tools\Wii VC\cyggcc_s-1.dll"
-    $Files.tool.cygncursesw10               = [System.String](Get-Location) + "\Files\Tools\Wii VC\cygncursesw-10.dll"
-    $Files.tool.cygpng1616                  = [System.String](Get-Location) + "\Files\Tools\Wii VC\cygpng16-16.dll"
-    $Files.tool.cygwin1                     = [System.String](Get-Location) + "\Files\Tools\Wii VC\cygwin1.dll"
-    $Files.tool.cygz                        = [System.String](Get-Location) + "\Files\Tools\Wii VC\cygz.dll"
-    $Files.tool.lzss                        = [System.String](Get-Location) + "\Files\Tools\Wii VC\lzss.exe"
-    $Files.tool.romc                        = [System.String](Get-Location) + "\Files\Tools\Wii VC\romc.exe"
-    $Files.tool.romchu                      = [System.String](Get-Location) + "\Files\Tools\Wii VC\romchu.exe"
+    $Files.tool.Compress64                  = (GetFilePath) + "\Files\Tools\Compression\Compress64.exe"
+    $Files.tool.Compress32                  = (GetFilePath) + "\Files\Tools\Compression\Compress32.exe"
+    $Files.tool.Decompress                  = (GetFilePath) + "\Files\Tools\Compression\Decompress.exe"
+    $Files.tool.ndec                        = (GetFilePath) + "\Files\Tools\Compression\ndec.exe"
+    $Files.tool.sm64extend                  = (GetFilePath) + "\Files\Tools\Compression\sm64extend.exe"
+    $Files.tool.TabExt64                    = (GetFilePath) + "\Files\Tools\Compression\TabExt64.exe"
+    $Files.tool.TabExt32                    = (GetFilePath) + "\Files\Tools\Compression\TabExt32.exe"
+
+    $Files.tool.flips                       = (GetFilePath) + "\Files\Tools\Patching\flips.exe"
+    $Files.tool.ups                         = (GetFilePath) + "\Files\Tools\Patching\ups.exe"
+    $Files.tool.xdelta                      = (GetFilePath) + "\Files\Tools\Patching\xdelta.exe"
+    $Files.tool.xdelta3                     = (GetFilePath) + "\Files\Tools\Patching\xdelta3.exe"
+    $Files.tool.applyPPF3                   = (GetFilePath) + "\Files\Tools\Patching\ApplyPPF3.exe"
+
+    $Files.tool.rn64crc                     = (GetFilePath) + "\Files\Tools\Verification\rn64crc.exe"
+
+    $Files.tool.wadpacker                   = (GetFilePath) + "\Files\Tools\Wii VC\wadpacker.exe"
+    $Files.tool.wadunpacker                 = (GetFilePath) + "\Files\Tools\Wii VC\wadunpacker.exe"
+    $Files.tool.wszst                       = (GetFilePath) + "\Files\Tools\Wii VC\wszst.exe"
+    $Files.tool.cygcrypto                   = (GetFilePath) + "\Files\Tools\Wii VC\cygcrypto-0.9.8.dll"
+    $Files.tool.cyggccs1                    = (GetFilePath) + "\Files\Tools\Wii VC\cyggcc_s-1.dll"
+    $Files.tool.cygncursesw10               = (GetFilePath) + "\Files\Tools\Wii VC\cygncursesw-10.dll"
+    $Files.tool.cygpng1616                  = (GetFilePath) + "\Files\Tools\Wii VC\cygpng16-16.dll"
+    $Files.tool.cygwin1                     = (GetFilePath) + "\Files\Tools\Wii VC\cygwin1.dll"
+    $Files.tool.cygz                        = (GetFilePath) + "\Files\Tools\Wii VC\cygz.dll"
+    $Files.tool.lzss                        = (GetFilePath) + "\Files\Tools\Wii VC\lzss.exe"
+    $Files.tool.romc                        = (GetFilePath) + "\Files\Tools\Wii VC\romc.exe"
+    $Files.tool.romchu                      = (GetFilePath) + "\Files\Tools\Wii VC\romchu.exe"
 
 
 
@@ -214,8 +214,8 @@ function SetFileParameters() {
     CheckFilesExists $Files.json
     CheckFilesExists $Files.icon
 
-    $Files.flipscfg                         = [System.String](Get-Location) + "\Files\Tools\Patching\flipscfg.bin"
-    $Files.stackdump                        = [System.String](Get-Location) + "\Files\Tools\Wii VC\wadpacker.exe.stackdump"
+    $Files.flipscfg                         = (GetFilePath) + "\Files\Tools\Patching\flipscfg.bin"
+    $Files.stackdump                        = (GetFilePath) + "\Files\Tools\Wii VC\wadpacker.exe.stackdump"
     $Files.settings                         = $Paths.Settings + "\Core.ini"
 
     SetTempFileParameters
@@ -270,6 +270,16 @@ function SetGetROM() {
 
 
 
+#==============================================================================================================================================================================================
+function GetFilePath() {
+
+    if ($ExternalScript)   { return $Paths.FullBase }
+    else                   { return [System.String](Get-Location) }
+
+}
+
+
+
 #==============================================================================================================================================================================================
 function CheckFilesExists([hashtable]$HashTable) {
 

diff --git a/Files/Scripts/Options/Majora's Mask.psm1 b/Files/Scripts/Options/Majora's Mask.psm1
@@ -650,7 +650,7 @@ function ByteLanguageOptions() {
     }
 
     if (IsChecked $Redux.Text.OcarinaIcons) {
-        PatchBytes -Offset "A3B9BC" -Length "850" -Texture -Pad -Patch "Icons\deku_Pppes_icon.yaz0"  # Slingshot, ID: 0x0B
+        PatchBytes -Offset "A3B9BC" -Length "850" -Texture -Pad -Patch "Icons\deku_pipes_icon.yaz0"  # Slingshot, ID: 0x0B
         PatchBytes -Offset "A28AF4" -Length "1AF" -Texture -Pad -Patch "Icons\deku_pipes_text.yaz0"
         PatchBytes -Offset "A44BFC" -Length "A69" -Texture -Pad -Patch "Icons\goron_drums_icon.yaz0" # Blue Fire, ID: 0x1C
         PatchBytes -Offset "A28204" -Length "26F" -Texture -Pad -Patch "Icons\goron_drums_text.yaz0"

diff --git a/Info/Changelog.txt b/Info/Changelog.txt
@@ -1,3 +1,7 @@
+v13.2.1
+- Fixed issue with file paths not being recognized properly
+- Fixed issue with "Ocarina Icons" option for MM not properly being patched
+
 v13.2.0
 - Added new texture alternatives for the Hylian Shield
 - Added "Weapon Hitbox" options for OoT and MM

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-04-08"
-$global:Version     = "v13.2.0"
+$global:VersionDate = "2021-04-10"
+$global:Version     = "v13.2.1"
 $global:SystemDate  = Get-Date -Format yyyy-MM-dd-HH-mm-ss
 
 $global:CommandType = $MyInvocation.MyCommand.CommandType.ToString()