From 00b49b5d1a4223470874716ea1e56380e1e6ac1e Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sat, 17 Jul 2021 10:37:36 +0200 Subject: [PATCH] Fixed an issue with scraping Nintendo Famicom games. Also did some other minor platform cleanups. --- CHANGELOG.md | 1 + es-app/src/PlatformId.cpp | 4 ++-- es-app/src/scrapers/GamesDBJSONScraper.cpp | 1 + es-app/src/scrapers/ScreenScraper.cpp | 1 + resources/systems/macos/es_systems.xml | 6 +++--- resources/systems/unix/es_systems.xml | 6 +++--- resources/systems/windows/es_systems.xml | 6 +++--- 7 files changed, 14 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbee5beb8..344cfe640 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -101,6 +101,7 @@ Apart from this, numerous small improvements and bug fixes are part of the relea * GuiDetectDevice wouldn't detect controller input that was of the "axis" type (i.e. analog inputs) * GuiInputConfig didn't correctly inform which buttons could be skipped for some rows * The scraper would sometimes consider very small images to be invalid +* Scraper searches for Nintendo Family Computer (Famicom) games were not accurate * The Quick System Select help prompt was shown even when there was only a single game system present * The "Back (cancel)" help prompt was missing for the single-game scraper * The "Y" button help prompt wasn't displayed correctly when using the Grid view style diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp index cc3b20f49..73d6a9249 100644 --- a/es-app/src/PlatformId.cpp +++ b/es-app/src/PlatformId.cpp @@ -85,8 +85,8 @@ namespace PlatformIds "pc", // IBM PC "pc88", // NEC PC-8800 series "pc98", // NEC PC-9800 series - "pcengine", // NEC PC Engine - "pcenginecd", // NEC PC Engine CD + "pcengine", // NEC PC Engine / TurboGrafx-16 + "pcenginecd", // NEC PC Engine CD / TurboGrafx-CD "pcfx", // NEC PC-FX "pokemini", // Nintendo Pokémon Mini "ps2", // Sony PlayStation 2 diff --git a/es-app/src/scrapers/GamesDBJSONScraper.cpp b/es-app/src/scrapers/GamesDBJSONScraper.cpp index 36b7e43ee..7ca45b709 100644 --- a/es-app/src/scrapers/GamesDBJSONScraper.cpp +++ b/es-app/src/scrapers/GamesDBJSONScraper.cpp @@ -68,6 +68,7 @@ const std::map gamesdb_new_platformid_map { { NINTENDO_3DS, "4912" }, { NINTENDO_64, "3" }, { NINTENDO_DS, "8" }, + { NINTENDO_FAMICOM, "7" }, { NINTENDO_FAMICOM_DISK_SYSTEM, "4936" }, { NINTENDO_ENTERTAINMENT_SYSTEM, "7" }, { NINTENDO_GAME_BOY, "4" }, diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp index cf642aec5..7135960a2 100644 --- a/es-app/src/scrapers/ScreenScraper.cpp +++ b/es-app/src/scrapers/ScreenScraper.cpp @@ -67,6 +67,7 @@ const std::map screenscraper_platformid_map { { NINTENDO_3DS, 17 }, { NINTENDO_64, 14 }, { NINTENDO_DS, 15 }, + { NINTENDO_FAMICOM, 3 }, { NINTENDO_FAMICOM_DISK_SYSTEM, 106 }, { NINTENDO_ENTERTAINMENT_SYSTEM, 3 }, { FAIRCHILD_CHANNELF, 80 }, diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml index 58d00393d..6606b52ba 100644 --- a/resources/systems/macos/es_systems.xml +++ b/resources/systems/macos/es_systems.xml @@ -331,7 +331,7 @@ %ROMPATH%/famicom .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.dylib %ROM% - nes, famicom + famicom famicom @@ -421,7 +421,7 @@ %ROMPATH%/genesis .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% - genesis, megadrive + genesis genesis @@ -538,7 +538,7 @@ %ROMPATH%/megadrive .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.dylib %ROM% - megadrive, genesis + megadrive megadrive diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml index a96740be9..39c23d3a7 100644 --- a/resources/systems/unix/es_systems.xml +++ b/resources/systems/unix/es_systems.xml @@ -331,7 +331,7 @@ %ROMPATH%/famicom .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/nestopia_libretro.so %ROM% - nes, famicom + famicom famicom @@ -421,7 +421,7 @@ %ROMPATH%/genesis .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% - genesis, megadrive + genesis genesis @@ -538,7 +538,7 @@ %ROMPATH%/megadrive .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%/genesis_plus_gx_libretro.so %ROM% - megadrive, genesis + megadrive megadrive diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml index 772e8b119..495b9683e 100644 --- a/resources/systems/windows/es_systems.xml +++ b/resources/systems/windows/es_systems.xml @@ -331,7 +331,7 @@ %ROMPATH%\famicom .nes .NES .unf .UNF .unif .UNIF .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\nestopia_libretro.dll %ROM% - nes, famicom + famicom famicom @@ -421,7 +421,7 @@ %ROMPATH%\genesis .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% - genesis, megadrive + genesis genesis @@ -538,7 +538,7 @@ %ROMPATH%\megadrive .mdx .MDX .md .MD .smd .SMD .gen .GEN .bin .BIN .cue .CUE .iso .ISO .sms .SMS .gg .GG .sg .SG .68k .68K .chd .CHD .7z .7Z .zip .ZIP %EMULATOR_RETROARCH% -L %CORE_RETROARCH%\genesis_plus_gx_libretro.dll %ROM% - megadrive, genesis + megadrive megadrive