From be7fa4485eb5d8f104676fc1e29eae123c32313f Mon Sep 17 00:00:00 2001
From: Floogle <18466542+skyfloogle@users.noreply.github.com>
Date: Thu, 3 Feb 2022 17:09:37 +0100
Subject: [PATCH] add upx variant

---
 gm8x_fix.c |  5 +++--
 patches.c  | 10 ++++++++--
 version.rc | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gm8x_fix.c b/gm8x_fix.c
index 8c0abba..3293d76 100644
--- a/gm8x_fix.c
+++ b/gm8x_fix.c
@@ -20,7 +20,8 @@
 #define wait() if (!silent) while (getchar() != '\n');
 
 Patch patches[] = {
-	{.bytes = upx_80, .name = "UPX unpacked header adjustment", .type = UPX},
+	{.bytes = upx_80_v0, .name = "UPX unpacked header adjustment (variant 0)", .type = UPX},
+	{.bytes = upx_80_v1, .name = "UPX unpacked header adjustment (variant 1)", .type = UPX},
 	{.bytes = mempatch, .name = "Memory patch", .type = MEM},
 
 	{.bytes = joypatch_70, .name = "GM7.0 joystick patch", .type = JOY},
@@ -317,7 +318,7 @@ int main(int argc, const char *argv[]) {
 		valid_args = false;
 	}
 	// funny title
-	puts("Welcome to gm8x_fix v0.5.8!");
+	puts("Welcome to gm8x_fix v0.5.9!");
 	puts("Source code is at https://github.com/skyfloogle/gm8x_fix under MIT license.");
 	puts("---------------------------------------------------------------------------");
 	// did the user decide to be a funnyman and disable everything
diff --git a/patches.c b/patches.c
index b1e77bf..efdabc3 100644
--- a/patches.c
+++ b/patches.c
@@ -7,14 +7,20 @@ PatchByte mempatch[] = {
 };
 
 
-// UPX fix
+// UPX fix (and variants)
 // Fixes the file offset GM8 tries to load game data at in de-UPX'd games
-PatchByte upx_80[] = {
+PatchByte upx_80_v0[] = {
 	{0x144ac1, 0xa4, 0xf0},
 	{0x144ac2, 0x0a, 0x1c},
 	{-1,0,0}
 };
 
+PatchByte upx_80_v1[] = {
+	{0x144ac1, 0x9c, 0xf0},
+	{0x144ac2, 0x0a, 0x1c},
+	{-1,0,0}
+};
+
 // JOYSTICK PATCHES
 // How to create:
 // 1. Find all calls to joystick functions (joyGetPos, joyGetPosEx, joyGetDevCapsW)
diff --git a/version.rc b/version.rc
index 7d54db6..1af79a2 100644
--- a/version.rc
+++ b/version.rc
@@ -1,6 +1,6 @@
 1 VERSIONINFO
-FILEVERSION     0,5,8,0
-PRODUCTVERSION  0,5,8,0
+FILEVERSION     0,5,9,0
+PRODUCTVERSION  0,5,9,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -8,12 +8,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Floogle @ https://github.com/skyfloogle"
       VALUE "FileDescription", "gm8x_fix"
-      VALUE "FileVersion", "0.5.8"
+      VALUE "FileVersion", "0.5.9"
       VALUE "InternalName", "gm8x_fix"
       VALUE "LegalCopyright", ""
       VALUE "OriginalFilename", "gm8x_fix.exe"
-      VALUE "ProductName", "gm8x_fix v0.5.8"
-      VALUE "ProductVersion", "0.5.8"
+      VALUE "ProductName", "gm8x_fix v0.5.9"
+      VALUE "ProductVersion", "0.5.9"
     END
   END