Update v22

.gitignore

@@ -9,11 +9,13 @@ Files/Tools/cygdrive
 Files/Games/**/Extracted
 Files/Games/**/Custom Text/*.*
 Files/Games/**/Editor
+Exclude
 *.exe
 !Files/Tools/*.exe
 Release Prepare.bat
 *.7z
 *.7z.tmp
+*.zip
 *.htm
 *.html
 *.nes

Files/Games/Majora's Mask/Scene Editor.json

@@ -10120,7 +10120,7 @@
 		"id"		: "0132",
 		"type"		: "NPC"
 	}, {
-		"name"		: "Large Wooden Crate",
+		"name"		: "Large Crate",
 		"id"		: "0133",
 		"type"		: "Object"
 	}, {

Files/Games/Ocarina of Time/Patches.json

@@ -153,14 +153,14 @@
 }, {
 
 	"title"				: "Additional Options for Debug GC",
-	"version"			: "Debug GC (PAL)",
+	"version"			: "Debug GC (EU)",
 	"script"			: "OoT Debug",
 	"tooltip"			: "The regular Ocarina of Time experience{0}With support additional options"
 
 }, {
 
 	"title"				: "Additional Options for Debug GC Beta",
-	"version"			: "Debug GC Beta (PAL)",
+	"version"			: "Debug GC Beta (EU)",
 	"script"			: "OoT Debug Beta",
 	"tooltip"			: "The regular Ocarina of Time experience{0}With support additional options"
 

Files/Games/Ocarina of Time/Scene Editor.json

@@ -2219,7 +2219,7 @@
 			"value"	: "FF"
 		} ] ]
 	}, {
-		"name"		: "Bombflower",
+		"name"		: "Bomb Flower",
 		"id"		: "004C",
 		"type"		: "Object",
 		"band"		: [ "FFFF" ],
@@ -3763,8 +3763,20 @@
 		"type"		: "Area",
 		"band"		: [ "00FF" ],
 		"params" : [ [ {
-			"name"	: "Type",
-			"value"	: "5"
+			"name"	: "Bridge (Broken)",
+			"value"	: 1
+		}, {
+			"name"	: "Bridge (Locked)",
+			"value"	: 2
+		}, {
+			"name"	: "Bridge (Repaired)",
+			"value"	: 4
+		}, {
+			"name"	: "Bridge (Side)",
+			"value"	: 0
+		}, {
+			"name"	: "Carpenter's Tent",
+			"value"	: 3
 		} ] ]
 	}, {
 		"name"		: "Darunia's Room Statue",
@@ -4684,11 +4696,97 @@
 			"value"	: "1"
 		} ] ]
 	}, {
-		"name"		: "Small Liftable Crate",
+		"name"		: "Small Crate",
 		"id"		: "0110",
-		"type"		: "Object"
+		"type"		: "Object",
+		"band"		: [ "00FF", "3F00" ],
+		"params" : [ [ {
+			"name"	: "Flexible",
+			"value"	: "12"
+		}, {
+			"name"	: "Green Rupee",
+			"value"	: "0"
+		}, {
+			"name"	: "Blue Rupee",
+			"value"	: "1"
+		}, {
+			"name"	: "Red Rupee",
+			"value"	: "2"
+		}, {
+			"name"	: "Purple Rupee",
+			"value"	: "14"
+		}, {
+			"name"	: "Gold Rupee",
+			"value"	: "13"
+		}, {
+			"name"	: "Recovery Heart",
+			"value"	: "3"
+		}, {
+			"name"	: "Small Magic Jar",
+			"value"	: "F"
+		}, {
+			"name"	: "Large Magic Jar",
+			"value"	: "E"
+		}, {
+			"name"	: "Small Key",
+			"value"	: "11"
+		}, {
+			"name"	: "Piece of Heart",
+			"value"	: "6"
+		}, {
+			"name"	: "Heart Container",
+			"value"	: "7"
+		}, {
+			"name"	: "Deku Seeds (5) / Arrows (5)",
+			"value"	: "10"
+		}, {
+			"name"	: "Arrows (1)",
+			"value"	: "5"
+		}, {
+			"name"	: "Arrows (5)",
+			"value"	: "8"
+		}, {
+			"name"	: "Arrows (10)",
+			"value"	: "9"
+		}, {
+			"name"	: "Arrows (30)",
+			"value"	: "A"
+		}, {
+			"name"	: "Bombs (A)",
+			"value"	: "4"
+		}, {
+			"name"	: "Bombs (B)",
+			"value"	: "B"
+		}, {
+			"name"	: "Bombs (Special)",
+			"value"	: "19"
+		}, {
+			"name"	: "Deku Nut",
+			"value"	: "C"
+		}, {
+			"name"	: "Deku Stick",
+			"value"	: "D"
+		}, {
+			"name"	: "Deku Shield",
+			"value"	: "15"
+		}, {
+			"name"	: "Hylian Shield",
+			"value"	: "16"
+		}, {
+			"name"	: "Goron Tunic",
+			"value"	: "18"
+		}, {
+			"name"	: "Zora Tunic",
+			"value"	: "17"
+		}, {
+			"name"	: "No Item",
+			"value"	: "FF"
+		} ], [ {
+			"name"	: "Flag",
+			"value"	: "3F"
+		} ] ]
 	}, {
-		"name"		: "Breakable Pot",
+		"name"		: "Pot",
 		"id"		: "0111",
 		"type"		: "Object",
 		"band"		: [ "00FF", "7E00" ],
@@ -9158,7 +9256,7 @@
 		"id"		: "016F",
 		"type"		: "Area"
 	}, {
-		"name"		: "Large Wooden Crate",
+		"name"		: "Large Crate",
 		"id"		: "0170",
 		"type"		: "Object"
 	}, {

Files/Games/Paper Mario/Enemies.json

@@ -782,7 +782,7 @@
 			"value"		: 0,
 			"offset"	: [ "626A98", "66BCF8", "6BEDB8" ]
 		}, {
-			"type"		: "Goombario",
+			"type"		: "Goomba.",
 			"value"		: 0,
 			"offset"	: [ "6286E4", "66D944", "6C0A04" ]
 		}, {
@@ -1040,7 +1040,7 @@
 			"value"		: 0,
 			"offset"	: "469858"
 		}, {
-			"type"		: "Goombario",
+			"type"		: "Goomba.",
 			"value"		: 0,
 			"offset"	: "46AE2C"
 		}, {

Files/Games/Shared/HUD/Current Floor/Alternative.bin

@@ -0,0 +1,2 @@
+1�1�1�1�""		GI::::::1�1�1�1�S�����:::U�����EDDD��������ABBB:�:����������
A
@
@������|�DD|�lC��A@@��A�������A�����A
+��22B�&�������
��̓�
������A:BB1Gj�����
�
�M�M�
�
���j�ABBJ���ÁY�j�S�SjY�́큫�I�BBJjC큌
�!%����!%��
�CjCI�BZ�Z�Z����������������GZ�Z�Z�Z�Z�Z�z�IE����z�z��Պ�IEz�Z�Z�Z�Z�Z�Z�z�IEBR��RB
�CBBBZ�Z�Z�z�IDBBRRBB9�����Z�Z�Z�z�IDBBRRBB9�����

Files/Games/Shared/HUD/Current Floor/Majora's Mask.bin

@@ -0,0 +1,2 @@
+1�1�1�1�""		GI::::::1�1�1�1�S�����:::U�����EDDD��������ABBB:�:����������
A
@
@���5O��]	ID|�E��A@@&���������A�������A
+��22B�}��
�����Ӝ����������A:BB1G�
���r�����Q�
�
���j�ABBJ���
Z�c10�홒�!%́�A큫�I�BBJI��II��A홛I�����CjCI�BBJI���s���[�_�������GZ�Z�Z�9�9�9�9�9՛�bK����)8�z�Z�Z�Z�9�9�9�9�1�B��ՙ�R)
�CBBB9�9�9�9�9�B��9��R9�9�����9�9�9�9�9�B��9��R9�9�����

Files/Scripts/Bytes.psm1

@@ -3,6 +3,7 @@ function ChangeBytes([string]$File, [byte[]]$Array, [object]$Offset, [object]$Ma
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File)
+            $global:WarningError = $True
             return $False
         }
     }
@@ -61,8 +62,14 @@ function ChangeBytes([string]$File, [byte[]]$Array, [object]$Offset, [object]$Ma
         }
     }
 
-    # Convert to Byte if needed
-    WriteToConsole ($Offset + " -> Change values: " + $Values)
+    # Print info
+    if ($Offset.Count -eq 1) {
+        $spaces = ""
+        while ($Offset[0].Substring(0, 1) -eq "0") { $Offset[0] = $Offset[0].Substring(1) }
+        for ($i=8; $i -gt $Offset[0].Length; $i--) { $spaces += " " }
+        WriteToConsole ($Offset[0] + $spaces + "-> Change values: " + $Values)
+    }
+    else { WriteToConsole ($Offset + "-> Change values: " + $Values) }
 
     # Patch
     foreach ($o in $offsetDec) {
@@ -111,6 +118,7 @@ function MultiplyBytes([string]$File, [string]$Offset, [object]$Match=$null, [fl
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File) -Error
+            $global:WarningError = $True
             return $False
         }
         $ByteArrayGame = [System.IO.File]::ReadAllBytes($File)
@@ -166,6 +174,7 @@ function CopyBytes([string]$File, [string]$Start, [string]$Length, [string]$Offs
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File) -Error
+            $global:WarningError = $True
             return $False
         }
         $ByteArrayGame = [System.IO.File]::ReadAllBytes($File) 
@@ -207,6 +216,7 @@ function PatchBytes([string]$File, [string]$Offset, [string]$Length, [string]$Pa
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File) -Error
+            $global:WarningError = $True
             return $False
         }
         $ByteArrayGame = [System.IO.File]::ReadAllBytes($File) 
@@ -281,6 +291,7 @@ function ExportBytes([string]$File, [string]$Offset, [string]$End, [string]$Leng
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File) -Error
+            $global:WarningError = $True
             return $False
         }
         $ByteArrayGame = [System.IO.File]::ReadAllBytes($File) 
@@ -306,7 +317,7 @@ function ExportBytes([string]$File, [string]$Offset, [string]$End, [string]$Leng
     $Path = $Output.substring(0, $Output.LastIndexOf('\'))
     $Folder = $Path.substring($Path.LastIndexOf('\') + 1)
     $Path = $Path.substring(0, $Path.LastIndexOf('\') + 1)
-    if (!(TestFile -Path ($Path + $Folder) -Container)) { New-Item -Path $Path -Name $Folder -ItemType Directory | Out-Null }
+    if (!(TestFile -Path ($Path + $Folder) -Container)) { New-Item -Path $Path -Name $Folder -ItemType Directory }
 
     if (IsSet $End) {
         $End = GetDecimal $End
@@ -327,16 +338,18 @@ function SearchBytes([string]$File, [object]$Start="0", [object]$End, [object]$V
     if (IsSet $File) {
         if (!(TestFile $File)) {
             WriteToConsole ("Could not find path to file to adjust: " + $File) -Error
-            return $False
+            $global:WarningError = $True
+            return -1
         }
         $ByteArrayGame = [System.IO.File]::ReadAllBytes($File) 
     }
 
-    if     ($values  -is [String] -and $values  -Like "* *")              { $values  = $values -split ' '           }
-    elseif ($values  -is [String])                                        { $values  = $values -split '(..)' -ne '' }
+    if     ($values -is [String] -and $values -Like "* *")   { $values = $values -split ' '           }
+    elseif ($values -is [String])                            { $values = $values -split '(..)' -ne '' }
     else {
         WriteToConsole "Search values are not valid to look for" -Error
-        return $False
+        $global:WarningError = $True
+        return -1
     }
 
     [uint32]$Start = GetDecimal $Start
@@ -346,30 +359,30 @@ function SearchBytes([string]$File, [object]$Start="0", [object]$End, [object]$V
     if ($Start -lt 0 -or $End -lt 0) {
         WriteToConsole "Start or end offset is negative!" -Error
         $global:WarningError = $True
-        return
+        return -1
     }
     elseif ($Start -gt $ByteArrayGame.Length -or $End -gt $ByteArrayGame.Length) {
         WriteToConsole "Start or end offset is too large for file!" -Error
         $global:WarningError = $True
-        return
+        return -1
     }
     elseif ($Start -gt $End) {
         Write-Host "Start offset can not be greater than end offset"
         $global:WarningError = $True
-        return
+        return -1
     }
 
     foreach ($i in $Start..($End-1)) {
-        $Search = $True
+        $found = $True
         foreach ($j in 0..($Values.Length-1)) {
             if ($Values[$j] -ne "") {
                 if ($ByteArrayGame[$i + $j] -ne (GetDecimal $Values[$j]) -and $Values[$j] -ne "xx") {
-                    $Search = $False
+                    $found = $False
                     break
                 }
             }
         }
-        if ($Search -eq $True) {
+        if ($found -eq $True) {
             if (!$Suppress) { WriteToConsole ("Found values at: " + (Get32Bit $i)) }
             if ($Decimal) { return $i }
             return Get32Bit $i