Renames core patch files

First numbers for upstreamable patches. Later numbers for
picoarch-specific patches.

3 files changed, 20 insertions, 11 deletions

diff --git a/patches/snes9x2005/1000-frameskip-interval.patch b/patches/snes9x2005/0001-frameskip-interval.patch
index eb920c7..0025b76 100644
--- a/patches/snes9x2005/1000-frameskip-interval.patch
+++ b/patches/snes9x2005/0001-frameskip-interval.patch
@@ -59,12 +59,12 @@ index c368d8f..305adee 100644
              IPPU.RenderThisFrame = false;
              frameskip_counter++;
 diff --git a/libretro_core_options.h b/libretro_core_options.h
-index b32864a..b69d19a 100644
+index 032cefd..14bf8d8 100644
 --- a/libretro_core_options.h
 +++ b/libretro_core_options.h
 @@ -71,9 +71,9 @@ struct retro_core_option_definition option_defs_us[] = {
        "Frameskip",
-       "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+       "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Manual' utilises the 'Frameskip Threshold (%)' setting.",
        {
 -         { "disabled", NULL },
 -         { "auto",     "Auto" },
@@ -74,14 +74,14 @@ index b32864a..b69d19a 100644
 +         { "auto_threshold", "Threshold" },
           { NULL, NULL },
        },
-       "auto"
+       "disabled"
 @@ -103,6 +103,26 @@ struct retro_core_option_definition option_defs_us[] = {
        },
        "33"
     },
 +   {
 +      "catsfc_frameskip_interval",
-+      "FS Interval",
++      "Frameskip Interval",
 +      "The maximum number of frames that can be skipped before a new frame is rendered.",
 +      {
 +         { "0",  NULL },
@@ -101,4 +101,4 @@ index b32864a..b69d19a 100644
 +   },
     {
        "catsfc_overclock_cycles",
-       "Overclock (Restart)",
+       "Reduce Slowdown (Hack, Unsafe, Restart)",
diff --git a/patches/snes9x2005/0001-trimui-support.patch b/patches/snes9x2005/1000-trimui-support.patch
index 9424312..9424312 100644
--- a/patches/snes9x2005/0001-trimui-support.patch
+++ b/patches/snes9x2005/1000-trimui-support.patch
diff --git a/patches/snes9x2005/0002-core-options.patch b/patches/snes9x2005/1001-core-options.patch
index 7f43e83..47a419c 100644
--- a/patches/snes9x2005/0002-core-options.patch
+++ b/patches/snes9x2005/1001-core-options.patch
@@ -1,5 +1,5 @@
 diff --git a/libretro_core_options.h b/libretro_core_options.h
-index 032cefd..b32864a 100644
+index 14bf8d8..b69d19a 100644
 --- a/libretro_core_options.h
 +++ b/libretro_core_options.h
 @@ -57,7 +57,7 @@ struct retro_core_option_definition option_defs_us[] = {
@@ -18,9 +18,9 @@ index 032cefd..b32864a 100644
 -      "Skip frames to avoid audio buffer under-run (crackling). Improves performance at the expense of visual smoothness. 'Auto' skips frames when advised by the frontend. 'Manual' utilises the 'Frameskip Threshold (%)' setting.",
 +      "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
        {
-          { "disabled", NULL },
-          { "auto",     "Auto" },
-          { "manual",   "Manual" },
+          { "disabled",       NULL },
+          { "auto",           "Auto" },
+          { "auto_threshold", "Threshold" },
           { NULL, NULL },
        },
 -      "disabled"
@@ -35,7 +35,16 @@ index 032cefd..b32864a 100644
        {
           { "15", NULL },
           { "18", NULL },
-@@ -105,8 +105,8 @@ struct retro_core_option_definition option_defs_us[] = {
+@@ -105,7 +105,7 @@ struct retro_core_option_definition option_defs_us[] = {
+    },
+    {
+       "catsfc_frameskip_interval",
+-      "Frameskip Interval",
++      "FS Interval",
+       "The maximum number of frames that can be skipped before a new frame is rendered.",
+       {
+          { "0",  NULL },
+@@ -125,8 +125,8 @@ struct retro_core_option_definition option_defs_us[] = {
     },
     {
        "catsfc_overclock_cycles",
@@ -46,7 +55,7 @@ index 032cefd..b32864a 100644
        {
           { "disabled",   NULL },
           { "compatible", "Compatible" },
-@@ -117,7 +117,7 @@ struct retro_core_option_definition option_defs_us[] = {
+@@ -137,7 +137,7 @@ struct retro_core_option_definition option_defs_us[] = {
     },
     {
        "catsfc_reduce_sprite_flicker",