v3.0.6

README.md

@@ -1,8 +1,8 @@
 ### Games and regions
-- **3rd**: glb/sea/cn/tw/kr/jp **v6.8.0+**
+- **3rd**: glb/sea/tw/kr/jp **v6.8.0**, **cn v6.9.0 broken**
 - **SR**: os/cn **v1.2.0** (potentially unsafe, but no bans were reported since v1.1.0) 
 
-**You can expect newer versions of 3rd to work immediately after release with the same jadeite binary.** However, that is not the case for SR: you will have to update your jadeite binary to run newer versions.
+~~You can expect newer versions of 3rd to work immediately after release with the same jadeite binary. However, that is not the case for SR: you will have to update your jadeite binary to run newer versions.~~ 6.9.0 investigation is in progress, please wait. #25
 
 ### 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

@@ -3,16 +3,28 @@
 
 #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 = ".bh3";
 const char *HI3_TVM_SECTION_NAME = ".tvm0";
 
 
 void hi3_fill_data(struct game_data *buf) {
+    // !!! TEMPORARY WORKAROUND FOR HI3 6.8.0 -> 6.9.0
+    const uint32_t NEW_CHECKSUM = 0x885b4c63;
+
+    uint32_t crc = utils_file_crc32c(L"UnityPlayer.dll");
+
+    if (crc == NEW_CHECKSUM) {
+        buf->txs_section_name = HI3_TXS_SECTION_NAME_NEW;
+    } else {
+        buf->txs_section_name = HI3_TXS_SECTION_NAME_OLD;
+    }
+
     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/tx.c

@@ -28,6 +28,10 @@ void tx_table_file(struct game_data *game, wchar_t *buf) {
 
     // Checksum the TXS section
     IMAGE_SECTION_HEADER *txsSection = pe_find_section(baseMap, game->txs_section_name);
+    if (!txsSection) {
+        msg_err_a("Could not find %s in %s. " ISSUE_SUFFIX, game->txs_section_name, game->base_module_name);
+    }
+
     uint32_t txsChecksum = crc32c(0, baseMap + txsSection->PointerToRawData, txsSection->SizeOfRawData);
 
     // Format the path

meson.build

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

metadata.json

@@ -1,6 +1,6 @@
 {
     "jadeite": {
-        "version": "3.0.5"
+        "version": "3.0.6"
     },
     "games": {
         "hi3rd": {
@@ -14,7 +14,7 @@
             },
             "china": {
                 "status": "verified",
-                "version": "6.8.0"
+                "version": "6.9.0"
             },
             "taiwan": {
                 "status": "verified",