Moves core option changes into picoarch

Keeps cores cleaner and avoids conflicts

6 files changed, 789 insertions, 0 deletions

diff --git a/overrides/gambatte.h b/overrides/gambatte.h
new file mode 100644
index 0000000..53ffb78
--- /dev/null
+++ b/overrides/gambatte.h
@@ -0,0 +1,307 @@
+#include "overrides.h"
+
+static const struct core_override_option gambatte_core_option_overrides[] = {
+	{
+		.key = "gambatte_gb_colorization",
+		.info = "'Auto' selects the 'best' palette. 'Internal' uses 'Internal Palette' option. 'Custom' loads user palette from system directory.",
+	},
+	{
+		.key = "gambatte_gb_internal_palette",
+		.info = "Selects palette used when 'GB Colorization' is set to 'Internal.'",
+		.options = {
+			[50] = { "Special 4", NULL },
+		}
+	},
+	{
+		.key = "gambatte_gb_palette_twb64_1",
+		.desc = "TWB64 - Pack 1",
+		.default_value = "Aqours Blue",
+		.options = {
+			{ "Aqours Blue",               NULL },
+			{ "Anime Expo Ver.",           NULL },
+			{ "SpongeBob Yellow",          NULL },
+			{ "Patrick Star Pink",         NULL },
+			{ "Neon Red",                  NULL },
+			{ "Neon Blue",                 NULL },
+			{ "Neon Yellow",               NULL },
+			{ "Neon Green",                NULL },
+			{ "Neon Pink",                 NULL },
+			{ "Mario Red",                 NULL },
+			{ "Nick Orange",               NULL },
+			{ "Virtual Boy Ver.",          NULL },
+			{ "Golden Wild",               NULL },
+			{ "Builder Yellow",            NULL },
+			{ "Classic Blurple",           NULL },
+			{ "765 Production Ver.",       NULL },
+			{ "Superball Ivory",           NULL },
+			{ "Crunchyroll Orange",        NULL },
+			{ "Muse Pink",                 NULL },
+			{ "Nijigasaki Yellow",         NULL },
+			{ "Gamate Ver.",               NULL },
+			{ "Greenscale Ver.",           NULL },
+			{ "Odyssey Gold",              NULL },
+			{ "Super Saiyan God",          NULL },
+			{ "Super Saiyan Blue",         NULL },
+			{ "Bizarre Pink",              NULL },
+			{ "Switch Lite Ver.",          NULL },
+			{ "Game.com Ver.",             NULL },
+			{ "Sanrio Pink",               NULL },
+			{ "BANDAI NAMCO Ver.",         NULL },
+			{ "Cosmo Green",               NULL },
+			{ "Wanda Pink",                NULL },
+			{ "Zelda DX Ver.",             NULL },
+			{ "Travel Wood",               NULL },
+			{ "Pokemon Ver.",              NULL },
+			{ "Game Grump Orange",         NULL },
+			{ "Scooby-Doo Ver.",           NULL },
+			{ "Pokemon mini Ver.",         NULL },
+			{ "Supervision Ver.",          NULL },
+			{ "DMG Ver.",                  NULL },
+			{ "Pocket Ver.",               NULL },
+			{ "Light Ver.",                NULL },
+			{ "Miraitowa Blue",            NULL },
+			{ "Someity Pink",              NULL },
+			{ "Pikachu Yellow",            NULL },
+			{ "Eevee Brown",               NULL },
+			{ "Microvision Ver.",          NULL },
+			{ "TI-83 Ver.",                NULL },
+			{ "Aegis Cherry",              NULL },
+			{ "Labo Fawn",                 NULL },
+			{ "MILLION LIVE GOLD!",        NULL },
+			{ "Tokyo Midtown Ver.",        NULL },
+			{ "VMU Ver.",                  NULL },
+			{ "Game Master Ver.",          NULL },
+			{ "Android Green",             NULL },
+			{ "Ticketmaster Azure",        NULL },
+			{ "Google Red",                NULL },
+			{ "Google Blue",               NULL },
+			{ "Google Yellow",             NULL },
+			{ "Google Green",              NULL },
+			{ "WonderSwan Ver.",           NULL },
+			{ "Neo Geo Pocket Ver.",       NULL },
+			{ "Dew Green",                 NULL },
+			{ "Coca-Cola Red",             NULL },
+			{ "GameKing Ver.",             NULL },
+			{ "Do The Dew Ver.",           NULL },
+			{ "Digivice Ver.",             NULL },
+			{ "Bikini Bottom Ver.",        NULL },
+			{ "Blossom Pink",              NULL },
+			{ "Bubbles Blue",              NULL },
+			{ "Buttercup Green",           NULL },
+			{ "NASCAR Ver.",               NULL },
+			{ "Lemon-Lime Green",          NULL },
+			{ "Mega Man V Ver.",           NULL },
+			{ "Tamagotchi Ver.",           NULL },
+			{ "Phantom Red",               NULL },
+			{ "Halloween Ver.",            NULL },
+			{ "Christmas Ver.",            NULL },
+			{ "Cardcaptor Pink",           NULL },
+			{ "Pretty Guardian Gold",      NULL },
+			{ "Camoflauge Ver.",           NULL },
+			{ "Legendary Sp. Saiyan",      NULL },
+			{ "Super Saiyan Rose",         NULL },
+			{ "Super Saiyan",              NULL },
+			{ "Mst. Ult. Instinct",        NULL },
+			{ "Saint Snow Red",            NULL },
+			{ "Yellow Banana",             NULL },
+			{ "Green Banana",              NULL },
+			{ "Super Saiyan 3",            NULL },
+			{ "Sp. Saiyan Blue Evo.",      NULL },
+			{ "Pocket Tales Ver.",         NULL },
+			{ "Investigation Yellow",      NULL },
+			{ "S.E.E.S. Blue",             NULL },
+			{ "Game Awards Cyan",          NULL },
+			{ "Hokage Orange",             NULL },
+			{ "Straw Hat Red",             NULL },
+			{ "Sword Art Cyan",            NULL },
+			{ "Deku Alpha Emerald",        NULL },
+			{ "Blue Stripes Ver.",         NULL },
+			{ "Stone Orange",              NULL },
+			{ NULL, NULL }
+		}
+	},
+	{
+		.key = "gambatte_gb_palette_twb64_2",
+		.desc = "TWB64 - Pack 2",
+		.default_value = "765PRO Pink",
+		.options = {
+			{ "765PRO Pink",               NULL },
+			{ "CINDERELLA Blue",           NULL },
+			{ "MILLION Yellow!",           NULL },
+			{ "SideM Green",               NULL },
+			{ "SHINY Sky Blue",            NULL },
+			{ "Angry Volcano Ver.",        NULL },
+			{ "Yo-kai Pink",               NULL },
+			{ "Yo-kai Green",              NULL },
+			{ "Yo-kai Blue",               NULL },
+			{ "Yo-kai Purple",             NULL },
+			{ "Aquatic Iro",               NULL },
+			{ "Tea Midori",                NULL },
+			{ "Sakura Pink",               NULL },
+			{ "Wisteria Murasaki",         NULL },
+			{ "Oni Aka",                   NULL },
+			{ "Golden Kiiro",              NULL },
+			{ "Silver Shiro",              NULL },
+			{ "Fruity Orange",             NULL },
+			{ "AKB48 Pink",                NULL },
+			{ "Miku Blue",                 NULL },
+			{ "Fairy Tail Red",            NULL },
+			{ "Survey Corps Brown",        NULL },
+			{ "Island Green",              NULL },
+			{ "Mania Plus Green",          NULL },
+			{ "Ninja Turtle Green",        NULL },
+			{ "Slime Blue",                NULL },
+			{ "Lime Midori",               NULL },
+			{ "Ghostly Aoi",               NULL },
+			{ "Retro Bogeda",              NULL },
+			{ "Royal Blue",                NULL },
+			{ "Neon Purple",               NULL },
+			{ "Neon Orange",               NULL },
+			{ "Moonlight Vision",          NULL },
+			{ "Tokyo Red",                 NULL },
+			{ "Paris Gold",                NULL },
+			{ "Beijing Blue",              NULL },
+			{ "Pac-Man Yellow",            NULL },
+			{ "Irish Green",               NULL },
+			{ "Kakarot Orange",            NULL },
+			{ "Dragon Ball Orange",        NULL },
+			{ "Christmas Gold",            NULL },
+			{ "Pepsi Blue",                NULL },
+			{ "Bubblun Green",             NULL },
+			{ "Bobblun Blue",              NULL },
+			{ "Baja Blast Storm",          NULL },
+			{ "Olympic Gold",              NULL },
+			{ "Value Orange",              NULL },
+			{ "Liella Purple!",            NULL },
+			{ "Olympic Silver",            NULL },
+			{ "Olympic Bronze",            NULL },
+			{ "ANA Sky Blue",              NULL },
+			{ "Nijigasaki Orange",         NULL },
+			{ "HoloBlue",                  NULL },
+			{ "Wrestling Red",             NULL },
+			{ "Yoshi Egg Green",           NULL },
+			{ "Pokedex Red",               NULL },
+			{ "Disney Dream Blue",         NULL },
+			{ "Xbox Green",                NULL },
+			{ "Sonic Mega Blue",           NULL },
+			{ "G4 Orange",                 NULL },
+			{ "Scarlett Green",            NULL },
+			{ "Glitchy Blue",              NULL },
+			{ "Classic LCD",               NULL },
+			{ "3DS VC Ver.",               NULL },
+			{ "PocketStation Ver.",        NULL },
+			{ "Game and Gold",             NULL },
+			{ "Smurfy Blue",               NULL },
+			{ "Swampy Ogre Green",         NULL },
+			{ "Sailor Spinach Green",      NULL },
+			{ "Shenron Green",             NULL },
+			{ "Berserk Blood",             NULL },
+			{ "Super Star Pink",           NULL },
+			{ "Gamebuino Clas. Ver.",      NULL },
+			{ "Barbie Pink",               NULL },
+			{ "Star Command Green",        NULL },
+			{ "Nokia 3310 Ver.",           NULL },
+			{ "Clover Green",              NULL },
+			{ "Crash Orange",              NULL },
+			{ "Famicom Disk Yellow",       NULL },
+			{ "Team Rocket Red",           NULL },
+			{ "SEIKO Timer Yellow",        NULL },
+			{ "PINK109",                   NULL },
+			{ "Doraemon Blue",             NULL },
+			{ "Fury Blue",                 NULL },
+			{ "Rockstar Orange",           NULL },
+			{ "Puyo Puyo Green",           NULL },
+			{ "Susan G. Pink",             NULL },
+			{ "Pizza Hut Red",             NULL },
+			{ "Plumbob Green",             NULL },
+			{ "Grand Ivory",               NULL },
+			{ "Demon's Gold",              NULL },
+			{ "SEGA Tokyo Blue",           NULL },
+			{ "Champion Blue",             NULL },
+			{ "DK Barrel Brown",           NULL },
+			{ "Evangelion Green",          NULL },
+			{ "Equestrian Purple",         NULL },
+			{ "Autobot Red",               NULL },
+			{ "Niconico Sea Green",        NULL },
+			{ "Duracell Copper",           NULL },
+			{ "TOKYO SKYTREE BLUE",        NULL },
+			{ NULL, NULL },
+		}
+	},
+	{
+		.key = "gambatte_gbc_color_correction",
+		.info = "Adjusts colors to match the display of real GBC hardware. 'GBC Only' only applies correction when playing GBC games or using a GBC palette."
+	},
+	{
+		.key = "gambatte_gbc_color_correction_mode",
+		.desc = "CC Mode",
+		.info = "'Accurate' produces output almost indistinguishable from a real GBC LCD panel. 'Fast' merely darkens colors and reduces saturation."
+	},
+	{
+		.key = "gambatte_gbc_frontlight_position",
+		.desc = "CC Frontlight",
+		.info = "Simulates the GBC LCD panel when illuminated from different angles. This setting only applies when 'Color Correction Mode' is set to 'Accurate'."
+	},
+	{
+		.key = "gambatte_dark_filter_level",
+		.desc = "Dark Level",
+		.info = "Enable luminosity-based brightness reduction. May be used to avoid glare/eye strain when playing games with white backgrounds."
+	},
+	{
+		.key = "gambatte_gb_hwmode",
+		.desc = "Hardware (restart)",
+		.info = "Which type of hardware to emulate. 'Auto' is recommended. 'GBA' unlocks extra features in certain 'GBA enhanced' Game Boy Color games."
+	},
+	{
+		.key = "gambatte_gb_bootloader",
+		.desc = "Boot Logo (restart)",
+	},
+	{
+		.key = "gambatte_mix_frames",
+		.desc = "Blending",
+		.info = "Simulates LCD ghosting effects. 'Simple' performs a 50:50 mix. 'Ghosting' mimics LCD response times with multiple buffered frames.",
+		.options = {
+			[2] = { "lcd_ghosting",      "Ghosting (Accurate)" },
+			[3] = { "lcd_ghosting_fast", "Ghosting (Fast)" },
+		}
+	},
+	{
+		.key = "gambatte_up_down_allowed",
+		.desc = "Opp. Directions",
+		.info = "Enabling this will allow pressing / quickly alternating / holding both left and right (or up and down) directions at the same time."
+	},
+	{
+		.key = "gambatte_rumble_level",
+		.blocked = true
+	},
+	{
+		.key = "gambatte_show_gb_link_settings",
+		.blocked = true
+	},
+	{ NULL }
+};
+
+me_bind_action gambatte_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 },
+	{ "A TURBO  ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "B TURBO  ",  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 },
+	/* { "FAST FWD ",  1 << RETRO_DEVICE_ID_JOYPAD_R2 }, */
+	{ NULL,       0 }
+};
+
+#define gambatte_overrides {                                    \
+	.core_name = "gambatte",                                \
+	.actions = gambatte_ctrl_actions,                       \
+	.action_size = array_size(gambatte_ctrl_actions),       \
+	.options = gambatte_core_option_overrides               \
+}
diff --git a/overrides/gpsp.h b/overrides/gpsp.h
new file mode 100644
index 0000000..eac14c6
--- /dev/null
+++ b/overrides/gpsp.h
@@ -0,0 +1,96 @@
+#include "overrides.h"
+
+static const struct core_override_option gpsp_core_option_overrides[] = {
+	{
+		.key = "gpsp_bios",
+		.info = "Choose the BIOS image to use. The official BIOS must be provided by the user. Using a builtin BIOS might result in compatibility problems.",
+		.options = {
+			{ "auto", "auto" },
+			{ "builtin", "builtin" },
+			{ "official", "original" }
+		}
+	},
+	{
+		.key = "gpsp_boot_mode",
+		.info = "Choose whether to boot the BIOS before the game or not.",
+		.options = {
+			{ "game", "auto" },
+			{ "bios", "bios" }
+		}
+	},
+	{
+		.key = "gpsp_frameskip",
+		.info = "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+		.default_value = "auto",
+		.options = {
+			[2] = {"auto_threshold", "Threshold"},
+			[3] = {"fixed_interval", "Fixed"},
+		}
+	},
+	{
+		.key = "gpsp_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 = "gpsp_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 = "gpsp_color_correction",
+		.info = "Adjusts output colors to match real GBA hardware.",
+		.options = {
+			{"disabled", NULL},
+			{"enabled", NULL},
+			{ NULL, NULL }
+		}
+	},
+	{
+		.key = "gpsp_frame_mixing",
+		.desc = "Frame Blending",
+		.info = "Simulates LCD ghosting effects.",
+		.options = {
+			{"disabled", NULL},
+			{"enabled", NULL},
+			{ NULL, NULL }
+		}
+	},
+	{
+		.key = "gpsp_save_method",
+		.blocked = true
+	},
+	{ NULL }
+};
+
+me_bind_action gpsp_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 },
+	{ "A TURBO  ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "B TURBO  ",  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 },
+	/* { "FAST FWD ",  1 << RETRO_DEVICE_ID_JOYPAD_R2 }, */
+	{ NULL,       0 }
+};
+
+const struct core_override_fast_forward gpsp_fast_forward = {
+	.type_key = "gpsp_frameskip",
+	.interval_key = "gpsp_frameskip_interval"
+};
+
+#define gpsp_overrides {                                \
+	.core_name = "gpsp",                            \
+	.fast_forward = &gpsp_fast_forward,             \
+	.actions = gpsp_ctrl_actions,                   \
+	.action_size = array_size(gpsp_ctrl_actions),   \
+	.options = gpsp_core_option_overrides           \
+}
diff --git a/overrides/mame2000.h b/overrides/mame2000.h
new file mode 100644
index 0000000..0c2bbfa
--- /dev/null
+++ b/overrides/mame2000.h
@@ -0,0 +1,72 @@
+#include "overrides.h"
+
+static const struct core_override_option mame2000_core_option_overrides[] = {
+	{
+		.key = "mame2000-frameskip",
+		.info = "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+		.default_value = "auto",
+		.retro_var_value = "Frameskip ; disabled|auto|threshold"
+	},
+	{
+		.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",
+	},
+	{
+		.key = "mame2000-frameskip_interval",
+		.info = "The maximum number of frames that can be skipped before a new frame is rendered.",
+		.default_value = "2",
+		.retro_var_value = "FS Interval; 1|2|3|4|5|6|7|8|9",
+	},
+	{
+		.key = "mame2000-skip_disclaimer",
+		.default_value = "enabled",
+		.retro_var_value = "Skip Disclaimer; disabled|enabled"
+	},
+	{
+		.key = "mame2000-show_gameinfo",
+		.retro_var_value = "Show Game Info; disabled|enabled"
+	},
+	{
+		.key = "mame2000-sample_rate",
+		.default_value = "22050",
+		.retro_var_value = "Snd. Rate (Restart); 11025|22050|32000|44100"
+	},
+	{
+		.key = "mame2000-stereo",
+		.retro_var_value = "Stereo (Restart); disabled|enabled"
+	},
+	{ NULL }
+};
+
+me_bind_action mame2000_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 },
+	{ "BUTTON 1 ",  1 << RETRO_DEVICE_ID_JOYPAD_B },
+	{ "BUTTON 2 ",  1 << RETRO_DEVICE_ID_JOYPAD_A },
+	{ "BUTTON 3 ",  1 << RETRO_DEVICE_ID_JOYPAD_Y },
+	{ "BUTTON 4 ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "BUTTON 5 ",  1 << RETRO_DEVICE_ID_JOYPAD_L },
+	{ "BUTTON 6 ",  1 << RETRO_DEVICE_ID_JOYPAD_R },
+	{ "START    ",  1 << RETRO_DEVICE_ID_JOYPAD_START },
+	{ "COIN     ",  1 << RETRO_DEVICE_ID_JOYPAD_SELECT },
+	{ "OSD MENU ",  1 << RETRO_DEVICE_ID_JOYPAD_R2 },
+	{ 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         \
+}
diff --git a/overrides/pcsx_rearmed.h b/overrides/pcsx_rearmed.h
new file mode 100644
index 0000000..1b463cf
--- /dev/null
+++ b/overrides/pcsx_rearmed.h
@@ -0,0 +1,190 @@
+#include "overrides.h"
+
+static const struct core_override_option pcsx_rearmed_core_option_overrides[] = {
+	{
+		.key = "pcsx_rearmed_frameskip_type",
+		.info = "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness. Will cause graphical glitches.",
+		.default_value = "auto",
+		.options = {
+			[2] = {"auto_threshold", "Threshold"},
+			[3] = {"fixed_interval", "Fixed"},
+		}
+	},
+	{
+		.key = "pcsx_rearmed_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 = "pcsx_rearmed_frameskip",
+		.desc = "FS Interval",
+		.info = "Specifies the maximum number of frames that can be skipped before a new frame is rendered.",
+		.default_value = "4"
+	},
+	{
+		.key = "pcsx_rearmed_memcard2",
+		.desc = "2nd Memory Card",
+	},
+	{
+		.key = "pcsx_rearmed_dithering",
+		.desc = "Dithering",
+		.info = "If disabled, turns off the dithering pattern the PSX applies to combat color banding.",
+	},
+	{
+		.key = "pcsx_rearmed_show_gpu_peops_settings",
+		.desc = "P.E.Op.S. Settings",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_odd_even_bit",
+		.desc = "Odd/Even Hack",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_expand_screen_width",
+		.desc = "Exp. Screen Width",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_ignore_brightness",
+		.desc = "Ignore Brightness",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_disable_coord_check",
+		.desc = "Coordinate Check",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_lazy_screen_update",
+		.desc = "Lazy Screen Update",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_old_frame_skip",
+		.desc = "Old Frameskip",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_repeated_triangles",
+		.desc = "Rep. Triangles",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_quads_with_triangles",
+		.desc = "Quads w/ Triangles",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_peops_fake_busy_state",
+		.desc = "Fake 'Busy' States",
+	},
+	{
+		.key = "pcsx_rearmed_show_gpu_unai_settings",
+		.desc = "GPU UNAI Settings",
+		.info = "Shows or hides advanced gpu settings. Menu must be toggled for this setting to take effect."
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_blending",
+		.desc = "Blending",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_lighting",
+		.desc = "Lighting",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_fast_lighting",
+		.desc = "Fast Lighting",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_ilace_force",
+		.desc = "Forced Interlace",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_pixel_skip",
+		.desc = "Pixel Skip",
+	},
+	{
+		.key = "pcsx_rearmed_gpu_unai_scale_hires",
+		.desc = "Hi-Res Scaling",
+		.default_value = "enabled"
+	},
+	{
+		.key = "pcsx_rearmed_gpu_thread_rendering",
+		.info = "Runs GPU commands in a thread. Sync waits for drawing to finish before vsync. Async will not wait unless there's another frame behind it."
+	},
+	{
+		.key = "pcsx_rearmed_pe2_fix",
+		.desc = "PE 2/VH 1/2 Fix",
+		.info = "Fixes Parasite Eve 2 / Vandal Hearts 1 / 2."
+	},
+	{
+		.key = "pcsx_rearmed_inuyasha_fix",
+		.desc = "InuYasha Battle Fix",
+	},
+	{
+		.key = "pcsx_rearmed_async_cd",
+		.desc = "CD Access (Restart)",
+		.info = "Method used to read data from disk. 'Asynchronous' can reduce stuttering on devices with slow storage. 'Precache' loads disk image into memory (CHD only)."
+	},
+	{
+		.key = "pcsx_rearmed_spuirq",
+		.desc = "SPU IRQ Always",
+	},
+	{
+		.key = "pcsx_rearmed_nosmccheck",
+		.desc = "Disable SMC Checks",
+	},
+	{
+		.key = "pcsx_rearmed_gteregsunneeded",
+		.desc = "Unneeded GTE Regs",
+	},
+	{
+		.key = "pcsx_rearmed_nogteflags",
+		.desc = "Disable GTE Flags",
+	},
+	{
+		.key = "pcsx_rearmed_show_other_input_settings",
+		.blocked = true
+	},
+	{
+		.key = "pcsx_rearmed_input_sensitivity",
+		.blocked = true
+	},
+	{
+		.key = "pcsx_rearmed_multitap",
+		.blocked = true
+	},
+	{
+		.key = "pcsx_rearmed_vibration",
+		.blocked = true
+	},
+	{
+		.key = "pcsx_rearmed_display_internal_fps",
+		.blocked = true
+	},
+	{ NULL }
+};
+
+me_bind_action pcsx_rearmed_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 },
+	{ "CIRCLE   ",  1 << RETRO_DEVICE_ID_JOYPAD_A },
+	{ "CROSS    ",  1 << RETRO_DEVICE_ID_JOYPAD_B },
+	{ "TRIANGLE ",  1 << RETRO_DEVICE_ID_JOYPAD_X },
+	{ "SQUARE   ",  1 << RETRO_DEVICE_ID_JOYPAD_Y },
+	{ "START    ",  1 << RETRO_DEVICE_ID_JOYPAD_START },
+	{ "SELECT   ",  1 << RETRO_DEVICE_ID_JOYPAD_SELECT },
+	{ "L1 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_L },
+	{ "R1 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_R },
+	{ "L2 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_L2 },
+	{ "R2 BUTTON",  1 << RETRO_DEVICE_ID_JOYPAD_R2 },
+	{ NULL,       0 }
+};
+
+const struct core_override_fast_forward pcsx_rearmed_fast_forward = {
+	.type_key = "pcsx_rearmed_frameskip_type",
+	.interval_key = "pcsx_rearmed_frameskip_interval"
+};
+
+#define pcsx_rearmed_overrides {                               \
+	.core_name = "pcsx_rearmed",                           \
+	.fast_forward = &pcsx_rearmed_fast_forward,            \
+	.actions = pcsx_rearmed_ctrl_actions,                  \
+	.action_size = array_size(pcsx_rearmed_ctrl_actions),  \
+	.options = pcsx_rearmed_core_option_overrides          \
+}
diff --git a/overrides/snes9x2002.h b/overrides/snes9x2002.h
new file mode 100644
index 0000000..00ff40b
--- /dev/null
+++ b/overrides/snes9x2002.h
@@ -0,0 +1,58 @@
+#include "overrides.h"
+
+static const struct core_override_option snes9x2002_core_option_overrides[] = {
+	{
+		.key = "snes9x2002_frameskip",
+		.info = "Skip frames to avoid audio crackling. Improves performance at the expense of visual smoothness.",
+		.default_value = "auto",
+		.retro_var_value = "Frameskip ; disabled|auto|threshold"
+	},
+	{
+		.key = "snes9x2002_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",
+	},
+	{
+		.key = "snes9x2002_frameskip_interval",
+		.info = "The maximum number of frames that can be skipped before a new frame is rendered.",
+		.default_value = "4",
+		.retro_var_value = "FS Interval; 1|2|3|4|5|6|7|8|9"
+	},
+	{
+		.key = "snes9x2002_overclock_cycles",
+		.info = "Hack, unsafe. Requires restart.",
+		.retro_var_value = "Overclock (Restart); disabled|compatible|max"
+	},
+	{ NULL }
+};
+
+me_bind_action snes9x2002_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 snes9x2002_fast_forward = {
+	.type_key = "snes9x2002_frameskip",
+	.type_value = "auto",
+	.interval_key = "snes9x2002_frameskip_interval"
+};
+
+#define snes9x2002_overrides {                               \
+	.core_name = "snes9x2002",                           \
+	.fast_forward = &snes9x2002_fast_forward,            \
+	.actions = snes9x2002_ctrl_actions,                  \
+	.action_size = array_size(snes9x2002_ctrl_actions),  \
+	.options = snes9x2002_core_option_overrides          \
+}
diff --git a/overrides/snes9x2005.h b/overrides/snes9x2005.h
new file mode 100644
index 0000000..af2f0ff
--- /dev/null
+++ b/overrides/snes9x2005.h
@@ -0,0 +1,66 @@
+#include "overrides.h"
+
+static const struct core_override_option snes9x2005_core_option_overrides[] = {
+	{
+		.key = "snes9x_2005_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.",
+	},
+	{ NULL }
+};
+
+me_bind_action snes9x2005_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_fast_forward = {
+	.type_key = "snes9x_2005_frameskip",
+	.type_value = "auto",
+	.interval_key = "snes9x_2005_frameskip_interval"
+};
+
+#define snes9x2005_overrides {                              \
+	.core_name = "snes9x2005",                          \
+	.fast_forward = &snes9x2005_fast_forward,           \
+	.actions = snes9x2005_ctrl_actions,                 \
+	.action_size = array_size(snes9x2005_ctrl_actions), \
+	.options = snes9x2005_core_option_overrides         \
+}