diff --git a/festo/common/festo.cc b/festo/common/festo.cc index ea8c9e0..24fc1bc 100644 --- a/festo/common/festo.cc +++ b/festo/common/festo.cc @@ -103,15 +103,21 @@ static void *__cdecl mem_set(void *s, int c, size_t n) } void festo_apply_common_patches( - HANDLE process, HMODULE jubeat_handle, const MODULEINFO &music_db_info) + HANDLE process, + HMODULE jubeat_handle, + const MODULEINFO &jubeat_info, + const MODULEINFO &music_db_info) { + // jubeat.dll + do_patch(process, jubeat_info, marker_unlock_patch_1); + do_patch(process, jubeat_info, marker_unlock_patch_2); + do_patch(process, jubeat_info, marker_unlock_patch_3); + do_patch(process, jubeat_info, background_unlock_patch_1); + do_patch(process, jubeat_info, background_unlock_patch_2); + do_patch(process, jubeat_info, background_unlock_patch_3); + + // music_db.dll do_patch(process, music_db_info, song_unlock_patch); - do_patch(process, jubeat_handle, marker_unlock_patch_1); - do_patch(process, jubeat_handle, marker_unlock_patch_2); - do_patch(process, jubeat_handle, marker_unlock_patch_3); - do_patch(process, jubeat_handle, background_unlock_patch_1); - do_patch(process, jubeat_handle, background_unlock_patch_2); - do_patch(process, jubeat_handle, background_unlock_patch_3); // increase d3 texture memory so all our added banners don't crash the game hook_iat_ordinal( diff --git a/festo/common/festo.h b/festo/common/festo.h index 2d53648..00be646 100644 --- a/festo/common/festo.h +++ b/festo/common/festo.h @@ -3,4 +3,7 @@ #include "util/patch.h" void festo_apply_common_patches( - HANDLE process, HMODULE jubeat_module, const MODULEINFO &music_db_info); + HANDLE process, + HMODULE jubeat_handle, + const MODULEINFO &jubeat_info, + const MODULEINFO &music_db_info); diff --git a/festo/omnimix/omnimix.cc b/festo/omnimix/omnimix.cc index b21a497..5bcc6b3 100644 --- a/festo/omnimix/omnimix.cc +++ b/festo/omnimix/omnimix.cc @@ -105,7 +105,7 @@ extern "C" DLL_EXPORT bool __cdecl omnimix_dll_entry_init(char *sid_code, void * log_fatal("GetModuleInformation(\"music_db.dll\") failed: %08lx", GetLastError()); } - festo_apply_common_patches(process, jubeat_handle, music_db_info); + festo_apply_common_patches(process, jubeat_handle, jubeat_info, music_db_info); do_patch(process, jubeat_info, packlist); do_patch(process, music_db_info, music_db_limit_1); diff --git a/festo/ultimate/ultimate.cc b/festo/ultimate/ultimate.cc index 5737356..626ad8b 100644 --- a/festo/ultimate/ultimate.cc +++ b/festo/ultimate/ultimate.cc @@ -379,7 +379,7 @@ extern "C" DLL_EXPORT bool __cdecl ultimate_dll_entry_init(char *sid_code, void hook_music_db(process, jubeat_handle, music_db_handle); hook_pkfs_fs_open(process, pkfs_handle); bnr_hook_init(jubeat_info, BNR_TEXTURES); - festo_apply_common_patches(process, jubeat_handle, music_db_info); + festo_apply_common_patches(process, jubeat_handle, jubeat_info, music_db_info); CloseHandle(process);