Adds initial Funkey S support

7 files changed, 86 insertions, 6 deletions

diff --git a/overrides/gpsp.h b/overrides/gpsp.h
index 44a35e0..86fc866 100644
--- a/overrides/gpsp.h
+++ b/overrides/gpsp.h
@@ -29,7 +29,7 @@ static const struct core_override_option gpsp_core_option_overrides[] = {
 	},
 	{
 		.key = "gpsp_frameskip_threshold",
-		.desc = "FS Threshold (%)",
+		.desc = "FS Threshold (%%)",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
 	},
 	{
diff --git a/overrides/mame2000.h b/overrides/mame2000.h
index 9d306c0..81af3fc 100644
--- a/overrides/mame2000.h
+++ b/overrides/mame2000.h
@@ -11,7 +11,7 @@ static const struct core_override_option mame2000_core_option_overrides[] = {
 	{
 		.key = "mame2000-frameskip_threshold",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
-		.retro_var_value = "FS Threshold (%); 30|40|50|60",
+		.retro_var_value = "FS Threshold (%%); 30|40|50|60",
 	},
 	{
 		.key = "mame2000-frameskip_interval",
diff --git a/overrides/pcsx_rearmed.h b/overrides/pcsx_rearmed.h
index e68724e..b35cc2d 100644
--- a/overrides/pcsx_rearmed.h
+++ b/overrides/pcsx_rearmed.h
@@ -12,7 +12,7 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 	},
 	{
 		.key = "pcsx_rearmed_frameskip_threshold",
-		.desc = "FS Threshold (%)",
+		.desc = "FS Threshold (%%)",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
 	},
 	{
diff --git a/overrides/picodrive.h b/overrides/picodrive.h
index aa1dc30..f0c9ca0 100644
--- a/overrides/picodrive.h
+++ b/overrides/picodrive.h
@@ -43,7 +43,7 @@ static const struct core_override_option picodrive_core_option_overrides[] = {
 	},
 	{
 		.key = "picodrive_frameskip_threshold",
-		.desc = "FS Threshold (%)",
+		.desc = "FS Threshold (%%)",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
 	},
 	{
diff --git a/overrides/snes9x2002.h b/overrides/snes9x2002.h
index fb54780..4cb3b5d 100644
--- a/overrides/snes9x2002.h
+++ b/overrides/snes9x2002.h
@@ -8,7 +8,7 @@ static const struct core_override_option snes9x2002_core_option_overrides[] = {
 	},
 	{
 		.key = "snes9x2002_frameskip_threshold",
-		.desc = "FS Threshold (%)",
+		.desc = "FS Threshold (%%)",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
 	},
 	{
diff --git a/overrides/snes9x2005.h b/overrides/snes9x2005.h
index 237a89a..b9c04a5 100644
--- a/overrides/snes9x2005.h
+++ b/overrides/snes9x2005.h
@@ -3,6 +3,7 @@
 static const struct core_override_option snes9x2005_core_option_overrides[] = {
 	{
 		.key = "snes9x_2005_region",
+		.desc = "Region",
 		.info = "'PAL' is 50hz, 'NTSC' is 60hz. Games will run faster or slower than normal if the incorrect region is selected.",
 	},
 	{
@@ -12,7 +13,7 @@ static const struct core_override_option snes9x2005_core_option_overrides[] = {
 	},
 	{
 		.key = "snes9x_2005_frameskip_threshold",
-		.desc = "FS Threshold (%)",
+		.desc = "FS Threshold (%%)",
 		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
 	},
 	{
@@ -33,7 +34,11 @@ static const struct core_override_option snes9x2005_core_option_overrides[] = {
 	},
 	{
 		.key = "snes9x_2005_dynarec",
+#ifdef FUNKEY_S
+		.default_value = "disabled",
+#else
 		.default_value = "enabled",
+#endif
 	},
 	{ NULL }
 };
diff --git a/overrides/snes9x2005_plus.h b/overrides/snes9x2005_plus.h
new file mode 100644
index 0000000..2720b45
--- /dev/null
+++ b/overrides/snes9x2005_plus.h
@@ -0,0 +1,75 @@
+#include "overrides.h"
+
+static const struct core_override_option snes9x2005_plus_core_option_overrides[] = {
+	{
+		.key = "snes9x_2005_region",
+		.desc = "Region",
+		.info = "'PAL' is 50hz, 'NTSC' is 60hz. Games will run faster or slower than normal if the incorrect region is selected.",
+	},
+	{
+		.key = "snes9x_2005_frameskip",
+		.info = "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+		.default_value = "auto"
+	},
+	{
+		.key = "snes9x_2005_frameskip_threshold",
+		.desc = "FS Threshold (%%)",
+		.info = "When 'Frameskip' is set to 'Threshold', sets how low the audio buffer can get before frames will be skipped.",
+	},
+	{
+		.key = "snes9x_2005_frameskip_interval",
+		.desc = "FS Interval",
+		.info = "The maximum number of frames that can be skipped before a new frame is rendered.",
+		.default_value = "3"
+	},
+	{
+		.key = "snes9x_2005_overclock_cycles",
+		.desc = "Overclock (Restart)",
+		.info = "Alleviate normal SNES slowdown. Compatible keeps as much compatibility as possible. Max will reduce more slowdown but break more games.",
+	},
+	{
+		.key = "snes9x_2005_reduce_sprite_flicker",
+		.desc = "Reduce Flicker",
+		.info = "Raises sprite limit to reduce flickering in games.",
+	},
+	{
+		.key = "snes9x_2005_dynarec",
+#ifdef FUNKEY_S
+		.default_value = "disabled",
+#else
+		.default_value = "enabled",
+#endif
+	},
+	{ NULL }
+};
+
+me_bind_action snes9x2005_plus_ctrl_actions[] =
+{
+	{ "UP       ",  1 << RETRO_DEVICE_ID_JOYPAD_UP},
+	{ "DOWN     ",  1 << RETRO_DEVICE_ID_JOYPAD_DOWN },
+	{ "LEFT     ",  1 << RETRO_DEVICE_ID_JOYPAD_LEFT },
+	{ "RIGHT    ",  1 << RETRO_DEVICE_ID_JOYPAD_RIGHT },
+	{ "A BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_A },
+	{ "B BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_B },
+	{ "X BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "Y BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_Y },
+	{ "START    ",  1 << RETRO_DEVICE_ID_JOYPAD_START },
+	{ "SELECT   ",  1 << RETRO_DEVICE_ID_JOYPAD_SELECT },
+	{ "L BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_L },
+	{ "R BUTTON ",  1 << RETRO_DEVICE_ID_JOYPAD_R },
+	{ NULL,       0 }
+};
+
+const struct core_override_fast_forward snes9x2005_plus_fast_forward = {
+	.type_key = "snes9x_2005_frameskip",
+	.type_value = "auto",
+	.interval_key = "snes9x_2005_frameskip_interval"
+};
+
+#define snes9x2005_plus_overrides {                        \
+	.core_name = "snes9x2005_plus",                          \
+	.fast_forward = &snes9x2005_plus_fast_forward,           \
+	.actions = snes9x2005_plus_ctrl_actions,                 \
+	.action_size = array_size(snes9x2005_plus_ctrl_actions), \
+	.options = snes9x2005_plus_core_option_overrides         \
+}