v3.0.10

README.md

@@ -1,8 +1,8 @@
 ### Games and regions
-- **3rd**: glb/sea/tw/kr/jp **v6.9.0+**, cn **v6.9.0+**
+- **3rd**: glb/sea/tw/kr/jp **v7.0.0+**, cn **v7.0.0+**
-- **SR**: os/cn **v1.3.0** (potentially unsafe, but no bans were reported since v1.1.0) 
+- **SR**: os/cn **v1.4.0** (potentially unsafe, but no bans were reported since v1.1.0) 
 
-You can expect newer versions to work immediately after release with the same jadeite binary if the version is specified with a + above (currently none).
+You can expect newer versions to work immediately after release with the same jadeite binary if the version is specified with a + above.
 
 ### Information
 The anticheat the games use is fundamentally incompatible with Wine in multiple ways. This tool launches the game without it (`injector`) and imitates it's behaviour (`game_payload`).

game_payload/src/hi3.c

@@ -5,31 +5,16 @@
 
 #include <game.h>
 
-const char *HI3_TXS_SECTION_NAME_OLD = ".bh3";
-const char *HI3_TXS_SECTION_NAME_NEW = ".ace";
-
 const char *HI3_BASE_MODULE_NAME = "BH3Base.dll";
 const char *HI3_ASSEMBLY_PATH    = "BH3_Data\\Native\\UserAssembly.dll";
+const char *HI3_TXS_SECTION_NAME = ".ace";
 const char *HI3_TVM_SECTION_NAME = ".tvm0";
 
 
 void hi3_fill_data(struct game_data *buf) {
-    // !!! TEMPORARY WORKAROUND
-    // Name in exe matches name in base module
-    HMODULE exe = GetModuleHandleA(NULL);
-    if (pe_find_section(exe, HI3_TXS_SECTION_NAME_OLD)) {
-        // Old name
-        buf->txs_section_name = HI3_TXS_SECTION_NAME_OLD;
-    } else if (pe_find_section(exe, HI3_TXS_SECTION_NAME_NEW)) {
-        // New name
-        buf->txs_section_name = HI3_TXS_SECTION_NAME_NEW;
-    } else {
-        // This should not happen
-        msg_err_a("Could not determine region-specific section name. " ISSUE_SUFFIX);
-    }
-
     buf->base_module_name = HI3_BASE_MODULE_NAME;
     buf->assembly_path = HI3_ASSEMBLY_PATH;
+    buf->txs_section_name = HI3_TXS_SECTION_NAME;
     buf->tvm_section_name = HI3_TVM_SECTION_NAME;
 
     buf->unityplayer_callback = NULL;

game_payload/src/hsr.c

@@ -9,7 +9,7 @@ const char *HSR_ASSEMBLY_PATH    = "GameAssembly.dll";
 const char *HSR_TXS_SECTION_NAME = ".ace";
 const char *HSR_TVM_SECTION_NAME = ".tvm0";
 
-#define HSR_VERSION "1.3.0"
+#define HSR_VERSION "1.4.0"
 
 enum hsr_region {
     HSR_INVALID,
@@ -23,14 +23,14 @@ struct crc_region_pair {
 };
 
 const struct crc_region_pair HSR_REGIONS[] = {
-    { 0x748c8f9c, HSR_OS }, // os v1.3.0
+    { 0xbae3646f, HSR_OS }, // os v1.4.0
-    { 0x76e85a40, HSR_CN }  // cn v1.3.0
+    { 0x9e5c2f80, HSR_CN }  // cn v1.4.0
 };
 
 #define JUMP_SIZE (6 + sizeof(void*))
 
 // Temporarily hardcoded offset
-// v1.3.0, same for os and cn
+// v1.4.0, same for os and cn
 #define WTSUD_PATCH_OFFSET 0x16430
 
 char wtsud_original_bytes[JUMP_SIZE];

meson.build

@@ -1,4 +1,4 @@
-project('jadeite', 'c', version: '3.0.8')
+project('jadeite', 'c', version: '3.0.10')
 
 nasm = find_program('nasm')
 gen_res = find_program('gen_resources.sh')

metadata.json

@@ -1,42 +1,42 @@
 {
     "jadeite": {
-        "version": "3.0.8"
+        "version": "3.0.10"
     },
     "games": {
         "hi3rd": {
             "global": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             },
             "sea": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             },
             "china": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             },
             "taiwan": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             },
             "korea": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             },
             "japan": {
                 "status": "verified",
-                "version": "6.9.0"
+                "version": "7.0.0"
             }
         },
         "hsr": {
             "global": {
                 "status": "verified",
-                "version": "1.3.0"
+                "version": "1.4.0"
             },
             "china": {
                 "status": "verified",
-                "version": "1.3.0"
+                "version": "1.4.0"
             }
         }
     }