diff --git a/USERGUIDE.md b/USERGUIDE.md index 7af4653cd..d633bece3 100644 --- a/USERGUIDE.md +++ b/USERGUIDE.md @@ -1479,9 +1479,10 @@ Consider the table below a work in progress as it's obvioulsy not fully populate | mess | Multi Emulator Super System | | | | moonlight | Moonlight game streaming | | | | moto | Thomson MO/TO series | | | -| msx | MSX | | | -| msx1 | MSX1 | | | -| msx2 | MSX2 | | | +| msx | MSX | RetroArch (blueMSX) | | +| msx1 | MSX1 | RetroArch (blueMSX) | | +| msx2 | MSX2 | RetroArch (blueMSX) | | +| msxturbor | MSX Turbo R | RetroArch (blueMSX) | | | naomi | Sega NAOMI | | | | n3ds | Nintendo 3DS | RetroArch (Citra) | | | n64 | Nintendo 64 | RetroArch (Mupen64Plus-Next on Unix & macOS, ParaLLEl N64 on Windows) | Single archive or ROM file in root folder | diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index aaebe16cb..25a84afa7 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -66,6 +66,8 @@ namespace PlatformIds "moonlight", // Moonlight game streaming "moto", // Thomson MO/TO series "msx", // MSX + "msx2", // MSX2 + "msxturbor", // MSX Turbo R "n3ds", // Nintendo 3DS "n64", // Nintendo 64 "naomi", // Sega NAOMI diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index d1cc89ce6..05a0f7d5b 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -66,6 +66,8 @@ namespace PlatformIds MOONLIGHT, THOMSON_MOTO, MSX, + MSX2, + MSX_TURBO_R, NINTENDO_3DS, NINTENDO_64, SEGA_NAOMI, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 3bbe8d704..7b82b6d51 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -59,6 +59,8 @@ const std::map gamesdb_new_platformid_map { { MICROSOFT_XBOX_360, "15" }, { MOONLIGHT, "1" }, { MSX, "4929" }, + { MSX2, "4929" }, + { MSX_TURBO_R, "4929" }, { SNK_NEO_GEO, "24" }, { SNK_NEO_GEO_CD, "24" }, { SNK_NEO_GEO_POCKET, "4922" }, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index 7a935b76b..f1459482e 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -58,6 +58,8 @@ const std::map screenscraper_platformid_map { { MICROSOFT_XBOX_360, 33 }, { MOONLIGHT, 138 }, { MSX, 113 }, + { MSX2, 116 }, + { MSX_TURBO_R, 118 }, { SNK_NEO_GEO, 142 }, { SNK_NEO_GEO_CD, 142 }, { SNK_NEO_GEO_POCKET, 25}, diff --git a/resources/templates/es_systems.cfg_macos b/resources/templates/es_systems.cfg_macos index 899ab20c9..44c1308b8 100644 --- a/resources/templates/es_systems.cfg_macos +++ b/resources/templates/es_systems.cfg_macos @@ -601,9 +601,18 @@ %ROMPATH%/msx2 .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/bluemsx_libretro.dylib %ROM% - msx + msx2 msx2 + + msxturbor + MSX Turbo R + %ROMPATH%/msxturbor + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + /Applications/RetroArch.app/Contents/MacOS/RetroArch -L %EMUPATH%/../Resources/cores/bluemsx_libretro.dylib %ROM% + msxturbor + msxturbor + n3ds Nintendo 3DS diff --git a/resources/templates/es_systems.cfg_unix b/resources/templates/es_systems.cfg_unix index acfa8ae93..bdc3a1369 100644 --- a/resources/templates/es_systems.cfg_unix +++ b/resources/templates/es_systems.cfg_unix @@ -601,9 +601,18 @@ %ROMPATH%/msx2 .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP retroarch -L %COREPATH%/bluemsx_libretro.so %ROM% - msx + msx2 msx2 + + msxturbor + MSX Turbo R + %ROMPATH%/msxturbor + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + retroarch -L %COREPATH%/bluemsx_libretro.so %ROM% + msxturbor + msxturbor + n3ds Nintendo 3DS diff --git a/resources/templates/es_systems.cfg_unix_flatpak b/resources/templates/es_systems.cfg_unix_flatpak index 0ac8d2cca..c34466186 100644 --- a/resources/templates/es_systems.cfg_unix_flatpak +++ b/resources/templates/es_systems.cfg_unix_flatpak @@ -601,9 +601,18 @@ %ROMPATH%/msx2 .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM% - msx + msx2 msx2 + + msxturbor + MSX Turbo R + %ROMPATH%/msxturbor + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + flatpak run org.libretro.RetroArch -L %COREPATH%/bluemsx_libretro.so %ROM% + msxturbor + msxturbor + n3ds Nintendo 3DS diff --git a/resources/templates/es_systems.cfg_windows b/resources/templates/es_systems.cfg_windows index 99fc99308..00adcdd65 100644 --- a/resources/templates/es_systems.cfg_windows +++ b/resources/templates/es_systems.cfg_windows @@ -601,9 +601,18 @@ %ROMPATH%\msx2 .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP retroarch.exe -L %EMUPATH%\cores\bluemsx_libretro.dll %ROM% - msx + msx2 msx2 + + msxturbor + MSX Turbo R + %ROMPATH%\msxturbor + .rom .ROM .ri .RI .mx1 .MX1 .mx2 .MX2 .col .COL .dsk .DSK .cas .CAS .sg .SG .sc .SC .m3u .M3U .7z .7Z .zip .ZIP + retroarch.exe -L %EMUPATH%\cores\bluemsx_libretro.dll %ROM% + msxturbor + msxturbor + n3ds Nintendo 3DS diff --git a/themes/rbsimple-DE/msxturbor/colors.xml b/themes/rbsimple-DE/msxturbor/colors.xml new file mode 100644 index 000000000..d295bf66e --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/colors.xml @@ -0,0 +1,18 @@ + + 6 + + + + 637080 + + + 28292b + + + 99784b + + + 32100f + + + diff --git a/themes/rbsimple-DE/msxturbor/images/console.svg b/themes/rbsimple-DE/msxturbor/images/console.svg new file mode 100644 index 000000000..2fd054e3f --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/images/console.svg @@ -0,0 +1 @@ +I don’t like bugs! \ No newline at end of file diff --git a/themes/rbsimple-DE/msxturbor/images/consolegame.svg b/themes/rbsimple-DE/msxturbor/images/consolegame.svg new file mode 100644 index 000000000..ff65750ca --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/images/consolegame.svg @@ -0,0 +1 @@ +I don’t like bugs!I don’t like bugs! \ No newline at end of file diff --git a/themes/rbsimple-DE/msxturbor/images/controller.svg b/themes/rbsimple-DE/msxturbor/images/controller.svg new file mode 100644 index 000000000..26f64d15c --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/images/controller.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/themes/rbsimple-DE/msxturbor/images/game.svg b/themes/rbsimple-DE/msxturbor/images/game.svg new file mode 100644 index 000000000..22ffcc370 --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/images/game.svg @@ -0,0 +1 @@ +I don’t like bugs! \ No newline at end of file diff --git a/themes/rbsimple-DE/msxturbor/images/logo.svg b/themes/rbsimple-DE/msxturbor/images/logo.svg new file mode 100644 index 000000000..1aef9da9d --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/images/logo.svg @@ -0,0 +1 @@ +I don’t like bugs! \ No newline at end of file diff --git a/themes/rbsimple-DE/msxturbor/systeminfo.xml b/themes/rbsimple-DE/msxturbor/systeminfo.xml new file mode 100644 index 000000000..2cb9a26de --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/systeminfo.xml @@ -0,0 +1,33 @@ + + 6 + + + + Manufacturer : Panasonic + + + Year of Release : 1990 + + + OS : MSX BASIC V4.0 (32 kB) + + + CPU : R800 (DAR800-X0G) @ 28.64 MHz and Z80A @ 3.58 + + + RAM : 256 KB (FS-A1ST) or 512 KB (FS-A1GT) / VRAM : 128 KB + + + ROM : 96 KB + + + GPU : Yamaha V9958 + + + Sound chip : PSG (AY-3-8910 compatible), MSX-MUSIC, PCM, MSX-MIDI + + + Resolution : 512 x 212 (4 or 16 colors) and 256 x 212 (16 to 19268 colors) + + + diff --git a/themes/rbsimple-DE/msxturbor/theme.xml b/themes/rbsimple-DE/msxturbor/theme.xml new file mode 100644 index 000000000..f097080c3 --- /dev/null +++ b/themes/rbsimple-DE/msxturbor/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 + + +