From b149f0d054080be0b6bd5dad9582bf31c0173e09 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Wed, 6 Jul 2022 20:10:28 +0200 Subject: [PATCH] Added support for the Fujitsu FM Towns (fmtowns) game system on Unix and Windows. --- es-app/assets/Windows_Portable_README.txt | 3 +++ es-app/src/PlatformId.cpp | 1 + es-app/src/PlatformId.h | 1 + es-app/src/scrapers/GamesDBJSONScraper.cpp | 1 + es-app/src/scrapers/ScreenScraper.cpp | 1 + resources/systems/macos/es_systems.xml | 9 +++++++++ resources/systems/unix/es_find_rules.xml | 8 ++++++++ resources/systems/unix/es_systems.xml | 9 +++++++++ resources/systems/windows/es_find_rules.xml | 11 +++++++++++ resources/systems/windows/es_find_rules_portable.xml | 8 ++++++++ resources/systems/windows/es_systems.xml | 9 +++++++++ 11 files changed, 61 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 3df156bdd..76409067d 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -19,6 +19,8 @@ This portable release contains a specific es_find_rules.xml file that will only If you would like to use the default configuration file instead which will also look for emulators elsewhere on your system then go to resources\systems\windows\ and delete the es_find_rules.xml file and rename es_find_rules_default.xml to es_find_rules.xml +See resources\systems\windows\es_find_rules.xml for more details about the emulators listed below. + Preconfigured emulator locations: Emulators\RetroArch-Win64\retroarch.exe @@ -60,6 +62,7 @@ Emulators\SheepShaver\SheepShaver.exe Emulators\snes9x\snes9x-x64.exe Emulators\solarus\solarus-run.exe Emulators\Supermodel\Supermodel.exe +Emulators\tsugaru\Tsugaru_CUI.exe Emulators\VBA-M\visualboyadvance-m.exe Emulators\Vita3K\Vita3K.exe Emulators\xemu\xemu.exe diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 353bebd1d..59cf61388 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -53,6 +53,7 @@ namespace PlatformIds "dreamcast", // Sega Dreamcast "famicom", // Nintendo Family Computer "fds", // Nintendo Famicom Disk System + "fmtowns", // Fujitsu FM Towns "gameandwatch", // Nintendo Game and Watch "gamegear", // Sega Game Gear "gb", // Nintendo Game Boy diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index 8fffac86c..05f705909 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -52,6 +52,7 @@ namespace PlatformIds SEGA_DREAMCAST, NINTENDO_FAMICOM, NINTENDO_FAMICOM_DISK_SYSTEM, + FUJITSU_FM_TOWNS, NINTENDO_GAME_AND_WATCH, SEGA_GAME_GEAR, NINTENDO_GAME_BOY, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index dd578b26e..cc2668cf8 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -63,6 +63,7 @@ namespace {COMMODORE_VIC20, "4945"}, {CREATRONIC_MEGA_DUCK, "4948"}, {DAPHNE, "23"}, + {FUJITSU_FM_TOWNS, "4932"}, {INTELLIVISION, "32"}, {APPLE_MACINTOSH, "37"}, {GOOGLE_ANDROID, "4916"}, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index b1bc1725c..1040d68f0 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -57,6 +57,7 @@ namespace {COMMODORE_VIC20, 73}, {CREATRONIC_MEGA_DUCK, 90}, {DAPHNE, 49}, + {FUJITSU_FM_TOWNS, 253}, {INTELLIVISION, 115}, {GAMEENGINE_LUTRO, 206}, {APPLE_MACINTOSH, 146}, diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index b4d5b2d77..d7a792e5d 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -457,6 +457,15 @@ fds fds + + fmtowns + Fujitsu FM Towns + %ROMPATH%/fmtowns + .7z .7Z .zip .ZIP + PLACEHOLDER %ROM% + fmtowns + fmtowns + gameandwatch Nintendo Game and Watch diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index b807d4deb..cff1b2c07 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -429,6 +429,14 @@ ~/bin/publish/Ryujinx + + + + ~/Applications/tsugaru/Tsugaru_CUI + ~/.local/bin/tsugaru/Tsugaru_CUI + ~/bin/tsugaru/Tsugaru_CUI + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index b416eb7cd..ef9ef3395 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -461,6 +461,15 @@ fds fds + + fmtowns + Fujitsu FM Towns + %ROMPATH%/fmtowns + .cue .CUE .iso .ISO + %EMULATOR_TSUGARU% %EMUDIR%/roms -HOSTSHORTCUT ESC 0 0 FORCEQUIT -FULLSCREEN -CD %ROM% %INJECT%=%BASENAME%.cfg + fmtowns + fmtowns + gameandwatch Nintendo Game and Watch diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index bc350e48b..9d8cc621b 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -489,6 +489,17 @@ %ESPATH%\..\Supermodel\Supermodel.exe + + + + Tsugaru_CUI.exe + + + %ESPATH%\Emulators\tsugaru\Tsugaru_CUI.exe + %ESPATH%\tsugaru\Tsugaru_CUI.exe + %ESPATH%\..\tsugaru\Tsugaru_CUI.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index 8085e3860..63b00bdaa 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -333,6 +333,14 @@ %ESPATH%\..\Supermodel\Supermodel.exe + + + + %ESPATH%\Emulators\tsugaru\Tsugaru_CUI.exe + %ESPATH%\tsugaru\Tsugaru_CUI.exe + %ESPATH%\..\tsugaru\Tsugaru_CUI.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 694f2679f..a4c9a1cc0 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -461,6 +461,15 @@ fds fds + + fmtowns + Fujitsu FM Towns + %ROMPATH%\fmtowns + .cue .CUE .iso .ISO + %EMULATOR_TSUGARU% %EMUDIR%\roms -HOSTSHORTCUT ESC 0 0 FORCEQUIT -FULLSCREEN -CD %ROM% %INJECT%=%BASENAME%.cfg + fmtowns + fmtowns + gameandwatch Nintendo Game and Watch