Consolidate Patches

impeeza · Oct 24, 2024 · aff2498 · aff2498
1 parent c7aee42
commit aff2498
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/overlay/src/main.cpp b/overlay/src/main.cpp
@@ -117,8 +117,7 @@ class GuiToggle final : public tsl::Gui {
         list->addItem(config_es4.create_list_item("es4"));
         list->addItem(config_es5.create_list_item("es5"));
         list->addItem(config_es6.create_list_item("es6"));
-        list->addItem(config_es7fw18.create_list_item("es7_FW18"));
-        list->addItem(config_es7fw1819.create_list_item("es7_FW18-19"));
+        list->addItem(config_es7.create_list_item("es7"));
 
         list->addItem(new tsl::elm::CategoryHeader("NIFM - 010000000000000F"));
         list->addItem(config_ctest.create_list_item("ctest"));
@@ -141,8 +140,7 @@ class GuiToggle final : public tsl::Gui {
     ConfigEntry config_es4{"es", "es4", true};
     ConfigEntry config_es5{"es", "es5", true};
     ConfigEntry config_es6{"es", "es6", true};
-    ConfigEntry config_es7fw18{"es", "es7_FW18", true};
-    ConfigEntry config_es7fw1819{"es", "es7_FW18-19", true};
+    ConfigEntry config_es7{"es", "es7", true};
     ConfigEntry config_ctest{"nifm", "ctest", false};
 };
 

diff --git a/sysmod/src/main.cpp b/sysmod/src/main.cpp
@@ -254,10 +254,8 @@ constinit Patterns es_patterns[] = {
     { "es3", "0xF3031FAA02000014", -4, 0, bne_cond, nop_patch, nop_applied, true, FW_VER_ANY, MAKEHOSVERSION(10,2,0) },
     { "es4", "0xC0FDFF35A8C35838", -4, 0, mov_cond, nop_patch, nop_applied, true, MAKEHOSVERSION(11,0,0), MAKEHOSVERSION(13,2,1) },
     { "es5", "0xE023009145EEFF97", -4, 0, cbz_cond, b_patch, b_applied, true, MAKEHOSVERSION(11,0,0), MAKEHOSVERSION(13,2,1) },
-    { "es6", "0x.6300...0094A0..D1..FF97", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(14,0,0), MAKEHOSVERSION(17,0,1) },
-    //new good patch tested on fw 18-19
-    { "es7_FW18", "0x.6F00...0094A0..D1..FF97", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(18,0,0) },
-    { "es7_FW18-19", "0xFF97..132A...A9........FF.0491C0035FD6", 2, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(18,0,0), MAKEHOSVERSION(19,0,0) },
+    { "es6", "0x..00...0094A0..D1..FF97", 16, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(14,0,0), MAKEHOSVERSION(18,1,0) },
+    { "es7", "0xFF97..132A...A9........FF.0491C0035FD6", 2, 0, mov2_cond, mov0_patch, mov0_applied, true, MAKEHOSVERSION(18,0,0), MAKEHOSVERSION(19,0,0) },
 };
 
 constinit Patterns nifm_patterns[] = {