From 19157cacd52b6d4d63abc55028067fff5f097cca Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Sat, 28 Mar 2026 13:55:12 -0500 Subject: [PATCH] MainSettings: Add a fifth GBA ROM config path for GBPlayer. --- Source/Core/Core/Config/MainSettings.cpp | 6 ++++-- Source/Core/Core/Config/MainSettings.h | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp index 147aeedf50..2e1d41a151 100644 --- a/Source/Core/Core/Config/MainSettings.cpp +++ b/Source/Core/Core/Config/MainSettings.cpp @@ -398,11 +398,13 @@ void SetIsoPaths(const std::vector& paths) #ifdef HAS_LIBMGBA const Info MAIN_GBA_BIOS_PATH{{System::Main, "GBA", "BIOS"}, ""}; -const std::array, 4> MAIN_GBA_ROM_PATHS{ +const std::array, 5> MAIN_GBA_ROM_PATHS{ Info{{System::Main, "GBA", "Rom1"}, ""}, Info{{System::Main, "GBA", "Rom2"}, ""}, Info{{System::Main, "GBA", "Rom3"}, ""}, - Info{{System::Main, "GBA", "Rom4"}, ""}}; + Info{{System::Main, "GBA", "Rom4"}, ""}, + Info{{System::Main, "GBA", "GBPlayerRom"}, ""}, +}; const Info MAIN_GBA_SAVES_PATH{{System::Main, "GBA", "SavesPath"}, ""}; const Info MAIN_GBA_SAVES_IN_ROM_PATH{{System::Main, "GBA", "SavesInRomPath"}, false}; const Info MAIN_GBA_THREADS{{System::Main, "GBA", "Threads"}, true}; diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h index a1baf26242..45ca6e972b 100644 --- a/Source/Core/Core/Config/MainSettings.h +++ b/Source/Core/Core/Config/MainSettings.h @@ -224,10 +224,12 @@ void SetIsoPaths(const std::vector& paths); #ifdef HAS_LIBMGBA extern const Info MAIN_GBA_BIOS_PATH; -extern const std::array, 4> MAIN_GBA_ROM_PATHS; +extern const std::array, 5> MAIN_GBA_ROM_PATHS; extern const Info MAIN_GBA_SAVES_PATH; extern const Info MAIN_GBA_SAVES_IN_ROM_PATH; extern const Info MAIN_GBA_THREADS; + +static constexpr std::size_t GBPLAYER_GBA_INDEX = 4; #endif // Main.Network