diff --git a/USERGUIDE.md b/USERGUIDE.md index 2baf1cb54..68886383b 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -1481,8 +1481,8 @@ Consider the table below a work in progress as it's obvioulsy not fully populate | n64 | Nintendo 64 | RetroArch (Mupen64Plus-Next on Unix & macOS, ParaLLEl N64 on Windows) | Single archive or ROM file in root folder | | nds | Nintendo DS | | | | neogeo | Neo Geo | RetroArch (FinalBurn Neo)* | Single archive file following MAME name standard in root folder | -| neogeocd | Neo Geo CD | RetroArch (NeoCD)* | Single ZIP archive per game which includes the CD image and ripped audio | -| neogeocdjp | Neo Geo CD (Japan) | RetroArch (NeoCD)* | Single ZIP archive per game which includes the CD image and ripped audio | +| neogeocd | Neo Geo CD | RetroArch (NeoCD)* | Single archive in root folder (which includes the CD image and ripped audio) | +| neogeocdjp | Neo Geo CD (Japan) | RetroArch (NeoCD)* | Single archive in root folder (which includes the CD image and ripped audio) | | nes | Nintendo Entertainment System | RetroArch (Nestopia UE) | Single archive or ROM file in root folder | | ngp | Neo Geo Pocket | | | | ngpc | Neo Geo Pocket Color | | | @@ -1530,6 +1530,7 @@ Consider the table below a work in progress as it's obvioulsy not fully populate | wiiu | Nintendo Wii U | | | | wonderswan | Bandai WonderSwan | | | | wonderswancolor | Bandai WonderSwan Color | | | +| x1 | Sharp X1 | RetroArch (x1) | Single archive or ROM file in root folder | | x68000 | Sharp X68000 | | | | xbox | Microsoft Xbox | | | | xbox360 | Microsoft Xbox 360 | | | diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index ddc18a9c6..c512a0bbc 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -83,6 +83,7 @@ namespace PlatformIds "psp", // PlayStation Portable "snes", // Super Nintendo Entertainment System "scummvm", + "x1", "x68000", "solarus", "pcengine", // (Aka turbografx-16), HuCards only diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 988d6aeec..8d36db4c9 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -83,6 +83,7 @@ namespace PlatformIds PLAYSTATION_PORTABLE, SUPER_NINTENDO, SCUMMVM, + SHARP_X1, SHARP_X68000, SOLARUS, TURBOGRAFX_16, // (Aka PC Engine) HuCards only. diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 148222c1f..6e244001b 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -98,6 +98,8 @@ const std::map gamesdb_new_platformid_map { { PLAYSTATION_VITA, "39" }, { PLAYSTATION_PORTABLE, "13" }, { SUPER_NINTENDO, "6" }, + { SHARP_X1, "4977" }, + { SHARP_X68000, "4931"}, { SUPERGRAFX, "34" }, // Combined with TurboGrafx-16 { TURBOGRAFX_16, "34" }, // HuCards only. { TURBOGRAFX_CD, "4955" }, // CD-ROMs only. diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index ed72891e6..1ff2c8b39 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -94,6 +94,7 @@ const std::map screenscraper_platformid_map { { SEGA_MEGA_DRIVE, 1 }, { SEGA_SATURN, 22 }, { SEGA_SG1000, 109 }, + { SHARP_X1, 220}, { SHARP_X68000, 79}, { SOLARUS, 223 }, { PLAYSTATION, 57 }, diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos index 13a9d6dce..e34fb8aa5 100644 --- a/resources/templates/es_systems.cfg_macos +++ b/resources/templates/es_systems.cfg_macos @@ -1072,6 +1072,15 @@ wonderswancolor wonderswancolor + + x1 + Sharp X1 + %ROMPATH%/x1 + .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/x1_libretro.dylib %ROM% + x1 + x1 + x68000 Sharp X68000 diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix index 6fa490704..74f95ec4b 100644 --- a/resources/templates/es_systems.cfg_unix +++ b/resources/templates/es_systems.cfg_unix @@ -1072,6 +1072,15 @@ wonderswancolor wonderswancolor + + x1 + Sharp X1 + %ROMPATH%/x1 + .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + retroarch -L %COREPATH%/x1_libretro.so %ROM% + x1 + x1 + x68000 Sharp X68000 diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak index ef8c420dc..65d734a57 100644 --- a/resources/templates/es_systems.cfg_unix_flatpak +++ b/resources/templates/es_systems.cfg_unix_flatpak @@ -1072,6 +1072,15 @@ wonderswancolor wonderswancolor + + x1 + Sharp X1 + %ROMPATH%/x1 + .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + flatpak run org.libretro.RetroArch -L %COREPATH%/x1_libretro.so %ROM% + x1 + x1 + x68000 Sharp X68000 diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows index ef2636f9d..ee3a659bc 100644 --- a/resources/templates/es_systems.cfg_windows +++ b/resources/templates/es_systems.cfg_windows @@ -1072,6 +1072,15 @@ wonderswancolor wonderswancolor + + x1 + Sharp X1 + %ROMPATH%\x1 + .dx1 .DX1 .2d .2D .2hd .2HD .tfd .TFD .d88 .D88 .88d .88D .hdm .HDM .xdf .XDF .dup .DUP .tap .TAP .cmd .CMD .7z .7Z .zip .ZIP + retroarch.exe -L %EMUPATH%\cores\x1_libretro.dll %ROM% + x1 + x1 + x68000 Sharp X68000 diff --git a/themes/rbsimple-DE/x1/colors.xml b/themes/rbsimple-DE/x1/colors.xml new file mode 100644 index 000000000..90ccfca80 --- /dev/null +++ b/themes/rbsimple-DE/x1/colors.xml @@ -0,0 +1,18 @@ + + 6 + + + + 752421 + + + 4A90CB + + + C1C3D1 + + + 28333D + + + diff --git a/themes/rbsimple-DE/x1/images/console.svg b/themes/rbsimple-DE/x1/images/console.svg new file mode 100644 index 000000000..4c7c2a66e --- /dev/null +++ b/themes/rbsimple-DE/x1/images/console.svg @@ -0,0 +1 @@ +CENTRAL PROCESSING UNIT \ No newline at end of file diff --git a/themes/rbsimple-DE/x1/images/consolegame.svg b/themes/rbsimple-DE/x1/images/consolegame.svg new file mode 100644 index 000000000..84229c4b3 --- /dev/null +++ b/themes/rbsimple-DE/x1/images/consolegame.svg @@ -0,0 +1 @@ +CENTRAL PROCESSING UNIT \ No newline at end of file diff --git a/themes/rbsimple-DE/x1/images/controller.svg b/themes/rbsimple-DE/x1/images/controller.svg new file mode 100644 index 000000000..bb7ef1bfc --- /dev/null +++ b/themes/rbsimple-DE/x1/images/controller.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/rbsimple-DE/x1/images/game.svg b/themes/rbsimple-DE/x1/images/game.svg new file mode 100644 index 000000000..7fe840cf7 --- /dev/null +++ b/themes/rbsimple-DE/x1/images/game.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/rbsimple-DE/x1/images/logo.svg b/themes/rbsimple-DE/x1/images/logo.svg new file mode 100644 index 000000000..bc7ea340c --- /dev/null +++ b/themes/rbsimple-DE/x1/images/logo.svg @@ -0,0 +1 @@ +I don’t like bugs! \ No newline at end of file diff --git a/themes/rbsimple-DE/x1/systeminfo.xml b/themes/rbsimple-DE/x1/systeminfo.xml new file mode 100644 index 000000000..781cab41b --- /dev/null +++ b/themes/rbsimple-DE/x1/systeminfo.xml @@ -0,0 +1,33 @@ + + 6 + + + + Manufacturer : Sharp Corporation + + + Year of Release : 1982 + + + OS : CP/M + + + CPU : Sharp Z80 A running @ 4 MHz + + + RAM : 64 KB / VRAM : 4 KB (up to 48 KB) + + + ROM : 6 KB + + + GPU : Sharp-Hudson Custom Chipset + + + Sound chip : General Instrument AY-3-8910 or Yamaha YM2149 + + + Display : 320 x 200 / 640 x 200 (8 colours) + + + diff --git a/themes/rbsimple-DE/x1/theme.xml b/themes/rbsimple-DE/x1/theme.xml new file mode 100644 index 000000000..f097080c3 --- /dev/null +++ b/themes/rbsimple-DE/x1/theme.xml @@ -0,0 +1,40 @@ + + 6 + ./../theme.xml + ./colors.xml + ./systeminfo.xml + + + + ./images/controller.svg + + + + + + 262626 + 262626 + + + + + + ./images/logo.svg + + + ./images/consolegame.svg + + + + + + ./images/console.svg + + + + + + ./images/logo.svg + + +