v3.0.12

README.md

@@ -1,6 +1,6 @@
 ### Games and regions
-- **3rd**: glb/sea/tw/kr/jp **v7.0.0+**, cn **v7.1.0+**
+- **3rd**: glb/sea/tw/kr/jp **v7.1.0+**, cn **v7.2.0+**
-- **SR**: os/cn **v1.5.0** (WARNING: currently potentially unsafe, there were some concerning changes in the last update)
+- **SR**: os/cn **v1.6.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.
 
@@ -17,7 +17,7 @@ The anticheat the games use is fundamentally incompatible with Wine in multiple
 **Wine 8.0+ is recommended**, as lower versions leak "The Wine project" as the device identifier. Not critical, but taking a precaution never hurt anyone. **DXVK is strongly recommended.**
 
 **3rd-specific**: 
-- ~~In some cases, and if you're not using Proton GE, a fix for Media Foundation may be required to play videos. The Game may crash without it.  You can download it from [here](https://github.com/z0z0z/mf-install).~~ **Unfortunately, it appears like the fix is no longer available, please use [Wine-GE-Proton](https://github.com/GloriousEggroll/wine-ge-custom) instead.** 
+- **Wine 8.21+ or [Wine-GE-Proton](https://github.com/GloriousEggroll/wine-ge-custom) is required to play videos. The game may show a black screen or crash on lower versions.** 
 - You might need to [limit the number of cores available to the game](https://github.com/z0z0z/mf-install/issues/44) if your CPU has more than 8.
 
 Manual usage instructions:

game_payload/meson.build

@@ -9,11 +9,13 @@ sources = [
     'src/ace.c',
     'src/pe.c',
     'src/game.c',
-    'src/hi3.c',
-    'src/hsr.c',
     'src/utils.c',
     'src/msg.c',
-    'src/tx.c'
+    'src/tx.c',
+
+    'src/hi3/hi3.c',
+    
+    'src/hsr/hsr.c'
 ]
 
 if fs.exists('src/core.c')

game_payload/src/hsr/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.5.0"
+#define HSR_VERSION "1.6.0"
 
 enum hsr_region {
     HSR_INVALID,
@@ -23,15 +23,15 @@ struct crc_region_pair {
 };
 
 const struct crc_region_pair HSR_REGIONS[] = {
-    { 0xb90cbc61, HSR_OS }, // os v1.5.0
+    { 0x5741ce50, HSR_OS }, // os v1.6.0
-    { 0xee3eebfb, HSR_CN }  // cn v1.5.0
+    { 0xce891f97, HSR_CN }  // cn v1.6.0
 };
 
 #define JUMP_SIZE (6 + sizeof(void*))
 
 // Temporarily hardcoded offset
-// v1.5.0, same for os and cn
+// v1.6.0, same for os and cn
-#define WTSUD_PATCH_OFFSET 0x1b800 // 0x16550 will also work
+#define WTSUD_PATCH_OFFSET 0x16510
 
 char wtsud_original_bytes[JUMP_SIZE];
 char *wtsud_patch_addr;

meson.build

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

metadata.json

@@ -1,42 +1,42 @@
 {
     "jadeite": {
-        "version": "3.0.11"
+        "version": "3.0.12"
     },
     "games": {
         "hi3rd": {
             "global": {
                 "status": "verified",
-                "version": "7.0.0"
+                "version": "7.1.0"
             },
             "sea": {
                 "status": "verified",
-                "version": "7.0.0"
+                "version": "7.1.0"
             },
             "china": {
                 "status": "verified",
-                "version": "7.1.0"
+                "version": "7.2.0"
             },
             "taiwan": {
                 "status": "verified",
-                "version": "7.0.0"
+                "version": "7.1.0"
             },
             "korea": {
                 "status": "verified",
-                "version": "7.0.0"
+                "version": "7.1.0"
             },
             "japan": {
                 "status": "verified",
-                "version": "7.0.0"
+                "version": "7.1.0"
             }
         },
         "hsr": {
             "global": {
-                "status": "concerning",
+                "status": "unverified",
-                "version": "1.5.0"
+                "version": "1.6.0"
             },
             "china": {
-                "status": "concerning",
+                "status": "unverified",
-                "version": "1.5.0"
+                "version": "1.6.0"
             }
         }
     }