diff --git a/festo/ultimate/categories.cc b/festo/ultimate/categories.cc index d9b884d..30320cc 100644 --- a/festo/ultimate/categories.cc +++ b/festo/ultimate/categories.cc @@ -184,13 +184,15 @@ const std::vector extra_category_layout = { // Ultimate invalidates a lot of existing categories and adds our own. // Custom categories are prepended to the list, so we can totally replace // them by fully specifying it here - {SORT_ROOT, 5, { + {SORT_ROOT, 7, { // SORT_ROOT in SORT_ROOT is the "Select a category" icon {SORT_ROOT, SORT_CUSTOM_ULTIMATE, SORT_CUSTOM_WESTERN}, {SORT_ALL, SORT_CATEGORY_VERSION, SORT_CATEGORY_GENRE}, {SORT_CATEGORY_LEVEL, SORT_CATEGORY_NAME, SORT_CATEGORY_ARTIST}, - {SORT_HOLD, SORT_TARGET_MUSIC, SORT_THIS_WEEK_RECOMMENDED}, - {SORT_TUNE_RUN}, + {SORT_TARGET_MUSIC, SORT_HOLD, SORT_FULLCOMBO_CHALLENGE}, + {SORT_CATEGORY_PERFORMANCE, SORT_MYBEST, SORT_YOU_MIGHT_LIKE}, + {SORT_THIS_WEEK_RECOMMENDED, SORT_NATIONAL_POPULAR, SORT_TUNE_RUN}, + {SORT_IS_NEW}, }}, {SORT_CATEGORY_VERSION, 5, { {SORT_NULL, SORT_VER_jubeat, SORT_VER_ripples}, diff --git a/festo/ultimate/category_hooks.cc b/festo/ultimate/category_hooks.cc index 9482351..9541309 100644 --- a/festo/ultimate/category_hooks.cc +++ b/festo/ultimate/category_hooks.cc @@ -364,16 +364,19 @@ void category_hooks_init(HANDLE process, const MODULEINFO &jubeat_info) reinterpret_cast(hierarchy_textures_end); const uintptr_t hierarchy_textures_end_new_loc = reinterpret_cast( extra_hierarchy_textures.data() + extra_hierarchy_textures.size()); - do_patch( - process, - jubeat_info, - { - .name = "hierarchy textures (end)", - // cmp eax, offset aAssertionFailed - .pattern = { 0x3D, U32_TO_CONST_BYTES_LE(hierarchy_textures_end_loc) }, - .data = { U32_TO_CONST_BYTES_LE(hierarchy_textures_end_new_loc) }, - .data_offset = 1, - }); + // 8 of these too + for (int i = 0; i < 8; i++) { + do_patch( + process, + jubeat_info, + { + .name = "hierarchy textures (end)", + // cmp eax, offset aAssertionFailed + .pattern = { 0x3D, U32_TO_CONST_BYTES_LE(hierarchy_textures_end_loc) }, + .data = { U32_TO_CONST_BYTES_LE(hierarchy_textures_end_new_loc) }, + .data_offset = 1, + }); + } init_done = true; } diff --git a/meson.build b/meson.build index 58959c0..60a2823 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,7 @@ cc = meson.get_compiler('c') add_project_arguments( '-DWIN32_LEAN_AND_MEAN', - '-DOMNIMIX_VERSION="4.0.0_RC3"', + '-DOMNIMIX_VERSION="4.0.0_RC4"', #'-DVERBOSE', language: [ 'c',