From 54eef96a01330b3f9c2eec689063ef516b31abdb Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Tue, 3 Oct 2023 21:01:34 +0200 Subject: [PATCH] Added support for the Nokia N-Gage (ngage) game system --- es-app/assets/Windows_Portable_README.txt | 1 + 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 + .../hwtype_year/es_systems_sorting.xml | 4 ++++ .../es_systems_sorting.xml | 4 ++++ .../manufacturer_year/es_systems_sorting.xml | 4 ++++ resources/sorting/year/es_systems_sorting.xml | 4 ++++ resources/systems/macos/es_find_rules.xml | 6 ++++++ resources/systems/macos/es_systems.xml | 10 +++++++++ resources/systems/unix/es_find_rules.xml | 21 +++++++++++++++++++ resources/systems/unix/es_systems.xml | 12 +++++++++++ resources/systems/windows/es_find_rules.xml | 10 +++++++++ .../windows/es_find_rules_portable.xml | 7 +++++++ resources/systems/windows/es_systems.xml | 10 +++++++++ 16 files changed, 97 insertions(+) diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt index 4906a62d7..e3a84234f 100644 --- a/es-app/assets/Windows_Portable_README.txt +++ b/es-app/assets/Windows_Portable_README.txt @@ -62,6 +62,7 @@ Emulators\DOSBox-X\dosbox-x.exe Emulators\duckstation\duckstation-nogui-x64-ReleaseLTCG.exe Emulators\duckstation\duckstation-qt-x64-ReleaseLTCG.exe Emulators\EasyRPG\Player.exe +Emulators\EKA2L1\eka2l1_qt.exe Emulators\fbneo\fbneo64.exe Emulators\fbneo\fbneo.exe Emulators\flycast\flycast.exe diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index 9aedd3c78..b6056153d 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -93,6 +93,7 @@ namespace PlatformIds "neogeo", // SNK Neo Geo "neogeocd", // SNK Neo Geo CD "nes", // Nintendo Entertainment System + "ngage", // Nokia N-Gage "ngp", // SNK Neo Geo Pocket "ngpc", // SNK Neo Geo Pocket Color "odyssey2", // Magnavox Odyssey2 diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h index d1583bbb8..679049dbd 100644 --- a/es-app/src/PlatformId.h +++ b/es-app/src/PlatformId.h @@ -92,6 +92,7 @@ namespace PlatformIds SNK_NEO_GEO, SNK_NEO_GEO_CD, NINTENDO_ENTERTAINMENT_SYSTEM, + NOKIA_NGAGE, SNK_NEO_GEO_POCKET, SNK_NEO_GEO_POCKET_COLOR, VIDEOPAC_ODYSSEY2, diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index b80491d50..772b05974 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -101,6 +101,7 @@ namespace {NINTENDO_POKEMON_MINI, "4957"}, {NINTENDO_SATELLAVIEW, "6"}, {NINTENDO_SWITCH, "4971"}, + {NOKIA_NGAGE, "4938"}, {BANDAI_SUFAMI_TURBO, "6"}, {DRAGON32, "4952"}, {DOS, "1"}, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index a2b3ec11b..14b2214b3 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -103,6 +103,7 @@ namespace {NINTENDO_POKEMON_MINI, 211}, {NINTENDO_SATELLAVIEW, 107}, {NINTENDO_SWITCH, 225}, + {NOKIA_NGAGE, 30}, {BANDAI_SUFAMI_TURBO, 108}, {DRAGON32, 91}, {DOS, 135}, diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml index bd4a2d313..c09774fdb 100644 --- a/resources/sorting/hwtype_year/es_systems_sorting.xml +++ b/resources/sorting/hwtype_year/es_systems_sorting.xml @@ -421,6 +421,10 @@ nes Console - 1985 + + ngage + Portable - 2003 + ngp Portable - 1998 diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml index 85a5c077f..f89ebfe71 100644 --- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml +++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml @@ -421,6 +421,10 @@ nes Nintendo - Console - 1985 + + ngage + Nokia - Portable - 2003 + ngp SNK - Portable - 1998 diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml index bab20b882..39f2f1060 100644 --- a/resources/sorting/manufacturer_year/es_systems_sorting.xml +++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml @@ -421,6 +421,10 @@ nes Nintendo - 1985 + + ngage + Nokia - 2003 + ngp SNK - 1998 diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml index 9959c0f86..0b63cda12 100644 --- a/resources/sorting/year/es_systems_sorting.xml +++ b/resources/sorting/year/es_systems_sorting.xml @@ -421,6 +421,10 @@ nes 1985 + + ngage + 2003 + ngp 1998 diff --git a/resources/systems/macos/es_find_rules.xml b/resources/systems/macos/es_find_rules.xml index 2c5e701c5..ede10ee3e 100644 --- a/resources/systems/macos/es_find_rules.xml +++ b/resources/systems/macos/es_find_rules.xml @@ -103,6 +103,12 @@ /usr/local/bin/easyrpg-player + + + + /Applications/EKA2L1.app/Contents/MacOS/EKA2L1 + + diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index b63fbd198..66b454571 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -1164,6 +1164,16 @@ nes nes + + ngage + Nokia N-Gage + %ROMPATH%/ngage + .ngage .zip .ZIP + %EMULATOR_EKA2L1% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" + %EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%" + ngage + ngage + ngp SNK Neo Geo Pocket diff --git a/resources/systems/unix/es_find_rules.xml b/resources/systems/unix/es_find_rules.xml index 5868c2456..ac8d862af 100644 --- a/resources/systems/unix/es_find_rules.xml +++ b/resources/systems/unix/es_find_rules.xml @@ -274,6 +274,27 @@ ~/bin/easyrpg/easyrpg-player + + + + eka2l1_qt + + + ~/Applications/EKA2L1*.AppImage + ~/.local/share/applications/EKA2L1*.AppImage + ~/.local/bin/EKA2L1*.AppImage + ~/bin/EKA2L1*.AppImage + + + + + + ~/Applications/EKA2L1/eka2l1_qt.exe + ~/.local/share/applications/EKA2L1/eka2l1_qt.exe + ~/.local/bin/EKA2L1/eka2l1_qt.exe + ~/bin/EKA2L1/eka2l1_qt.exe + + diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index 019eba03c..9b906feb0 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -1221,6 +1221,18 @@ nes nes + + ngage + Nokia N-Gage + %ROMPATH%/ngage + .ngage .zip .ZIP + %EMULATOR_EKA2L1% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" + %EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%" + %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" + %STARTDIR%=%EMUDIR% %PRECOMMAND_WINE% %EMULATOR_EKA2L1-WINDOWS% --fullscreen --device RH-29 --run "%BASENAME%" + ngage + ngage + ngp SNK Neo Geo Pocket diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml index 8befcb1b9..9da2da052 100644 --- a/resources/systems/windows/es_find_rules.xml +++ b/resources/systems/windows/es_find_rules.xml @@ -245,6 +245,16 @@ %ESPATH%\..\Emulators\EasyRPG\Player.exe + + + + eka2l1_qt.exe + + + %ESPATH%\Emulators\EKA2L1\eka2l1_qt.exe + %ESPATH%\..\Emulators\EKA2L1\eka2l1_qt.exe + + diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml index aa7470a8e..1c233631a 100644 --- a/resources/systems/windows/es_find_rules_portable.xml +++ b/resources/systems/windows/es_find_rules_portable.xml @@ -158,6 +158,13 @@ %ESPATH%\..\Emulators\EasyRPG\Player.exe + + + + %ESPATH%\Emulators\EKA2L1\eka2l1_qt.exe + %ESPATH%\..\Emulators\EKA2L1\eka2l1_qt.exe + + diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 71ee2c7f1..b560fc3b4 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -1210,6 +1210,16 @@ nes nes + + ngage + Nokia N-Gage + %ROMPATH%\ngage + .ngage .zip .ZIP + %STARTDIR%=%EMUDIR% %EMULATOR_EKA2L1% --fullscreen --device RH-29 --mount %ROM% --run "%BASENAME%" + %STARTDIR%=%EMUDIR% %EMULATOR_EKA2L1% --fullscreen --device RH-29 --run "%BASENAME%" + ngage + ngage + ngp SNK Neo Geo Pocket