Updates overrides for new core versions

7 files changed, 346 insertions, 206 deletions

diff --git a/Makefile b/Makefile
index 9bf3536..8f8e19d 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ LDFLAGS    = -lc -ldl -lgcc -lm -lSDL -lasound -lpng -lz -Wl,--gc-sections -flto
 
 CORES = beetle-pce-fast bluemsx fceumm fmsx gambatte gme gpsp mame2000 pcsx_rearmed picodrive quicknes smsplus-gx snes9x2002 snes9x2005 $(EXTRA_CORES)
 
-ifeq ($(platform), funkey-s)
+ifneq ($(platform), trimui)
 CORES := $(CORES) snes9x2005_plus
 endif
 
diff --git a/overrides/fceumm.h b/overrides/fceumm.h
index 71d8f6e..e55f8bc 100644
--- a/overrides/fceumm.h
+++ b/overrides/fceumm.h
@@ -7,11 +7,11 @@ static const struct core_override_option fceumm_core_option_overrides[] = {
 	},
 	{
 		.key = "fceumm_overscan_h",
-		.desc = "Crop Horz. Overscan",
+		.desc = "Crop Hrz. Overscan",
 	},
 	{
 		.key = "fceumm_overscan_v",
-		.desc = "Crop Vert. Overscan",
+		.desc = "Crop Vrt. Overscan",
 	},
 	{
 		.key = "fceumm_up_down_allowed",
@@ -58,6 +58,14 @@ static const struct core_override_option fceumm_core_option_overrides[] = {
 		.blocked = true
 	},
 	{
+		.key = "fceumm_zapper_trigger",
+		.blocked = true
+	},
+	{
+		.key = "fceumm_zapper_sensor",
+		.blocked = true
+	},
+	{
 		.key = "fceumm_show_crosshair",
 		.blocked = true
 	},
diff --git a/overrides/gambatte.h b/overrides/gambatte.h
index 1482d27..54dbe2f 100644
--- a/overrides/gambatte.h
+++ b/overrides/gambatte.h
@@ -9,226 +9,282 @@ static const struct core_override_option gambatte_core_option_overrides[] = {
 		.key = "gambatte_gb_internal_palette",
 		.info = "Selects palette used when 'GB Colorization' is set to 'Internal.'",
 		.options = {
-			[50] = { "Special 4", NULL },
+			[50] = { "Special 4 (TI-83 Legacy)", "Special 4" },
+			[51] = { "TWB64 - Pack 1",           "TWB64 1" },
+			[52] = { "TWB64 - Pack 2",           "TWB64 2" },
+			[53] = { "PixelShift - Pack 1",      "PixelShift" },
 		}
 	},
 	{
 		.key = "gambatte_gb_palette_twb64_1",
 		.desc = "TWB64 - Pack 1",
+		.info = "Selects palette used when 'Internal Palette' is set to 'TWB64 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 },
+			{ "TWB64 001 - Aqours Blue",               "Aqours Blue" },
+			{ "TWB64 002 - Anime Expo Ver.",           "Anime Expo Ver." },
+			{ "TWB64 003 - SpongeBob Yellow",          "SpongeBob Yellow" },
+			{ "TWB64 004 - Patrick Star Pink",         "Patrick Star Pink" },
+			{ "TWB64 005 - Neon Red",                  "Neon Red" },
+			{ "TWB64 006 - Neon Blue",                 "Neon Blue" },
+			{ "TWB64 007 - Neon Yellow",               "Neon Yellow" },
+			{ "TWB64 008 - Neon Green",                "Neon Green" },
+			{ "TWB64 009 - Neon Pink",                 "Neon Pink" },
+			{ "TWB64 010 - Mario Red",                 "Mario Red" },
+			{ "TWB64 011 - Nick Orange",               "Nick Orange" },
+			{ "TWB64 012 - Virtual Boy Ver.",          "Virtual Boy Ver." },
+			{ "TWB64 013 - Golden Wild",               "Golden Wild" },
+			{ "TWB64 014 - Builder Yellow",            "Builder Yellow" },
+			{ "TWB64 015 - Classic Blurple",           "Classic Blurple" },
+			{ "TWB64 016 - 765 Production Ver.",       "765 Production Ver." },
+			{ "TWB64 017 - Superball Ivory",           "Superball Ivory" },
+			{ "TWB64 018 - Crunchyroll Orange",        "Crunchyroll Orange" },
+			{ "TWB64 019 - Muse Pink",                 "Muse Pink" },
+			{ "TWB64 020 - Nijigasaki Yellow",         "Nijigasaki Yellow" },
+			{ "TWB64 021 - Gamate Ver.",               "Gamate Ver." },
+			{ "TWB64 022 - Greenscale Ver.",           "Greenscale Ver." },
+			{ "TWB64 023 - Odyssey Gold",              "Odyssey Gold" },
+			{ "TWB64 024 - Super Saiyan God",          "Super Saiyan God" },
+			{ "TWB64 025 - Super Saiyan Blue",         "Super Saiyan Blue" },
+			{ "TWB64 026 - Bizarre Pink",              "Bizarre Pink" },
+			{ "TWB64 027 - Nintendo Switch Lite Ver.", "Switch Lite Ver." },
+			{ "TWB64 028 - Game.com Ver.",             "Game.com Ver." },
+			{ "TWB64 029 - Sanrio Pink",               "Sanrio Pink" },
+			{ "TWB64 030 - BANDAI NAMCO Ver.",         "BANDAI NAMCO Ver." },
+			{ "TWB64 031 - Cosmo Green",               "Cosmo Green" },
+			{ "TWB64 032 - Wanda Pink",                "Wanda Pink" },
+			{ "TWB64 033 - Link's Awakening DX Ver.",  "Zelda DX Ver." },
+			{ "TWB64 034 - Travel Wood",               "Travel Wood" },
+			{ "TWB64 035 - Pokemon Ver.",              "Pokemon Ver." },
+			{ "TWB64 036 - Game Grump Orange",         "Game Grump Orange" },
+			{ "TWB64 037 - Scooby-Doo Mystery Ver.",   "Scooby-Doo Ver." },
+			{ "TWB64 038 - Pokemon mini Ver.",         "Pokemon mini Ver." },
+			{ "TWB64 039 - Supervision Ver.",          "Supervision Ver." },
+			{ "TWB64 040 - DMG Ver.",                  "DMG Ver." },
+			{ "TWB64 041 - Pocket Ver.",               "Pocket Ver." },
+			{ "TWB64 042 - Light Ver.",                "Light Ver." },
+			{ "TWB64 043 - Miraitowa Blue",            "Miraitowa Blue" },
+			{ "TWB64 044 - Someity Pink",              "Someity Pink" },
+			{ "TWB64 045 - Pikachu Yellow",            "Pikachu Yellow" },
+			{ "TWB64 046 - Eevee Brown",               "Eevee Brown" },
+			{ "TWB64 047 - Microvision Ver.",          "Microvision Ver." },
+			{ "TWB64 048 - TI-83 Ver.",                "TI-83 Ver." },
+			{ "TWB64 049 - Aegis Cherry",              "Aegis Cherry" },
+			{ "TWB64 050 - Labo Fawn",                 "Labo Fawn" },
+			{ "TWB64 051 - MILLION LIVE GOLD!",        "MILLION LIVE GOLD!" },
+			{ "TWB64 052 - Tokyo Midtown Ver.",        "Tokyo Midtown Ver." },
+			{ "TWB64 053 - VMU Ver.",                  "VMU Ver." },
+			{ "TWB64 054 - Game Master Ver.",          "Game Master Ver." },
+			{ "TWB64 055 - Android Green",             "Android Green" },
+			{ "TWB64 056 - Ticketmaster Azure",        "Ticketmaster Azure" },
+			{ "TWB64 057 - Google Red",                "Google Red" },
+			{ "TWB64 058 - Google Blue",               "Google Blue" },
+			{ "TWB64 059 - Google Yellow",             "Google Yellow" },
+			{ "TWB64 060 - Google Green",              "Google Green" },
+			{ "TWB64 061 - WonderSwan Ver.",           "WonderSwan Ver." },
+			{ "TWB64 062 - Neo Geo Pocket Ver.",       "Neo Geo Pocket Ver." },
+			{ "TWB64 063 - Dew Green",                 "Dew Green" },
+			{ "TWB64 064 - Coca-Cola Red",             "Coca-Cola Red" },
+			{ "TWB64 065 - GameKing Ver.",             "GameKing Ver." },
+			{ "TWB64 066 - Do The Dew Ver.",           "Do The Dew Ver." },
+			{ "TWB64 067 - Digivice Ver.",             "Digivice Ver." },
+			{ "TWB64 068 - Bikini Bottom Ver.",        "Bikini Bottom Ver." },
+			{ "TWB64 069 - Blossom Pink",              "Blossom Pink" },
+			{ "TWB64 070 - Bubbles Blue",              "Bubbles Blue" },
+			{ "TWB64 071 - Buttercup Green",           "Buttercup Green" },
+			{ "TWB64 072 - NASCAR Ver.",               "NASCAR Ver." },
+			{ "TWB64 073 - Lemon-Lime Green",          "Lemon-Lime Green" },
+			{ "TWB64 074 - Mega Man V Ver.",           "Mega Man V Ver." },
+			{ "TWB64 075 - Tamagotchi Ver.",           "Tamagotchi Ver." },
+			{ "TWB64 076 - Phantom Red",               "Phantom Red" },
+			{ "TWB64 077 - Halloween Ver.",            "Halloween Ver." },
+			{ "TWB64 078 - Christmas Ver.",            "Christmas Ver." },
+			{ "TWB64 079 - Cardcaptor Pink",           "Cardcaptor Pink" },
+			{ "TWB64 080 - Pretty Guardian Gold",      "Pretty Guardian Gold" },
+			{ "TWB64 081 - Camouflage Ver.",           "Camoflauge Ver." },
+			{ "TWB64 082 - Legendary Super Saiyan",    "Legendary Sp. Saiyan" },
+			{ "TWB64 083 - Super Saiyan Rose",         "Super Saiyan Rose" },
+			{ "TWB64 084 - Super Saiyan",              "Super Saiyan" },
+			{ "TWB64 085 - Perfected Ultra Instinct",  "Mst. Ult. Instinct" },
+			{ "TWB64 086 - Saint Snow Red",            "Saint Snow Red" },
+			{ "TWB64 087 - Yellow Banana",             "Yellow Banana" },
+			{ "TWB64 088 - Green Banana",              "Green Banana" },
+			{ "TWB64 089 - Super Saiyan 3",            "Super Saiyan 3" },
+			{ "TWB64 090 - Super Saiyan Blue Evolved", "Sp. Saiyan Blue Evo." },
+			{ "TWB64 091 - Pocket Tales Ver.",         "Pocket Tales Ver." },
+			{ "TWB64 092 - Investigation Yellow",      "Investigation Yellow" },
+			{ "TWB64 093 - S.E.E.S. Blue",             "S.E.E.S. Blue" },
+			{ "TWB64 094 - Game Awards Cyan",          "Game Awards Cyan" },
+			{ "TWB64 095 - Hokage Orange",             "Hokage Orange" },
+			{ "TWB64 096 - Straw Hat Red",             "Straw Hat Red" },
+			{ "TWB64 097 - Sword Art Cyan",            "Sword Art Cyan" },
+			{ "TWB64 098 - Deku Alpha Emerald",        "Deku Alpha Emerald" },
+			{ "TWB64 099 - Blue Stripes Ver.",         "Blue Stripes Ver." },
+			{ "TWB64 100 - Stone Orange",              "Stone Orange" },
 			{ NULL, NULL }
 		}
 	},
 	{
 		.key = "gambatte_gb_palette_twb64_2",
 		.desc = "TWB64 - Pack 2",
-		.default_value = "765PRO Pink",
+		.info = "Selects palette used when 'Internal Palette' is set to 'TWB64 2'",
 		.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 },
+			{ "TWB64 101 - 765PRO Pink",               "765PRO Pink" },
+			{ "TWB64 102 - CINDERELLA Blue",           "CINDERELLA Blue" },
+			{ "TWB64 103 - MILLION Yellow!",           "MILLION Yellow!" },
+			{ "TWB64 104 - SideM Green",               "SideM Green" },
+			{ "TWB64 105 - SHINY Sky Blue",            "SHINY Sky Blue" },
+			{ "TWB64 106 - Angry Volcano Ver.",        "Angry Volcano Ver." },
+			{ "TWB64 107 - Yo-kai Pink",               "Yo-kai Pink" },
+			{ "TWB64 108 - Yo-kai Green",              "Yo-kai Green" },
+			{ "TWB64 109 - Yo-kai Blue",               "Yo-kai Blue" },
+			{ "TWB64 110 - Yo-kai Purple",             "Yo-kai Purple" },
+			{ "TWB64 111 - Aquatic Iro",               "Aquatic Iro" },
+			{ "TWB64 112 - Tea Midori",                "Tea Midori" },
+			{ "TWB64 113 - Sakura Pink",               "Sakura Pink" },
+			{ "TWB64 114 - Wisteria Murasaki",         "Wisteria Murasaki" },
+			{ "TWB64 115 - Oni Aka",                   "Oni Aka" },
+			{ "TWB64 116 - Golden Kiiro",              "Golden Kiiro" },
+			{ "TWB64 117 - Silver Shiro",              "Silver Shiro" },
+			{ "TWB64 118 - Fruity Orange",             "Fruity Orange" },
+			{ "TWB64 119 - AKB48 Pink",                "AKB48 Pink" },
+			{ "TWB64 120 - Miku Blue",                 "Miku Blue" },
+			{ "TWB64 121 - Fairy Tail Red",            "Fairy Tail Red" },
+			{ "TWB64 122 - Survey Corps Brown",        "Survey Corps Brown" },
+			{ "TWB64 123 - Island Green",              "Island Green" },
+			{ "TWB64 124 - Mania Plus Green",          "Mania Plus Green" },
+			{ "TWB64 125 - Ninja Turtle Green",        "Ninja Turtle Green" },
+			{ "TWB64 126 - Slime Blue",                "Slime Blue" },
+			{ "TWB64 127 - Lime Midori",               "Lime Midori" },
+			{ "TWB64 128 - Ghostly Aoi",               "Ghostly Aoi" },
+			{ "TWB64 129 - Retro Bogeda",              "Retro Bogeda" },
+			{ "TWB64 130 - Royal Blue",                "Royal Blue" },
+			{ "TWB64 131 - Neon Purple",               "Neon Purple" },
+			{ "TWB64 132 - Neon Orange",               "Neon Orange" },
+			{ "TWB64 133 - Moonlight Vision",          "Moonlight Vision" },
+			{ "TWB64 134 - Tokyo Red",                 "Tokyo Red" },
+			{ "TWB64 135 - Paris Gold",                "Paris Gold" },
+			{ "TWB64 136 - Beijing Blue",              "Beijing Blue" },
+			{ "TWB64 137 - Pac-Man Yellow",            "Pac-Man Yellow" },
+			{ "TWB64 138 - Irish Green",               "Irish Green" },
+			{ "TWB64 139 - Kakarot Orange",            "Kakarot Orange" },
+			{ "TWB64 140 - Dragon Ball Orange",        "Dragon Ball Orange" },
+			{ "TWB64 141 - Christmas Gold",            "Christmas Gold" },
+			{ "TWB64 142 - Pepsi-Cola Blue",           "Pepsi Blue" },
+			{ "TWB64 143 - Bubblun Green",             "Bubblun Green" },
+			{ "TWB64 144 - Bobblun Blue",              "Bobblun Blue" },
+			{ "TWB64 145 - Baja Blast Storm",          "Baja Blast Storm" },
+			{ "TWB64 146 - Olympic Gold",              "Olympic Gold" },
+			{ "TWB64 147 - Value Orange",              "Value Orange" },
+			{ "TWB64 148 - Liella Purple!",            "Liella Purple!" },
+			{ "TWB64 149 - Olympic Silver",            "Olympic Silver" },
+			{ "TWB64 150 - Olympic Bronze",            "Olympic Bronze" },
+			{ "TWB64 151 - ANA Sky Blue",              "ANA Sky Blue" },
+			{ "TWB64 152 - Nijigasaki Orange",         "Nijigasaki Orange" },
+			{ "TWB64 153 - HoloBlue",                  "HoloBlue" },
+			{ "TWB64 154 - Wrestling Red",             "Wrestling Red" },
+			{ "TWB64 155 - Yoshi Egg Green",           "Yoshi Egg Green" },
+			{ "TWB64 156 - Pokedex Red",               "Pokedex Red" },
+			{ "TWB64 157 - Disney Dream Blue",         "Disney Dream Blue" },
+			{ "TWB64 158 - Xbox Green",                "Xbox Green" },
+			{ "TWB64 159 - Sonic Mega Blue",           "Sonic Mega Blue" },
+			{ "TWB64 160 - G4 Orange",                 "G4 Orange" },
+			{ "TWB64 161 - Scarlett Green",            "Scarlett Green" },
+			{ "TWB64 162 - Glitchy Blue",              "Glitchy Blue" },
+			{ "TWB64 163 - Classic LCD",               "Classic LCD" },
+			{ "TWB64 164 - 3DS Virtual Console Ver.",  "3DS VC Ver." },
+			{ "TWB64 165 - PocketStation Ver.",        "PocketStation Ver." },
+			{ "TWB64 166 - Game and Gold",             "Game and Gold" },
+			{ "TWB64 167 - Smurfy Blue",               "Smurfy Blue" },
+			{ "TWB64 168 - Swampy Ogre Green",         "Swampy Ogre Green" },
+			{ "TWB64 169 - Sailor Spinach Green",      "Sailor Spinach Green" },
+			{ "TWB64 170 - Shenron Green",             "Shenron Green" },
+			{ "TWB64 171 - Berserk Blood",             "Berserk Blood" },
+			{ "TWB64 172 - Super Star Pink",           "Super Star Pink" },
+			{ "TWB64 173 - Gamebuino Classic Ver.",    "Gamebuino Clas. Ver." },
+			{ "TWB64 174 - Barbie Pink",               "Barbie Pink" },
+			{ "TWB64 175 - Star Command Green",        "Star Command Green" },
+			{ "TWB64 176 - Nokia 3310 Ver.",           "Nokia 3310 Ver." },
+			{ "TWB64 177 - Clover Green",              "Clover Green" },
+			{ "TWB64 178 - Crash Orange",              "Crash Orange" },
+			{ "TWB64 179 - Famicom Disk Yellow",       "Famicom Disk Yellow" },
+			{ "TWB64 180 - Team Rocket Red",           "Team Rocket Red" },
+			{ "TWB64 181 - SEIKO Timer Yellow",        "SEIKO Timer Yellow" },
+			{ "TWB64 182 - PINK109",                   "PINK109" },
+			{ "TWB64 183 - Doraemon Blue",             "Doraemon Blue" },
+			{ "TWB64 184 - Fury Blue",                 "Fury Blue" },
+			{ "TWB64 185 - Rockstar Orange",           "Rockstar Orange" },
+			{ "TWB64 186 - Puyo Puyo Green",           "Puyo Puyo Green" },
+			{ "TWB64 187 - Susan G. Pink",             "Susan G. Pink" },
+			{ "TWB64 188 - Pizza Hut Red",             "Pizza Hut Red" },
+			{ "TWB64 189 - Plumbob Green",             "Plumbob Green" },
+			{ "TWB64 190 - Grand Ivory",               "Grand Ivory" },
+			{ "TWB64 191 - Demon's Gold",              "Demon's Gold" },
+			{ "TWB64 192 - SEGA Tokyo Blue",           "SEGA Tokyo Blue" },
+			{ "TWB64 193 - Champion Blue",             "Champion Blue" },
+			{ "TWB64 194 - DK Barrel Brown",           "DK Barrel Brown" },
+			{ "TWB64 195 - Evangelion Green",          "Evangelion Green" },
+			{ "TWB64 196 - Equestrian Purple",         "Equestrian Purple" },
+			{ "TWB64 197 - Autobot Red",               "Autobot Red" },
+			{ "TWB64 198 - Niconico Sea Green",        "Niconico Sea Green" },
+			{ "TWB64 199 - Duracell Copper",           "Duracell Copper" },
+			{ "TWB64 200 - TOKYO SKYTREE CLOUDY BLUE", "TOKYO SKYTREE BLUE" },
 			{ NULL, NULL },
 		}
 	},
 	{
+		.key = "gambatte_gb_palette_pixelshift_1",
+		.desc = "PixelShift",
+		.info = "Selects palette used when 'Internal Palette' is set to 'PixelShift.'",
+		.options = {
+			{ "PixelShift 01 - Arctic Green",               "Arctic Green" },
+			{ "PixelShift 02 - Arduboy",                    "Arduboy" },
+			{ "PixelShift 03 - BGB 0.3 Emulator",           "BGB 0.3 Emulator" },
+			{ "PixelShift 04 - Camouflage",                 "Camouflage" },
+			{ "PixelShift 05 - Chocolate Bar",              "Chocolate Bar" },
+			{ "PixelShift 06 - CMYK",                       "CMYK" },
+			{ "PixelShift 07 - Cotton Candy",               "Cotton Candy" },
+			{ "PixelShift 08 - Easy Greens",                "Easy Greens" },
+			{ "PixelShift 09 - Gamate",                     "Gamate" },
+			{ "PixelShift 10 - Game Boy Light",             "Game Boy Light" },
+			{ "PixelShift 11 - Game Boy Pocket",            "Game Boy Pocket" },
+			{ "PixelShift 12 - Game Boy Pocket Alt",        "Game Boy Pocket Alt" },
+			{ "PixelShift 13 - Game Pocket Computer",       "Game Pocket Computer" },
+			{ "PixelShift 14 - Game & Watch Ball",          "Game & Watch Ball" },
+			{ "PixelShift 15 - GB Backlight Blue",          "GB BL Blue" },
+			{ "PixelShift 16 - GB Backlight Faded",         "GB BL Faded" },
+			{ "PixelShift 17 - GB Backlight Orange",        "GB BL Orange" },
+			{ "PixelShift 18 - GB Backlight White ",        "GB BL White " },
+			{ "PixelShift 19 - GB Backlight Yellow Dark",   "GB BL Yellow Dark" },
+			{ "PixelShift 20 - GB Bootleg",                 "GB Bootleg" },
+			{ "PixelShift 21 - GB Hunter",                  "GB Hunter" },
+			{ "PixelShift 22 - GB Kiosk",                   "GB Kiosk" },
+			{ "PixelShift 23 - GB Kiosk 2",                 "GB Kiosk 2" },
+			{ "PixelShift 24 - GB New",                     "GB New" },
+			{ "PixelShift 25 - GB Nuked",                   "GB Nuked" },
+			{ "PixelShift 26 - GB Old",                     "GB Old" },
+			{ "PixelShift 27 - GBP Bivert",                 "GBP Bivert" },
+			{ "PixelShift 28 - GB Washed Yellow Backlight", "GB Washed Yellow BL" },
+			{ "PixelShift 29 - Ghost",                      "Ghost" },
+			{ "PixelShift 30 - Glow In The Dark",           "Glow In The Dark" },
+			{ "PixelShift 31 - Gold Bar",                   "Gold Bar" },
+			{ "PixelShift 32 - Grapefruit",                 "Grapefruit" },
+			{ "PixelShift 33 - Gray Green Mix",             "Gray Green Mix" },
+			{ "PixelShift 34 - Missingno",                  "Missingno" },
+			{ "PixelShift 35 - MS-Dos",                     "MS-Dos" },
+			{ "PixelShift 36 - Newspaper",                  "Newspaper" },
+			{ "PixelShift 37 - Pip-Boy",                    "Pip-Boy" },
+			{ "PixelShift 38 - Pocket Girl",                "Pocket Girl" },
+			{ "PixelShift 39 - Silhouette",                 "Silhouette" },
+			{ "PixelShift 40 - Sunburst",                   "Sunburst" },
+			{ "PixelShift 41 - Technicolor",                "Technicolor" },
+			{ "PixelShift 42 - Tron",                       "Tron" },
+			{ "PixelShift 44 - Virtual Boy",                "Virtual Boy" },
+			{ "PixelShift 45 - Wish",                       "Wish" },
+			{ 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."
 	},
@@ -267,6 +323,10 @@ static const struct core_override_option gambatte_core_option_overrides[] = {
 		}
 	},
 	{
+		.key = "gambatte_audio_resampler",
+		.info = "Specify which algorithm to use when resampling generated audio. 'Sinc' has the highest quality. 'Cosine' improves performance.",
+	},
+	{
 		.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."
diff --git a/overrides/pcsx_rearmed.h b/overrides/pcsx_rearmed.h
index b35cc2d..d5b20d7 100644
--- a/overrides/pcsx_rearmed.h
+++ b/overrides/pcsx_rearmed.h
@@ -2,6 +2,22 @@
 
 static const struct core_override_option pcsx_rearmed_core_option_overrides[] = {
 	{
+		.key = "pcsx_rearmed_region",
+		.info = "Specify which region the system is from. 'NTSC' is 60 Hz while 'PAL' is 50 Hz. 'Auto' will detect the region of the currently loaded content.",
+	},
+	{
+		.key = "pcsx_rearmed_bios",
+		.info = "Specify which BIOS to use. 'Auto' will attempt to load a real bios file. 'HLE' forces BIOS emulation, with lower compatibility.",
+	},
+	{
+		.key = "pcsx_rearmed_show_bios_bootlogo",
+		.info = "When using an official BIOS, whether to show the PlayStation logo at startup. Showing the boot logo may reduce compatibility.",
+	},
+	{
+		.key = "pcsx_rearmed_drc",
+		.info = "Dynamically recompile PSX CPU instructions to native instructions. Much faster, but may be less accurate.",
+	},
+	{
 		.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",
@@ -31,6 +47,11 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 		.info = "If disabled, turns off the dithering pattern the PSX applies to combat color banding.",
 	},
 	{
+		.key = "pcsx_rearmed_duping_enable",
+		.desc = "Frame Duping",
+		.info = "When enabled, provides a small performance improvement by repeating the previous frame if the core has nothing new to display.",
+	},
+	{
 		.key = "pcsx_rearmed_show_gpu_peops_settings",
 		.desc = "P.E.Op.S. Settings",
 	},
@@ -101,10 +122,40 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 		.default_value = "enabled"
 	},
 	{
+		.key = "pcsx_rearmed_gpu_slow_llists",
+		.desc = "Slow Linked Lists",
+	},
+	{
+		.key = "pcsx_rearmed_neon_interlace_enable",
+		.desc = "Interlaced Video",
+		.info = "When enabled, games that run in high resolution video modes (480i, 512i) produce interlaced video output.",
+	},
+	{
+		.key = "pcsx_rearmed_spu_interpolation",
+		.info = "Emulates audio interpolation. 'Gaussian' is closest to original. 'Simple' is faster, lower quality. 'Cubic' is slowest, higher clarity.",
+	},
+	{
+		.key = "pcsx_rearmed_noxadecoding",
+		.info = "Enable playback of XA audio tracks. Can be disabled to improve performance in games that include XA audio, at the expense of missing music.",
+	},
+	{
+		.key = "pcsx_rearmed_neon_enhancement_enable",
+		.blocked = true,
+	},
+	{
+		.key = "pcsx_rearmed_neon_enhancement_no_main",
+		.blocked = true,
+	},
+	{
 		.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_spu_reverb",
+		.desc = "Reverb Effects",
+		.info = "Enable emulation of the PSX reverb feature. Disable to improve performance at the expense of reduced audio quality/authenticity.",
+	},
+	{
 		.key = "pcsx_rearmed_pe2_fix",
 		.desc = "PE 2/VH 1/2 Fix",
 		.info = "Fixes Parasite Eve 2 / Vandal Hearts 1 / 2."
@@ -135,7 +186,11 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 		.desc = "Disable GTE Flags",
 	},
 	{
-		.key = "pcsx_rearmed_show_other_input_settings",
+		.key = "pcsx_rearmed_nostalls",
+		.desc = "Disable Stalls",
+	},
+	{
+		.key = "pcsx_rearmed_show_input_settings",
 		.blocked = true
 	},
 	{
@@ -158,6 +213,10 @@ static const struct core_override_option pcsx_rearmed_core_option_overrides[] =
 		.key = "pcsx_rearmed_icache_emulation",
 		.blocked = true
 	},
+	{
+		.key = "pcsx_rearmed_nocompathacks",
+		.blocked = true
+	},
 	{ NULL }
 };
 
diff --git a/overrides/picodrive.h b/overrides/picodrive.h
index f0c9ca0..a472164 100644
--- a/overrides/picodrive.h
+++ b/overrides/picodrive.h
@@ -16,6 +16,7 @@ static const struct core_override_option picodrive_core_option_overrides[] = {
 	{
 		.key = "picodrive_sound_rate",
 		.desc = "Sample Rate",
+		.info = "Higher values increase sound quality. Lower values may increase performance. Native is the original sound chip rate (~53000) and is most accurate.",
 	},
 	{
 		.key = "picodrive_smsfm",
diff --git a/overrides/snes9x2002.h b/overrides/snes9x2002.h
index 4cb3b5d..d6e1f87 100644
--- a/overrides/snes9x2002.h
+++ b/overrides/snes9x2002.h
@@ -18,6 +18,14 @@ static const struct core_override_option snes9x2002_core_option_overrides[] = {
 		.default_value = "4",
 	},
 	{
+		.key = "snes9x2002_transparency",
+		.desc = "Transparency",
+	},
+	{
+		.key = "snes9x2002_low_pass_range",
+		.info = "Specify the cut-off frequency of the audio filter. Higher values increase the perceived 'strength' of the filter."
+	},
+	{
 		.key = "snes9x2002_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.",
diff --git a/overrides/snes9x2005.h b/overrides/snes9x2005.h
index b9c04a5..fdae7c8 100644
--- a/overrides/snes9x2005.h
+++ b/overrides/snes9x2005.h
@@ -23,6 +23,10 @@ static const struct core_override_option snes9x2005_core_option_overrides[] = {
 		.default_value = "3"
 	},
 	{
+		.key = "snes9x_2005_low_pass_range",
+		.info = "Specify the cut-off frequency of the audio filter. Higher values increase the perceived 'strength' of the filter."
+	},
+	{
 		.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.",