Moves core option changes into picoarch

Keeps cores cleaner and avoids conflicts

1 files changed, 0 insertions, 559 deletions

diff --git a/patches/gambatte/1001-core-options.patch b/patches/gambatte/1001-core-options.patch
deleted file mode 100644
index 5ed9998..0000000
--- a/patches/gambatte/1001-core-options.patch
+++ /dev/null
@@ -1,559 +0,0 @@
-diff --git a/libgambatte/libretro/libretro_core_options.h b/libgambatte/libretro/libretro_core_options.h
-index 67b07ad..b740601 100644
---- a/libgambatte/libretro/libretro_core_options.h
-+++ b/libgambatte/libretro/libretro_core_options.h
-@@ -63,7 +63,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-       "gambatte_gb_colorization",
-       "GB Colorization",
-       NULL,
--      "Enables colorization of Game Boy games. 'Auto' selects the 'best' (most colorful/appropriate) palette. 'GBC' selects game-specific Game Boy Color palette if defined, otherwise 'GBC - Dark Green'. 'SGB' selects game-specific Super Game Boy palette if defined, otherwise 'SGB - 1A', 'Internal' uses 'Internal Palette' core option. 'Custom' loads user-created palette from system directory.",
-+      "'Auto' selects the 'best' palette. 'Internal' uses 'Internal Palette' option. 'Custom' loads user palette from system directory.",
-       NULL,
-       NULL,
-       {
-@@ -81,7 +81,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-       "gambatte_gb_internal_palette",
-       "Internal Palette",
-       NULL,
--      "Selects palette used for colorizing Game Boy games when 'GB Colorization' is set to 'Internal', or when 'GB Colorization' is set to 'Auto' and game has no pre-defined SGB/GBC palette. 'GB' palettes mimic the display of original Game Boy hardware. 'GBC' palettes are identical to the built-in presets of the Game Boy Color. 'SGB' palettes are identical to the built-in presets of the Super Game Boy.",
-+      "Selects palette used when 'GB Colorization' is set to 'Internal.'",
-       NULL,
-       NULL,
-       {
-@@ -135,7 +135,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-          { "Special 1",                NULL },
-          { "Special 2",                NULL },
-          { "Special 3",                NULL },
--         { "Special 4 (TI-83 Legacy)", NULL },
-+         { "Special 4",                NULL },
-          { "TWB64 - Pack 1",           NULL },
-          { "TWB64 - Pack 2",           NULL },
-          { NULL, NULL },
-@@ -144,233 +144,233 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_gb_palette_twb64_1",
--      "> TWB64 - Pack 1 Palette",
-+      "TWB64 - Pack 1",
-       NULL,
-       "Selects internal colorization palette when 'Internal Palette' is set to 'TWB64 - Pack 1'.",
-       NULL,
-       NULL,
-       {
--         { "TWB64 001 - Aqours Blue",               NULL },
--         { "TWB64 002 - Anime Expo Ver.",           NULL },
--         { "TWB64 003 - SpongeBob Yellow",          NULL },
--         { "TWB64 004 - Patrick Star Pink",         NULL },
--         { "TWB64 005 - Neon Red",                  NULL },
--         { "TWB64 006 - Neon Blue",                 NULL },
--         { "TWB64 007 - Neon Yellow",               NULL },
--         { "TWB64 008 - Neon Green",                NULL },
--         { "TWB64 009 - Neon Pink",                 NULL },
--         { "TWB64 010 - Mario Red",                 NULL },
--         { "TWB64 011 - Nick Orange",               NULL },
--         { "TWB64 012 - Virtual Boy Ver.",          NULL },
--         { "TWB64 013 - Golden Wild",               NULL },
--         { "TWB64 014 - Builder Yellow",            NULL },
--         { "TWB64 015 - Classic Blurple",           NULL },
--         { "TWB64 016 - 765 Production Ver.",       NULL },
--         { "TWB64 017 - Superball Ivory",           NULL },
--         { "TWB64 018 - Crunchyroll Orange",        NULL },
--         { "TWB64 019 - Muse Pink",                 NULL },
--         { "TWB64 020 - Nijigasaki Yellow",         NULL },
--         { "TWB64 021 - Gamate Ver.",               NULL },
--         { "TWB64 022 - Greenscale Ver.",           NULL },
--         { "TWB64 023 - Odyssey Gold",              NULL },
--         { "TWB64 024 - Super Saiyan God",          NULL },
--         { "TWB64 025 - Super Saiyan Blue",         NULL },
--         { "TWB64 026 - Bizarre Pink",              NULL },
--         { "TWB64 027 - Nintendo Switch Lite Ver.", NULL },
--         { "TWB64 028 - Game.com Ver.",             NULL },
--         { "TWB64 029 - Sanrio Pink",               NULL },
--         { "TWB64 030 - BANDAI NAMCO Ver.",         NULL },
--         { "TWB64 031 - Cosmo Green",               NULL },
--         { "TWB64 032 - Wanda Pink",                NULL },
--         { "TWB64 033 - Link's Awakening DX Ver.",  NULL },
--         { "TWB64 034 - Travel Wood",               NULL },
--         { "TWB64 035 - Pokemon Ver.",              NULL },
--         { "TWB64 036 - Game Grump Orange",         NULL },
--         { "TWB64 037 - Scooby-Doo Mystery Ver.",   NULL },
--         { "TWB64 038 - Pokemon mini Ver.",         NULL },
--         { "TWB64 039 - Supervision Ver.",          NULL },
--         { "TWB64 040 - DMG Ver.",                  NULL },
--         { "TWB64 041 - Pocket Ver.",               NULL },
--         { "TWB64 042 - Light Ver.",                NULL },
--         { "TWB64 043 - Miraitowa Blue",            NULL },
--         { "TWB64 044 - Someity Pink",              NULL },
--         { "TWB64 045 - Pikachu Yellow",            NULL },
--         { "TWB64 046 - Eevee Brown",               NULL },
--         { "TWB64 047 - Microvision Ver.",          NULL },
--         { "TWB64 048 - TI-83 Ver.",                NULL },
--         { "TWB64 049 - Aegis Cherry",              NULL },
--         { "TWB64 050 - Labo Fawn",                 NULL },
--         { "TWB64 051 - MILLION LIVE GOLD!",        NULL },
--         { "TWB64 052 - Tokyo Midtown Ver.",        NULL },
--         { "TWB64 053 - VMU Ver.",                  NULL },
--         { "TWB64 054 - Game Master Ver.",          NULL },
--         { "TWB64 055 - Android Green",             NULL },
--         { "TWB64 056 - Ticketmaster Azure",        NULL },
--         { "TWB64 057 - Google Red",                NULL },
--         { "TWB64 058 - Google Blue",               NULL },
--         { "TWB64 059 - Google Yellow",             NULL },
--         { "TWB64 060 - Google Green",              NULL },
--         { "TWB64 061 - WonderSwan Ver.",           NULL },
--         { "TWB64 062 - Neo Geo Pocket Ver.",       NULL },
--         { "TWB64 063 - Dew Green",                 NULL },
--         { "TWB64 064 - Coca-Cola Red",             NULL },
--         { "TWB64 065 - GameKing Ver.",             NULL },
--         { "TWB64 066 - Do The Dew Ver.",           NULL },
--         { "TWB64 067 - Digivice Ver.",             NULL },
--         { "TWB64 068 - Bikini Bottom Ver.",        NULL },
--         { "TWB64 069 - Blossom Pink",              NULL },
--         { "TWB64 070 - Bubbles Blue",              NULL },
--         { "TWB64 071 - Buttercup Green",           NULL },
--         { "TWB64 072 - NASCAR Ver.",               NULL },
--         { "TWB64 073 - Lemon-Lime Green",          NULL },
--         { "TWB64 074 - Mega Man V Ver.",           NULL },
--         { "TWB64 075 - Tamagotchi Ver.",           NULL },
--         { "TWB64 076 - Phantom Red",               NULL },
--         { "TWB64 077 - Halloween Ver.",            NULL },
--         { "TWB64 078 - Christmas Ver.",            NULL },
--         { "TWB64 079 - Cardcaptor Pink",           NULL },
--         { "TWB64 080 - Pretty Guardian Gold",      NULL },
--         { "TWB64 081 - Camoflauge Ver.",           NULL },
--         { "TWB64 082 - Legendary Super Saiyan",    NULL },
--         { "TWB64 083 - Super Saiyan Rose",         NULL },
--         { "TWB64 084 - Super Saiyan",              NULL },
--         { "TWB64 085 - Mastered Ultra Instinct",   NULL },
--         { "TWB64 086 - Saint Snow Red",            NULL },
--         { "TWB64 087 - Yellow Banana",             NULL },
--         { "TWB64 088 - Green Banana",              NULL },
--         { "TWB64 089 - Super Saiyan 3",            NULL },
--         { "TWB64 090 - Super Saiyan Blue Evolved", NULL },
--         { "TWB64 091 - Pocket Tales Ver.",         NULL },
--         { "TWB64 092 - Investigation Yellow",      NULL },
--         { "TWB64 093 - S.E.E.S. Blue",             NULL },
--         { "TWB64 094 - Game Awards Cyan",          NULL },
--         { "TWB64 095 - Hokage Orange",             NULL },
--         { "TWB64 096 - Straw Hat Red",             NULL },
--         { "TWB64 097 - Sword Art Cyan",            NULL },
--         { "TWB64 098 - Deku Alpha Emerald",        NULL },
--         { "TWB64 099 - Blue Stripes Ver.",         NULL },
--         { "TWB64 100 - Stone Orange",              NULL },
-+         { "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 },
-       },
--      "TWB64 001 - Aqours Blue"
-+      "Aqours Blue"
-    },
-    {
-       "gambatte_gb_palette_twb64_2",
--      "> TWB64 - Pack 2 Palette",
-+      "TWB64 - Pack 2",
-       NULL,
-       "Selects internal colorization palette when 'Internal Palette' is set to 'TWB64 - Pack 2'.",
-       NULL,
-       NULL,
-       {
--         { "TWB64 101 - 765PRO Pink",               NULL },
--         { "TWB64 102 - CINDERELLA Blue",           NULL },
--         { "TWB64 103 - MILLION Yellow!",           NULL },
--         { "TWB64 104 - SideM Green",               NULL },
--         { "TWB64 105 - SHINY Sky Blue",            NULL },
--         { "TWB64 106 - Angry Volcano Ver.",        NULL },
--         { "TWB64 107 - Yo-kai Pink",               NULL },
--         { "TWB64 108 - Yo-kai Green",              NULL },
--         { "TWB64 109 - Yo-kai Blue",               NULL },
--         { "TWB64 110 - Yo-kai Purple",             NULL },
--         { "TWB64 111 - Aquatic Iro",               NULL },
--         { "TWB64 112 - Tea Midori",                NULL },
--         { "TWB64 113 - Sakura Pink",               NULL },
--         { "TWB64 114 - Wisteria Murasaki",         NULL },
--         { "TWB64 115 - Oni Aka",                   NULL },
--         { "TWB64 116 - Golden Kiiro",              NULL },
--         { "TWB64 117 - Silver Shiro",              NULL },
--         { "TWB64 118 - Fruity Orange",             NULL },
--         { "TWB64 119 - AKB48 Pink",                NULL },
--         { "TWB64 120 - Miku Blue",                 NULL },
--         { "TWB64 121 - Fairy Tail Red",            NULL },
--         { "TWB64 122 - Survey Corps Brown",        NULL },
--         { "TWB64 123 - Island Green",              NULL },
--         { "TWB64 124 - Mania Plus Green",          NULL },
--         { "TWB64 125 - Ninja Turtle Green",        NULL },
--         { "TWB64 126 - Slime Blue",                NULL },
--         { "TWB64 127 - Lime Midori",               NULL },
--         { "TWB64 128 - Ghostly Aoi",               NULL },
--         { "TWB64 129 - Retro Bogeda",              NULL },
--         { "TWB64 130 - Royal Blue",                NULL },
--         { "TWB64 131 - Neon Purple",               NULL },
--         { "TWB64 132 - Neon Orange",               NULL },
--         { "TWB64 133 - Moonlight Vision",          NULL },
--         { "TWB64 134 - Tokyo Red",                 NULL },
--         { "TWB64 135 - Paris Gold",                NULL },
--         { "TWB64 136 - Beijing Blue",              NULL },
--         { "TWB64 137 - Pac-Man Yellow",            NULL },
--         { "TWB64 138 - Irish Green",               NULL },
--         { "TWB64 139 - Kakarot Orange",            NULL },
--         { "TWB64 140 - Dragon Ball Orange",        NULL },
--         { "TWB64 141 - Christmas Gold",            NULL },
--         { "TWB64 142 - Pepsi Blue",                NULL },
--         { "TWB64 143 - Bubblun Green",             NULL },
--         { "TWB64 144 - Bobblun Blue",              NULL },
--         { "TWB64 145 - Baja Blast Storm",          NULL },
--         { "TWB64 146 - Olympic Gold",              NULL },
--         { "TWB64 147 - Value Orange",              NULL },
--         { "TWB64 148 - Liella Purple!",            NULL },
--         { "TWB64 149 - Olympic Silver",            NULL },
--         { "TWB64 150 - Olympic Bronze",            NULL },
--         { "TWB64 151 - ANA Sky Blue",              NULL },
--         { "TWB64 152 - Nijigasaki Orange",         NULL },
--         { "TWB64 153 - HoloBlue",                  NULL },
--         { "TWB64 154 - Wrestling Red",             NULL },
--         { "TWB64 155 - Yoshi Egg Green",           NULL },
--         { "TWB64 156 - Pokedex Red",               NULL },
--         { "TWB64 157 - Disney Dream Blue",         NULL },
--         { "TWB64 158 - Xbox Green",                NULL },
--         { "TWB64 159 - Sonic Mega Blue",           NULL },
--         { "TWB64 160 - G4 Orange",                 NULL },
--         { "TWB64 161 - Scarlett Green",            NULL },
--         { "TWB64 162 - Glitchy Blue",              NULL },
--         { "TWB64 163 - Classic LCD",               NULL },
--         { "TWB64 164 - 3DS Virtual Console Ver.",  NULL },
--         { "TWB64 165 - PocketStation Ver.",        NULL },
--         { "TWB64 166 - Game and Gold",             NULL },
--         { "TWB64 167 - Smurfy Blue",               NULL },
--         { "TWB64 168 - Swampy Ogre Green",         NULL },
--         { "TWB64 169 - Sailor Spinach Green",      NULL },
--         { "TWB64 170 - Shenron Green",             NULL },
--         { "TWB64 171 - Berserk Blood",             NULL },
--         { "TWB64 172 - Super Star Pink",           NULL },
--         { "TWB64 173 - Gamebuino Classic Ver.",    NULL },
--         { "TWB64 174 - Barbie Pink",               NULL },
--         { "TWB64 175 - Star Command Green",        NULL },
--         { "TWB64 176 - Nokia 3310 Ver.",           NULL },
--         { "TWB64 177 - Clover Green",              NULL },
--         { "TWB64 178 - Crash Orange",              NULL },
--         { "TWB64 179 - Famicom Disk Yellow",       NULL },
--         { "TWB64 180 - Team Rocket Red",           NULL },
--         { "TWB64 181 - SEIKO Timer Yellow",        NULL },
--         { "TWB64 182 - PINK109",                   NULL },
--         { "TWB64 183 - Doraemon Blue",             NULL },
--         { "TWB64 184 - Fury Blue",                 NULL },
--         { "TWB64 185 - Rockstar Orange",           NULL },
--         { "TWB64 186 - Puyo Puyo Green",           NULL },
--         { "TWB64 187 - Susan G. Pink",             NULL },
--         { "TWB64 188 - Pizza Hut Red",             NULL },
--         { "TWB64 189 - Plumbob Green",             NULL },
--         { "TWB64 190 - Grand Ivory",               NULL },
--         { "TWB64 191 - Demon's Gold",              NULL },
--         { "TWB64 192 - SEGA Tokyo Blue",           NULL },
--         { "TWB64 193 - Champion Blue",             NULL },
--         { "TWB64 194 - DK Barrel Brown",           NULL },
--         { "TWB64 195 - Evangelion Green",          NULL },
--         { "TWB64 196 - Equestrian Purple",         NULL },
--         { "TWB64 197 - Autobot Red",               NULL },
--         { "TWB64 198 - Niconico Sea Green",        NULL },
--         { "TWB64 199 - Duracell Copper",           NULL },
--         { "TWB64 200 - TOKYO SKYTREE CLOUDY BLUE", NULL },
-+         { "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 },
-       },
--      "TWB64 101 - 765PRO Pink"
-+      "765PRO Pink"
-    },
-    {
-       "gambatte_gbc_color_correction",
-       "Color Correction",
-       NULL,
--      "Adjusts output colors to match the display of real Game Boy Color hardware. 'GBC Only' ensures that correction will only be applied when playing Game Boy Color games, or when using a Game Boy Color palette to colorize a Game Boy game. 'Always' applies color correction to all content, and will produce unexpected/suboptimal results when using 'GB' or 'SGB' internal color palettes.",
-+      "Adjusts colors to match the display of real GBC hardware. 'GBC Only' only applies correction when playing GBC games or using a GBC palette.",
-       NULL,
-       NULL,
-       {
-@@ -383,9 +383,9 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_gbc_color_correction_mode",
--      "Color Correction Mode",
-+      "CC Mode",
-       NULL,
--      "Specifies method used when performing color correction. 'Accurate' produces output almost indistinguishable from a real Game Boy Color LCD panel. 'Fast' merely darkens colors and reduces saturation, and may be used on low-end hardware if the 'Accurate' method is too slow.",
-+      "'Accurate' produces output almost indistinguishable from a real GBC LCD panel. 'Fast' merely darkens colors and reduces saturation.",
-       NULL,
-       NULL,
-       {
-@@ -397,9 +397,9 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_gbc_frontlight_position",
--      "Color Correction - Frontlight Position",
-+      "CC Frontlight",
-       NULL,
--      "Simulates the physical response of the Game Boy Color LCD panel when illuminated from different angles. 'Central' represents standard color reproduction. 'Above Screen' increases brightness. 'Below Screen' reduces brightness. This setting only applies when 'Color Correction Mode' is set to 'Accurate'.",
-+      "Simulates the GBC LCD panel when illuminated from different angles. This setting only applies when 'Color Correction Mode' is set to 'Accurate'.",
-       NULL,
-       NULL,
-       {
-@@ -412,9 +412,9 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_dark_filter_level",
--      "Dark Filter Level (percent)",
-+      "Dark Level",
-       NULL,
--      "Enable luminosity-based brightness reduction. May be used to avoid glare/eye strain when playing games with white backgrounds, which are intended for display on a non-backlit Game Boy Color and can therefore appear uncomfortably bright when viewed on a modern backlit screen.",
-+      "Enable luminosity-based brightness reduction. May be used to avoid glare/eye strain when playing games with white backgrounds.",
-       NULL,
-       NULL,
-       {
-@@ -435,9 +435,9 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_gb_hwmode",
--      "Emulated Hardware (restart)",
-+      "Hardware (restart)",
-       NULL,
--      "Specify which type of hardware to emulate. 'Auto' is recommended. Selecting 'GBA' unlocks extra features in certain 'GBA enhanced' Game Boy Color games (Shantae, Wendy - Every Witch Way, Legend of Zelda: Oracle of Seasons/Ages...).",
-+      "Which type of hardware to emulate. 'Auto' is recommended. 'GBA' unlocks extra features in certain 'GBA enhanced' Game Boy Color games.",
-       NULL,
-       NULL,
-       {
-@@ -451,7 +451,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_gb_bootloader",
--      "Use Official Bootloader (restart)",
-+      "Boot Logo (restart)",
-       NULL,
-       "Enable support for official Game Boy and Game Boy Color bootloaders, with corresponding start-up logo animations.",
-       NULL,
-@@ -465,25 +465,25 @@ struct retro_core_option_v2_definition option_defs_us[] = {
-    },
-    {
-       "gambatte_mix_frames",
--      "Interframe Blending",
-+      "Blending",
-       NULL,
--      "Simulates LCD ghosting effects. 'Simple' performs a 50:50 mix of the current and previous frames. 'LCD Ghosting' mimics natural LCD response times by combining multiple buffered frames. 'Simple' blending is required when playing games that rely on LCD ghosting for transparency effects (Wave Race, Ballistic, Chikyuu Kaihou Gun ZAS...).",
-+      "Simulates LCD ghosting effects. 'Simple' performs a 50:50 mix. 'Ghosting' mimics LCD response times with multiple buffered frames.",
-       NULL,
-       NULL,
-       {
-          { "disabled",          NULL },
-          { "mix",               "Simple" },
--         { "lcd_ghosting",      "LCD Ghosting (Accurate)" },
--         { "lcd_ghosting_fast", "LCD Ghosting (Fast)" },
-+         { "lcd_ghosting",      "Ghosting (Accurate)" },
-+         { "lcd_ghosting_fast", "Ghosting (Fast)" },
-          { NULL, NULL },
-       },
-       "disabled"
-    },
-    {
-       "gambatte_up_down_allowed",
--      "Allow Opposing Directions",
-+      "Opp. Directions",
-       NULL,
--      "Enabling this will allow pressing / quickly alternating / holding both left and right (or up and down) directions at the same time. This may cause movement-based glitches.",
-+      "Enabling this will allow pressing / quickly alternating / holding both left and right (or up and down) directions at the same time.",
-       NULL,
-       NULL,
-       {