CrazyRedMachine/popnhax
1
0
Fork 0
forked from Popn_Tools/popnhax
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup for music limit check

Browse Source
This commit is contained in:
CrazyRedMachine 2024-05-01 04:55:37 +02:00
parent 1f630edb10
commit dc63a6df08
1 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
popnhax/dllmain.cc
View File

@ -1484,20 +1484,6 @@ static bool patch_database() {
DWORD dllSize = 0; DWORD dllSize = 0;
char *data = getDllData(g_game_dll_fn, &dllSize); char *data = getDllData(g_game_dll_fn, &dllSize);
patch_purelong();
{
int64_t pattern_offset = search(data, dllSize, "\x8D\x44\x24\x10\x88\x4C\x24\x10\x88\x5C\x24\x11\x8D\x50\x01", 15, 0);
if (pattern_offset != -1) {
uint64_t patch_addr = (int64_t)data + pattern_offset;
MH_CreateHook((LPVOID)patch_addr, (LPVOID)omnimix_patch_jbx,
(void **)&real_omnimix_patch_jbx);
LOG("popnhax: Patched X rev for omnimix\n");
} else {
LOG("popnhax: Couldn't find rev patch\n");
}
}
char *target; char *target;
if (config.patch_xml_auto) { if (config.patch_xml_auto) {
@ -1581,7 +1567,8 @@ static bool patch_database() {
} }
if (!found) { if (!found) {
LOG("popnhax: patch_db: matching datecode or limit not found, defaulting to latest patch file (will probably crash).\n"); LOG("popnhax: patch_db: matching %s not found, please add the correct patch xml file in data_mods folder.\n", (music_limit == 0) ? "datecode" : "music limit");
return false;
} }
LOG("popnhax: patch_db: using %s\n",filename); LOG("popnhax: patch_db: using %s\n",filename);
@ -1627,6 +1614,21 @@ static bool patch_database() {
); );
limit_table[STYLE_TABLE_IDX] = new_limit_table[STYLE_TABLE_IDX]; limit_table[STYLE_TABLE_IDX] = new_limit_table[STYLE_TABLE_IDX];
patch_purelong();
{
int64_t pattern_offset = search(data, dllSize, "\x8D\x44\x24\x10\x88\x4C\x24\x10\x88\x5C\x24\x11\x8D\x50\x01", 15, 0);
if (pattern_offset != -1) {
uint64_t patch_addr = (int64_t)data + pattern_offset;
MH_CreateHook((LPVOID)patch_addr, (LPVOID)omnimix_patch_jbx,
(void **)&real_omnimix_patch_jbx);
LOG("popnhax: Patched X rev for omnimix\n");
} else {
LOG("popnhax: Couldn't find rev patch\n");
}
}
if (config.disable_redirection) { if (config.disable_redirection) {
LOG("Redirection-related code is disabled, buffer address, buffer size and related patches will not be applied"); LOG("Redirection-related code is disabled, buffer address, buffer size and related patches will not be applied");
printf("Redirection-related code is disabled, buffer address, buffer size and related patches will not be applied"); printf("Redirection-related code is disabled, buffer address, buffer size and related patches will not be applied");
@ -5683,13 +5685,15 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
} }
if (config.patch_db) { if (config.patch_db) {
LOG("popnhax: patching songdb\n");
/* must be called after force_datecode */ /* must be called after force_datecode */
patch_db_power_points(); LOG("popnhax: patching songdb\n");
patch_db_fix_cursor(); if ( patch_database() )
if (config.custom_categ) {
patch_custom_categs(g_game_dll_fn, &config); patch_db_power_points();
patch_database(); patch_db_fix_cursor();
if (config.custom_categ)
patch_custom_categs(g_game_dll_fn, &config);
}
} }
if (config.force_unlocks) { if (config.force_unlocks) {