Updates cores and moves to snes9x2005 fork

7 files changed, 128 insertions, 19 deletions

diff --git a/overrides/beetle-pce-fast.h b/overrides/beetle-pce-fast.h
index a16b044..010dc8f 100644
--- a/overrides/beetle-pce-fast.h
+++ b/overrides/beetle-pce-fast.h
@@ -20,36 +20,36 @@ static const struct core_override_option beetle_pce_fast_core_option_overrides[]
 		.desc = "FS Interval",
 	},
 	{
-		.key = "pce_hoverscan",
+		.key = "pce_fast_hoverscan",
 		.desc = "Horiz. Overscan",
 		.info = "Modify the horizontal overscan. (352 Width Mode Only)",
 	},
 	{
-		.key = "pce_turbo_toggling",
+		.key = "pce_fast_turbo_toggling",
 		.info = "Change III / IV to Toggle Turbo II / Toggle Turbo I",
 	},
 	{
-		.key = "pce_sound_channel_0_volume",
+		.key = "pce_fast_sound_channel_0_volume",
 		.desc = "Channel 0 Volume",
 	},
 	{
-		.key = "pce_sound_channel_1_volume",
+		.key = "pce_fast_sound_channel_1_volume",
 		.desc = "Channel 1 Volume",
 	},
 	{
-		.key = "pce_sound_channel_2_volume",
+		.key = "pce_fast_sound_channel_2_volume",
 		.desc = "Channel 2 Volume",
 	},
 	{
-		.key = "pce_sound_channel_3_volume",
+		.key = "pce_fast_sound_channel_3_volume",
 		.desc = "Channel 3 Volume",
 	},
 	{
-		.key = "pce_sound_channel_4_volume",
+		.key = "pce_fast_sound_channel_4_volume",
 		.desc = "Channel 4 Volume",
 	},
 	{
-		.key = "pce_sound_channel_5_volume",
+		.key = "pce_fast_sound_channel_5_volume",
 		.desc = "Channel 5 Volume",
 	},
 	{
@@ -57,20 +57,24 @@ static const struct core_override_option beetle_pce_fast_core_option_overrides[]
 		.desc = "CD Cache (Restart)",
 	},
 	{
-		.key = "pce_ocmultiplier",
+		.key = "pce_fast_cdbios",
+		.desc = "CD BIOS (Restart)",
+	},
+	{
+		.key = "pce_fast_ocmultiplier",
 		.desc = "Overclock (Restart)",
 		.info = "Overclock the emulated CPU by selected multiplier.",
 	},
 	{
-		.key = "pce_disable_softreset",
+		.key = "pce_fast_disable_softreset",
 		.desc = "Disable Soft Reset",
 	},
 	{
-		.key = "pce_mouse_sensitivity",
+		.key = "pce_fast_mouse_sensitivity",
 		.blocked = true,
 	},
 	{
-		.key = "pce_turbo_toggle_hotkey",
+		.key = "pce_fast_turbo_toggle_hotkey",
 		.blocked = true,
 	},
 	{ NULL }
diff --git a/overrides/fceumm.h b/overrides/fceumm.h
index e0fbc10..71d8f6e 100644
--- a/overrides/fceumm.h
+++ b/overrides/fceumm.h
@@ -50,6 +50,10 @@ static const struct core_override_option fceumm_core_option_overrides[] = {
 		.desc = "Show Snd Options",
 	},
 	{
+		.key = "fceumm_game_genie",
+		.blocked = true
+	},
+	{
 		.key = "fceumm_zapper_mode",
 		.blocked = true
 	},
diff --git a/overrides/fmsx.h b/overrides/fmsx.h
index 5365c83..06f66ec 100644
--- a/overrides/fmsx.h
+++ b/overrides/fmsx.h
@@ -2,6 +2,10 @@
 
 static const struct core_override_option fmsx_core_option_overrides[] = {
 	{
+		.key = "fmsx_hires",
+		.retro_var_value = "High res; Off|Interlaced|Progressive"
+	},
+	{
 		.key = "fmsx_mapper_type_mode",
 		.retro_var_value = "Mapper Type; "
 			"Guess Mapper Type A|"
@@ -23,6 +27,74 @@ static const struct core_override_option fmsx_core_option_overrides[] = {
 		.key = "fmsx_autospace",
 		.retro_var_value = "Autofire SPACE; No|Yes"
 	},
+	{
+		.key = "fmsx_phantom_disk",
+		.retro_var_value = "Make empty disk; No|Yes"
+	},
+	{
+		.key = "fmsx_custom_keyboard_up",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_down",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_left",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_right",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_a",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_b",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_y",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_x",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_start",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_select",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_l",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_r",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_l2",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_r2",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_l3",
+		.blocked = true
+	},
+	{
+		.key = "fmsx_custom_keyboard_r3",
+		.blocked = true
+	},
 	{ NULL }
 };
 
diff --git a/overrides/mame2000.h b/overrides/mame2000.h
index f3912f7..9d306c0 100644
--- a/overrides/mame2000.h
+++ b/overrides/mame2000.h
@@ -1,3 +1,4 @@
+#include "main.h"
 #include "overrides.h"
 
 static const struct core_override_option mame2000_core_option_overrides[] = {
@@ -57,17 +58,27 @@ me_bind_action mame2000_ctrl_actions[] =
 	{ NULL,       0 }
 };
 
+me_bind_action mame2000_emu_actions[] =
+{
+	{ "Toggle FPS/CPU%  ", 1 << EACTION_TOGGLE_HUD },
+	{ "Toggle FF        ", 1 << EACTION_TOGGLE_FF },
+	{ "Take Screenshot  ", 1 << EACTION_SCREENSHOT },
+	{ NULL,                0 }
+};
+
 const struct core_override_fast_forward mame2000_fast_forward = {
 	.type_key = "mame2000-frameskip",
 	.type_value = "auto",
 	.interval_key = "mame2000-frameskip_interval"
 };
 
-#define mame2000_overrides {                              \
-	.core_name = "mame2000",                          \
-	.fast_forward = &mame2000_fast_forward,           \
-	.actions = mame2000_ctrl_actions,                 \
-	.action_size = array_size(mame2000_ctrl_actions), \
-	.options = mame2000_core_option_overrides,        \
-	.block_load_content = 1                           \
+#define mame2000_overrides {                           \
+	.core_name = "mame2000",                             \
+	.fast_forward = &mame2000_fast_forward,              \
+	.actions = mame2000_ctrl_actions,                    \
+	.action_size = array_size(mame2000_ctrl_actions),    \
+	.emu_actions = mame2000_emu_actions,                 \
+	.emu_action_size = array_size(mame2000_emu_actions), \
+	.options = mame2000_core_option_overrides,           \
+	.block_load_content = 1                              \
 }
diff --git a/overrides/pcsx_rearmed.h b/overrides/pcsx_rearmed.h
index daf0ea6..e68724e 100644
--- a/overrides/pcsx_rearmed.h
+++ b/overrides/pcsx_rearmed.h
@@ -154,6 +154,10 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 		.key = "pcsx_rearmed_display_internal_fps",
 		.blocked = true
 	},
+	{
+		.key = "pcsx_rearmed_icache_emulation",
+		.blocked = true
+	},
 	{ NULL }
 };
 
diff --git a/overrides/smsplus.h b/overrides/smsplus.h
index e540f18..1895792 100644
--- a/overrides/smsplus.h
+++ b/overrides/smsplus.h
@@ -2,7 +2,13 @@
 
 static const struct core_override_option smsplus_core_option_overrides[] = {
 	{
+		.key = "smsplus_sms_bios",
+		.desc = "SMS BIOS (Restart)",
+		.info = "Use official BIOS/bootloader, if present in the system directory.",
+	},
+	{
 		.key = "smsplus_hardware",
+		.desc = "Hardware (Restart)",
 		.options = {
 			{ "auto",             NULL     },
 			{ "master system",    "sms"    },
@@ -14,6 +20,10 @@ static const struct core_override_option smsplus_core_option_overrides[] = {
 		},
 	},
 	{
+		.key = "smsplus_region",
+		.desc = "Region (Restart)",
+	},
+	{
 		.key = "smsplus_fm_sound",
 		.desc = "Use FM (Restart)",
 		.info = "Use FM Sound for some Master System games to enable enhanced music. Some games need Region set to ntsc-j (e.g. Wonder Boy III). Needs restart.",
diff --git a/overrides/snes9x2005.h b/overrides/snes9x2005.h
index af2f0ff..237a89a 100644
--- a/overrides/snes9x2005.h
+++ b/overrides/snes9x2005.h
@@ -31,6 +31,10 @@ static const struct core_override_option snes9x2005_core_option_overrides[] = {
 		.desc = "Reduce Flicker",
 		.info = "Raises sprite limit to reduce flickering in games.",
 	},
+	{
+		.key = "snes9x_2005_dynarec",
+		.default_value = "enabled",
+	},
 	{ NULL }
 };