diff --git a/ANDROID-DEV.md b/ANDROID-DEV.md
index 5eb67e7ac..198f5baac 100644
--- a/ANDROID-DEV.md
+++ b/ANDROID-DEV.md
@@ -791,7 +791,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| gamecom | Tiger Electronics Game.com | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
| gamegear | Sega Game Gear | Genesis Plus GX | Genesis Plus GX Wide,
Gearsystem,
SMS Plus GX,
PicoDrive,
Pizza Boy SC **(Standalone)**,
MasterGear **(Standalone)** | No | Single archive or ROM file |
| gb | Nintendo Game Boy | Gambatte | SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M,
GBC.emu **(Standalone)**,
My OldBoy! **(Standalone**),
Pizza Boy GBC **(Standalone)** | No | Single archive or ROM file |
-| gba | Nintendo Game Boy Advance | mGBA | VBA-M,
VBA Next,
gpSP,
GBA.emu **(Standalone)**,
My Boy! **(Standalone)**,
NooDS **(Standalone)**,
Pizza Boy GBA **(Standalone)** | No | Single archive or ROM file |
+| gba | Nintendo Game Boy Advance | mGBA | VBA-M,
VBA Next,
gpSP,
NooDS,
NooDS **(Standalone)**,
GBA.emu **(Standalone)**,
My Boy! **(Standalone)**,
Pizza Boy GBA **(Standalone)** | No | Single archive or ROM file |
| gbc | Nintendo Game Boy Color | Gambatte | SameBoy,
Gearboy,
TGB Dual,
DoubleCherryGB,
Mesen-S,
bsnes,
mGBA,
VBA-M,
GBC.emu **(Standalone)**,
My OldBoy! **(Standalone**),
Pizza Boy GBC **(Standalone)** | No | Single archive or ROM file |
| gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)**,
Dolphin MMJR **(Standalone)**,
Dolphin MMJR2 **(Standalone)** | No | Disc image file for single-disc games, .m3u playlist for multi-disc games |
| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)**,
Pizza Boy SC **(Standalone)** | No | Single archive or ROM file |
@@ -830,7 +830,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| n3ds | Nintendo 3DS | Citra | Citra **(Standalone)**,
Citra Canary **(Standalone)**,
Citra MMJ **(Standalone)**,
Mandarine **(Standalone)**,
Lime3DS **(Standalone)**,
Panda3DS **(Standalone)** | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | M64Plus FZ **(Standalone)**,
Mupen64Plus AE **(Standalone)**,
ParaLLEl N64 | No | Single archive or ROM file |
| n64dd | Nintendo 64DD | Mupen64Plus-Next | M64Plus FZ **(Standalone)**,
Mupen64Plus AE **(Standalone)**,
ParaLLEl N64 | Yes | |
-| nds | Nintendo DS | melonDS DS | melonDS,
melonDS **(Standalone)**,
melonDS Nightly **(Standalone)**,
DeSmuME,
DeSmuME 2015,
DraStic **(Standalone)**,
NooDS **(Standalone)** | No | Single archive or ROM file |
+| nds | Nintendo DS | melonDS DS | melonDS,
melonDS **(Standalone)**,
melonDS Nightly **(Standalone)**,
DeSmuME,
DeSmuME 2015,
NooDS,
NooDS **(Standalone)**,
DraStic **(Standalone)** | No | Single archive or ROM file |
| neogeo | SNK Neo Geo | FinalBurn Neo | Geolith,
NEO.emu **(Standalone)**,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)** | Yes | See the specific _Arcade and Neo Geo_ section in the user guide |
| neogeocd | SNK Neo Geo CD | NeoCD | MAME4droid 2024 **(Standalone)** | Yes | .chd (NeoCD and MAME4droid 2024 only) or .cue file |
| neogeocdjp | SNK Neo Geo CD [Japan] | NeoCD | MAME4droid 2024 **(Standalone)** | Yes | .chd (NeoCD and MAME4droid 2024 only) or .cue file |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62e6a21ee..44f431e0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,12 @@
### Detailed list of changes
* Added translations for Traditional Chinese (zh_TW)
+* Added the NooDS RetroArch core as an alternative emulator for the gba and nds systems
* Added the Holani RetroArch core as an alternative emulator for the atarilynx system
* (Android) Added Pizza Boy SC standalone as an alternative emulator for the gamegear, genesis, mastersystem, megadrive and megadrivejp systems
* (Android) Changed all RetroArch core entries to use absolute paths (this makes the ancient Play store release work correctly)
* (Android) Changed the target SDK version to 35 (Android 15)
-* (macOS) Added a build script to cross-compile for x86_64 using an ARM processor
+* (macOS) Added a build script for cross-compiling for x86_64 when using an ARM processor
* Added support for building against libgit2 v1.9.0 and later
### Bug fixes
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index baef625fd..27f0e5803 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -4187,7 +4187,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| gamecom | Tiger Electronics Game.com | MAME - Current | MAME **(Standalone)** | Yes | Single archive or ROM file |
| gamegear | Sega Game Gear | Genesis Plus GX | Genesis Plus GX Wide,
Gearsystem,
SMS Plus GX,
PicoDrive,
Mednafen **(Standalone)**,
Mesen **(Standalone)** [LW],
ares **(Standalone)**,
jgenesis **(Standalone)** [LW] | No | Single archive or ROM file |
| gb | Nintendo Game Boy | Gambatte | SameBoy,
SameBoy **(Standalone)**,
Gearboy,
Gearboy **(Standalone)** [LW],
TGB Dual,
DoubleCherryGB [LW],
Mesen-S,
Mesen **(Standalone)** [LW],
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)**,
Mednafen **(Standalone)**,
ares **(Standalone)**,
SkyEmu **(Standalone)**,
jgenesis **(Standalone)** [LW] | No | Single archive or ROM file |
-| gba | Nintendo Game Boy Advance | mGBA | mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)**,
VBA Next,
gpSP,
Mednafen **(Standalone)**,
ares **(Standalone)**,
SkyEmu **(Standalone)**,
NooDS **(Standalone)** [LW] | Yes for ares | Single archive or ROM file |
+| gba | Nintendo Game Boy Advance | mGBA | mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)**,
VBA Next,
gpSP,
NooDS,
NooDS **(Standalone)** [LW],
Mednafen **(Standalone)**,
ares **(Standalone)**,
SkyEmu **(Standalone)** | Yes for ares | Single archive or ROM file |
| gbc | Nintendo Game Boy Color | Gambatte | SameBoy,
SameBoy **(Standalone)**,
Gearboy,
Gearboy **(Standalone)** [LW],
TGB Dual,
DoubleCherryGB [LW],
Mesen-S,
Mesen **(Standalone)** [LW],
bsnes,
mGBA,
mGBA **(Standalone)**,
VBA-M,
VBA-M **(Standalone)**,
Mednafen **(Standalone)**,
ares **(Standalone)**,
SkyEmu **(Standalone)**,
jgenesis **(Standalone)** [LW] | No | Single archive or ROM file |
| gc | Nintendo GameCube | Dolphin | Dolphin **(Standalone)**,
PrimeHack **(Standalone)** [LW],
Triforce **(Standalone)** [LW] | No | Disc image file for single-disc games, .m3u playlist for multi-disc games |
| genesis | Sega Genesis | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
BlastEm,
BlastEm **(Standalone)** [L],
Mednafen **(Standalone)**,
ares **(Standalone)**,
jgenesis **(Standalone)** [LW] | No | Single archive or ROM file |
@@ -4226,7 +4226,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W] | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
| naomi2 | Sega NAOMI 2 | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W] | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
| naomigd | Sega NAOMI GD-ROM | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)** | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
-| nds | Nintendo DS | melonDS DS | melonDS @,
melonDS **(Standalone)**,
DeSmuME,
DeSmuME 2015,
DeSmuME **(Standalone)** [L],
SkyEmu **(Standalone)**,
NooDS **(Standalone)** [LW] | No | Single archive or ROM file |
+| nds | Nintendo DS | melonDS DS | melonDS @,
melonDS **(Standalone)**,
DeSmuME,
DeSmuME 2015,
DeSmuME **(Standalone)** [L],
NooDS,
NooDS **(Standalone)** [LW],
SkyEmu **(Standalone)** | No | Single archive or ROM file |
| neogeo | SNK Neo Geo | FinalBurn Neo | FinalBurn Neo **(Standalone)** [LW],
Geolith,
MAME **(Standalone)** | Yes | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
| neogeocd | SNK Neo Geo CD | NeoCD | FinalBurn Neo,
FinalBurn Neo **(Standalone)** [LW],
MAME **(Standalone)** | Yes | .chd (NeoCD and MAME only) or .cue file |
| neogeocdjp | SNK Neo Geo CD [Japan] | NeoCD | FinalBurn Neo,
FinalBurn Neo **(Standalone)** [LW],
MAME **(Standalone)** | Yes | .chd (NeoCD and MAME only) or .cue file |