From f2e789058be9f1d0bd4e66ced2da0519ddd04ea8 Mon Sep 17 00:00:00 2001 From: esuo1198 <54134.es@gmail.com> Date: Sun, 24 Mar 2024 01:59:36 +0900 Subject: [PATCH] Reorder version --- meson.build | 2 +- src/patches/qr.cpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 402bbd6..e6c701b 100644 --- a/meson.build +++ b/meson.build @@ -67,8 +67,8 @@ library( 'src/poll.cpp', 'src/bnusio.cpp', 'src/patches/jp_nov_2020.cpp', - 'src/patches/cn_jun_2023.cpp', 'src/patches/jp_apr_2023.cpp', + 'src/patches/cn_jun_2023.cpp', 'src/patches/amauth.cpp', 'src/patches/qr.cpp', ], diff --git a/src/patches/qr.cpp b/src/patches/qr.cpp index 66cf0e3..77bf813 100644 --- a/src/patches/qr.cpp +++ b/src/patches/qr.cpp @@ -203,18 +203,6 @@ Init () { INSTALL_HOOK_DYNAMIC (copy_data, (LPVOID)(amHandle + 0x1C2A0)); break; } - case GameVersion::CN_JUN_2023: { - INSTALL_HOOK_DYNAMIC (qrInit, (LPVOID)(amHandle + 0x161B0)); - INSTALL_HOOK_DYNAMIC (qrRead, (LPVOID)(amHandle + 0x163A0)); - INSTALL_HOOK_DYNAMIC (qrClose, (LPVOID)(amHandle + 0x16350)); - INSTALL_HOOK_DYNAMIC (callQrUnknown, (LPVOID)(amHandle + 0x8F60)); - INSTALL_HOOK_DYNAMIC (Send1, (LPVOID)(amHandle + 0x16A30)); - INSTALL_HOOK_DYNAMIC (Send2, (LPVOID)(amHandle + 0x16A00)); - INSTALL_HOOK_DYNAMIC (Send3, (LPVOID)(amHandle + 0x16990)); - INSTALL_HOOK_DYNAMIC (Send4, (LPVOID)(amHandle + 0x16940)); - INSTALL_HOOK_DYNAMIC (copy_data, (LPVOID)(amHandle + 0x169D0)); - break; - } case GameVersion::JP_APR_2023: { INSTALL_HOOK_DYNAMIC (qrInit, (LPVOID)(amHandle + 0x1EDC0)); INSTALL_HOOK_DYNAMIC (qrRead, (LPVOID)(amHandle + 0x1EFB0)); @@ -227,6 +215,18 @@ Init () { INSTALL_HOOK_DYNAMIC (copy_data, (LPVOID)(amHandle + 0x1F630)); break; } + case GameVersion::CN_JUN_2023: { + INSTALL_HOOK_DYNAMIC (qrInit, (LPVOID)(amHandle + 0x161B0)); + INSTALL_HOOK_DYNAMIC (qrRead, (LPVOID)(amHandle + 0x163A0)); + INSTALL_HOOK_DYNAMIC (qrClose, (LPVOID)(amHandle + 0x16350)); + INSTALL_HOOK_DYNAMIC (callQrUnknown, (LPVOID)(amHandle + 0x8F60)); + INSTALL_HOOK_DYNAMIC (Send1, (LPVOID)(amHandle + 0x16A30)); + INSTALL_HOOK_DYNAMIC (Send2, (LPVOID)(amHandle + 0x16A00)); + INSTALL_HOOK_DYNAMIC (Send3, (LPVOID)(amHandle + 0x16990)); + INSTALL_HOOK_DYNAMIC (Send4, (LPVOID)(amHandle + 0x16940)); + INSTALL_HOOK_DYNAMIC (copy_data, (LPVOID)(amHandle + 0x169D0)); + break; + } default: { break; }