diff --git a/ANDROID-DEV.md b/ANDROID-DEV.md
index 563ae0840..d1bf6adfd 100644
--- a/ANDROID-DEV.md
+++ b/ANDROID-DEV.md
@@ -62,8 +62,6 @@ The following emulators are configured for FileProvider access:
* GBC.emu
* Lynx.emu
* MD.emu (genesis, mastersystem, megadrive, megadrivejp)
-* MAME4droid 2024
-* MAME4droid
* NES.emu
* NGP.emu
* PCE.emu (pcengine, supergrafx and tg16 systems)
@@ -344,6 +342,8 @@ https://github.com/Lime3DS/Lime3DS/releases
These emulators can be installed from the Play store. It's strongly recommended to go for the _MAME4droid 2024_ version as this is updated with a recent MAME release while the older _MAME4droid_ is using an ancient MAME release.
+Note that for MAME4droid 2024 there's an exception when it comes to setting up the ROM path. Instead of selecting each separate system directory (as is done on most other standalone emulators) you must select the root of the ROMs directory tree. To change the ROM path open _Settings_ in MAME4droid 2024, then select _General_ and then _Change ROMs path_. After restarting the emulator choose _External storage_ and then the ROMs directory which contains all your ES-DE system directories. If you instead choose a specific system directory like ROMs/arcade or ROMs/neogeo then only that specific system will work when launching games from ES-DE.
+
https://play.google.com/store/apps/details?id=com.seleuco.mame4d2024 \
https://play.google.com/store/apps/details?id=com.seleuco.mame4droid
@@ -596,95 +596,95 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| System name | Full name | Default emulator | Alternative emulators | Needs BIOS | Recommended game setup |
| :-------------------- | :--------------------------------------------- | :-------------------------------- | :-------------------------------- | :----------- | :----------------------------------- |
| 3do | 3DO Interactive Multiplayer | Opera | Real3DOPlayer **(Standalone)** | Yes | |
-| adam | Coleco Adam | ColEm **(Standalone)** | | No | |
+| adam | Coleco Adam | MAME4droid 2024 [Diskette] **(Standalone)** | MAME4droid 2024 [Tape] **(Standalone)**,
MAME4droid 2024 [Cartridge] **(Standalone)**,
MAME4droid 2024 [Software list] **(Standalone)**,
ColEm **(Standalone)** | Yes for MAME4droid 2024 | |
| ags | Adventure Game Studio Game Engine | _Placeholder_ | | | |
| amiga | Commodore Amiga | PUAE | PUAE 2021 | Yes | |
| amiga1200 | Commodore Amiga 1200 | PUAE | PUAE 2021 | Yes | |
| amiga600 | Commodore Amiga 600 | PUAE | PUAE 2021 | Yes | |
| amigacd32 | Commodore Amiga CD32 | PUAE | PUAE 2021 | Yes | |
-| amstradcpc | Amstrad CPC | Caprice32 | CrocoDS | No | Single archive or disk file |
+| amstradcpc | Amstrad CPC | Caprice32 | CrocoDS,
MAME4droid 2024 **(Standalone)** | Yes for MAME4droid 2024 | Single archive or disk file |
| android | Google Android | _Placeholder_ | | | |
-| androidapps | Android Apps | _Native apps_ | | | |
-| androidgames | Android Games | _Native apps_ | | | |
-| apple2 | Apple II | _Placeholder_ | | | |
-| apple2gs | Apple IIGS | _Placeholder_ | | | |
-| arcade | Arcade | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
NEO.emu **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
Geolith,
Flycast,
Flycast **(Standalone)** | Depends | |
-| arcadia | Emerson Arcadia 2001 | DroidArcadia **(Standalone**) | | | Single archive or ROM file |
-| archimedes | Acorn Archimedes | _Placeholder_ | | | |
+| androidapps | Android Apps | _Native apps_ | | No | |
+| androidgames | Android Games | _Native apps_ | | No | |
+| apple2 | Apple II | MAME4droid 2024 **(Standalone)** | | Yes | See the specific _Apple II_ section in the user guide |
+| apple2gs | Apple IIGS | MAME4droid 2024 **(Standalone)** | | Yes | See the specific _Apple IIGS_ section in the user guide |
+| arcade | Arcade | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
NEO.emu **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
Geolith,
Flycast,
Flycast **(Standalone)** | Depends | See the specific _Arcade and Neo Geo_ section in the user guide |
+| arcadia | Emerson Arcadia 2001 | DroidArcadia **(Standalone**) | MAME4droid 2024 **(Standalone)** | No | Single archive or ROM file |
+| archimedes | Acorn Archimedes | MAME4droid 2024 [Model A440/1] **(Standalone)** | MAME4droid 2024 [Model A3000] **(Standalone)**,
MAME4droid 2024 [Model A310] **(Standalone)**,
MAME4droid 2024 [Model A540] **(Standalone)** | Yes | |
| arduboy | Arduboy Miniature Game System | Arduous | | No | Single archive or .hex file |
-| astrocde | Bally Astrocade | _Placeholder_ | | | |
+| astrocde | Bally Astrocade | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
| atari2600 | Atari 2600 | Stella | Stella 2014,
2600.emu **(Standalone)** | No | Single archive or ROM file |
| atari5200 | Atari 5200 | a5200 | Atari800 | Yes | Single archive or ROM file |
-| atari7800 | Atari 7800 ProSystem | ProSystem | | Yes | Single archive or ROM file |
+| atari7800 | Atari 7800 ProSystem | ProSystem | MAME4droid 2024 **(Standalone)** | Yes | Single archive or ROM file |
| atari800 | Atari 800 | Atari800 | | Yes | |
-| atarijaguar | Atari Jaguar | Virtual Jaguar | IrataJaguar **(Standalone)** | No | |
+| atarijaguar | Atari Jaguar | Virtual Jaguar | IrataJaguar **(Standalone)**,
MAME4droid 2024 **(Standalone)** | Yes for MAME4droid 2024 | Single archive or ROM file |
| atarijaguarcd | Atari Jaguar CD | _Placeholder_ | | | |
| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Lynx.emu **(Standalone)** | No | Single archive or ROM file |
| atarist | Atari ST [also STE and Falcon] | Hatari | | Yes | Single archive or image file for single-diskette games, .m3u playlist for multi-diskette games |
| atarixe | Atari XE | Atari800 | | Yes | |
| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)** | Depends | Single archive file |
-| bbcmicro | Acorn Computers BBC Micro | _Placeholder_ | | | |
+| bbcmicro | Acorn Computers BBC Micro | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or diskette image file |
| c64 | Commodore 64 | VICE x64sc Accurate | VICE x64 Fast,
VICE x64 SuperCPU,
VICE x128,
C64.emu **(Standalone)** | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
-| cdimono1 | Philips CD-i | SAME CDi | | Yes | Single .bin/.cue pair |
+| cdimono1 | Philips CD-i | SAME CDi | MAME4droid 2024 **(Standalone)** | Yes | Single .bin/.cue pair |
| cdtv | Commodore CDTV | PUAE | PUAE 2021 | Yes | |
| chailove | ChaiLove Game Engine | ChaiLove | | | |
-| channelf | Fairchild Channel F | FreeChaF | | Yes | Single archive or ROM file |
+| channelf | Fairchild Channel F | FreeChaF | MAME4droid 2024 **(Standalone)** | Yes | Single archive or ROM file |
| coco | Tandy Color Computer | _Placeholder_ | | | |
| colecovision | Coleco ColecoVision | blueMSX | Gearcoleco,
MSX.emu **(Standalone)**,
ColEm **(Standalone)** | Yes | Single archive or ROM file |
-| consolearcade | Console Arcade Systems | _Placeholder_ | | | |
+| consolearcade | Console Arcade Systems | MAME - Current | MAME4droid 2024 **(Standalone)**,
Flycast,
Flycast **(Standalone)**,
Play! **(Standalone)** | Depends | |
| cps | Capcom Play System | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
FB Alpha 2012 CPS-1,
FB Alpha 2012 CPS-2,
FB Alpha 2012 CPS-3 | Depends | |
| cps1 | Capcom Play System I | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
FB Alpha 2012 CPS-1 | Depends | |
| cps2 | Capcom Play System II | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
FB Alpha 2012,
FB Alpha 2012 CPS-2 | Depends | |
| cps3 | Capcom Play System III | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
FB Alpha 2012,
FB Alpha 2012 CPS-3 | Depends | |
-| crvision | VTech CreatiVision | _Placeholder_ | | | |
-| daphne | Daphne Arcade LaserDisc Emulator | DirkSimple | | No | |
+| crvision | VTech CreatiVision | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
+| daphne | Daphne Arcade LaserDisc Emulator | MAME4droid 2024 **(Standalone)** | DirkSimple | Depends | See the specific _LaserDisc Games_ section in the user guide |
| desktop | Desktop Applications | _Placeholder_ | | | |
| doom | Doom | PrBoom | | No | |
| dos | DOS (PC) | DOSBox-Pure | DOSBox-Core,
DOSBox-SVN | No | |
| dragon32 | Dragon Data Dragon 32 | _Placeholder_ | | | |
| dreamcast | Sega Dreamcast | Flycast | Flycast **(Standalone)**,
Redream **(Standalone)** | No | In separate folder interpreted as a file, with .m3u playlist if multi-disc game |
| easyrpg | EasyRPG Game Engine | EasyRPG | | No | |
-| electron | Acorn Electron | _Placeholder_ | | | |
-| emulators | Emulators | _Native apps_ | | | |
+| electron | Acorn Electron | MAME4droid 2024 [Tape] **(Standalone)** | MAME4droid 2024 [Diskette DFS] **(Standalone)**,
MAME4droid 2024 [Diskette ADFS] **(Standalone)** | Yes | Single archive, or single tape or diskette image file |
+| emulators | Emulators | _Native apps_ | | No | |
| epic | Epic Games Store | _Placeholder_ | | | |
| famicom | Nintendo Family Computer | Mesen | Nestopia UE,
FCEUmm,
QuickNES,
NES.emu **(Standalone)**,
iNES **(Standalone)**,
Nesoid **(Standalone)** | No | Single archive or ROM file |
| fba | FinalBurn Alpha | FB Alpha 2012 | FB Alpha 2012 Neo Geo,
FB Alpha 2012 CPS-1,
FB Alpha 2012 CPS-2,
FB Alpha 2012 CPS-3 | Yes | |
| fbneo | FinalBurn Neo | FinalBurn Neo | | Yes | |
| fds | Nintendo Famicom Disk System | Mesen | Nestopia UE,
FCEUmm,
NES.emu **(Standalone)**,
iNES **(Standalone)**,
Nesoid **(Standalone)** | Yes | Single archive or ROM file |
| flash | Adobe Flash | Ruffle **(Standalone)** | | No | Single .swf file |
-| fm7 | Fujitsu FM-7 | _Placeholder_ | | | |
-| fmtowns | Fujitsu FM Towns | _Placeholder_ | | | |
+| fm7 | Fujitsu FM-7 | MAME4droid 2024 [FM-7 Diskette] **(Standalone)** | MAME4droid 2024 [FM-7 Tape] **(Standalone)**,
MAME4droid 2024 [FM-7 Software list] **(Standalone)**,
MAME4droid 2024 [FM77AV Diskette] **(Standalone)**,
MAME4droid 2024 [FM77AV Tape] **(Standalone)**,
MAME4droid 2024 [FM77AV Software list] **(Standalone)** | Yes | For tape files you need to manually start the cassette player from the MAME menu after the "load" command, as well as entering the "run" command after loading is complete |
+| fmtowns | Fujitsu FM Towns | MAME4droid 2024 **(Standalone)** | | Yes | See the specific _Fujitsu FM Towns_ section in the user guide |
| fpinball | Future Pinball | _Placeholder_ | | | |
-| gamate | Bit Corporation Gamate | _Placeholder_ | | | |
-| gameandwatch | Nintendo Game and Watch | Multi (MESS) | MAME4droid 2024 **(Standalone)**,
Handheld Electronic (GW) | No | Single archive or ROM file |
-| gamecom | Tiger Electronics Game.com | _Placeholder_ | | | |
+| gamate | Bit Corporation Gamate | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
+| gameandwatch | Nintendo Game and Watch | Multi (MESS) | MAME4droid 2024 Local Artwork **(Standalone)**,
MAME4droid 2024 **(Standalone)**,
Handheld Electronic (GW) | No | See the specific _LCD handheld games_ section in the user guide |
+| 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,
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)**,
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)** | No | Single archive or ROM file |
-| gmaster | Hartung Game Master | _Placeholder_ | | | |
-| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS | No | Single archive or ROM file |
-| intellivision | Mattel Electronics Intellivision | FreeIntv | | Yes | Single archive or ROM file |
+| gmaster | Hartung Game Master | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
+| gx4000 | Amstrad GX4000 | Caprice32 | CrocoDS,
MAME4droid 2024 **(Standalone)** | No | Single archive or ROM file |
+| intellivision | Mattel Electronics Intellivision | FreeIntv | MAME4droid 2024 **(Standalone)** | Yes | Single archive or ROM file |
| j2me | Java 2 Micro Edition (J2ME) | SquirrelJME | | No | Single .jar file |
| kodi | Kodi Home Theatre Software | _Placeholder_ | | | |
-| laserdisc | LaserDisc Games | DirkSimple | | No | |
-| lcdgames | LCD Handheld Games | Multi (MESS) | MAME4droid 2024 **(Standalone)**,
Handheld Electronic (GW) | No | Single archive or ROM file |
+| laserdisc | LaserDisc Games | MAME4droid 2024 **(Standalone)** | DirkSimple | Depends | See the specific _LaserDisc Games_ section in the user guide |
+| lcdgames | LCD Handheld Games | Multi (MESS) | MAME4droid 2024 Local Artwork **(Standalone)**,
MAME4droid 2024 **(Standalone)**,
Handheld Electronic (GW) | No | See the specific _LCD handheld games_ section in the user guide |
| lowresnx | LowRes NX Fantasy Console | LowRes NX | | No | Single ROM file |
| lutris | Lutris Open Gaming Platform | _Placeholder_ | | | |
| lutro | Lutro Game Engine | Lutro | | | |
-| macintosh | Apple Macintosh | _Placeholder_ | | | |
-| mame | Multiple Arcade Machine Emulator | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
NEO.emu **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
Geolith,
Flycast,
Flycast **(Standalone)** | Depends | |
+| macintosh | Apple Macintosh | MAME4droid 2024 Mac SE Bootable **(Standalone)** | MAME4droid 2024 Mac SE Boot Disk **(Standalone)**,
MAME4droid 2024 Mac Plus Bootable **(Standalone)**,
MAME4droid 2024 Mac Plus Boot Disk **(Standalone)** | Yes | See the specific _Apple Macintosh_ section in the user guide |
+| mame | Multiple Arcade Machine Emulator | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2003,
MAME 2000,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)**,
NEO.emu **(Standalone)**,
FinalBurn Neo,
FB Alpha 2012,
Geolith,
Flycast,
Flycast **(Standalone)** | Depends | See the specific _Arcade and Neo Geo_ section in the user guide |
| mame-advmame | AdvanceMAME | _Placeholder_ | | | |
| mastersystem | Sega Master System | Genesis Plus GX | Genesis Plus GX Wide,
SMS Plus GX,
Gearsystem,
PicoDrive,
MD.emu **(Standalone)**,
MasterGear **(Standalone)** | No | Single archive or ROM file |
| megacd | Sega Mega-CD | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | Yes | |
| megacdjp | Sega Mega-CD [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | Yes | |
| megadrive | Sega Mega Drive | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
| megadrivejp | Sega Mega Drive [Japan] | Genesis Plus GX | Genesis Plus GX Wide,
PicoDrive,
MD.emu **(Standalone)** | No | Single archive or ROM file |
-| megaduck | Creatronic Mega Duck | SameDuck | | No | Single archive or ROM file |
-| mess | Multi Emulator Super System | Multi (MESS) | | | |
-| model2 | Sega Model 2 | MAME - Current | | Yes | |
+| megaduck | Creatronic Mega Duck | SameDuck | MAME4droid 2024 **(Standalone)** | No | Single archive or ROM file |
+| mess | Multi Emulator Super System | Multi (MESS) | | Depends | |
+| model2 | Sega Model 2 | MAME - Current | MAME4droid 2024 **(Standalone)** | Yes | See the specific _Arcade and Neo Geo_ section in the user guide |
| model3 | Sega Model 3 | _Placeholder_ | | | |
| moto | Thomson MO/TO Series | Theodore | | | |
| msx | MSX | blueMSX | fMSX,
fMSX **(Standalone)**,
MSX.emu **(Standalone)** | Yes except for fMSX standalone | |
@@ -700,14 +700,14 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| 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)** | No | Single archive or ROM file |
-| neogeo | SNK Neo Geo | FinalBurn Neo | Geolith,
NEO.emu **(Standalone)**,
MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)** | Yes | Single archive or ROM file |
-| neogeocd | SNK Neo Geo CD | NeoCD | FinalBurn Neo | Yes | |
-| neogeocdjp | SNK Neo Geo CD [Japan] | NeoCD | FinalBurn Neo | Yes | |
+| 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 | FinalBurn Neo,
MAME4droid 2024 **(Standalone)** | Yes | .chd (NeoCD and MAME4droid 2024 only) or .cue file |
+| neogeocdjp | SNK Neo Geo CD [Japan] | NeoCD | FinalBurn Neo,
MAME4droid 2024 **(Standalone)** | Yes | .chd (NeoCD and MAME4droid 2024 only) or .cue file |
| nes | Nintendo Entertainment System | Mesen | Nestopia UE,
FCEUmm,
QuickNES,
NES.emu **(Standalone)**,
iNES **(Standalone)**,
Nesoid **(Standalone)** | No | Single archive or ROM file |
| ngage | Nokia N-Gage | EKA2L1 **(Standalone)** | | Yes | See the specific _Symbian and Nokia N-Gage_ section in the User guide |
| ngp | SNK Neo Geo Pocket | Beetle NeoPop | RACE,
NGP.emu **(Standalone)** | No | Single archive or ROM file |
| ngpc | SNK Neo Geo Pocket Color | Beetle NeoPop | RACE,
NGP.emu **(Standalone)** | No | Single archive or ROM file |
-| odyssey2 | Magnavox Odyssey 2 | O2EM | | Yes | Single archive or ROM file |
+| odyssey2 | Magnavox Odyssey 2 | O2EM | MAME4droid 2024 **(Standalone)** | Yes | Single archive or ROM file |
| openbor | OpenBOR Game Engine | OpenBOR **(Standalone)** | | No | See the specific _OpenBOR_ section in the User guide |
| oric | Tangerine Computer Systems Oric | _Placeholder_ | | | |
| palm | Palm OS | Mu | | | |
@@ -728,14 +728,14 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| psp | Sony PlayStation Portable | PPSSPP | PPSSPP **(Standalone)** | No | Single disc image file |
| psvita | Sony PlayStation Vita | Vita3K **(Standalone)** | | Yes | See the specific _Sony PlayStation Vita_ section in the User guide |
| psx | Sony PlayStation | Beetle PSX | Beetle PSX HW,
PCSX ReARMed,
SwanStation,
DuckStation **(Standalone)**,
ePSXe **(Standalone)**,
FPseNG **(Standalone)**,
FPse **(Standalone)** | Yes | .chd file for single-disc games, .m3u playlist for multi-disc games |
-| pv1000 | Casio PV-1000 | _Placeholder_ | | | |
+| pv1000 | Casio PV-1000 | MAME4droid 2024 **(Standalone)** | | No | Single archive or ROM file |
| quake | Quake | TyrQuake | vitaQuake 2,
vitaQuake 2 [Rogue],
vitaQuake 2 [Xatrix],
vitaQuake 2 [Zaero] | No | |
| samcoupe | MGT SAM Coupé | Speccy **(Standalone)** | | No | Single archive or ROM file |
| satellaview | Nintendo Satellaview | Snes9x - Current | Snes9x 2010,
Snes9x 2005 Plus,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy,
Mesen-S | | |
| saturn | Sega Saturn | Beetle Saturn | YabaSanshiro,
Yaba Sanshiro 2 **(Standalone)**,
Yabause,
Saturn.emu **(Standalone)** | Yes | .chd file for single-disc games, .m3u playlist for multi-disc games |
| saturnjp | Sega Saturn [Japan] | Beetle Saturn | YabaSanshiro,
Yaba Sanshiro 2 **(Standalone)**,
Yabause,
Saturn.emu **(Standalone)** | Yes | .chd file for single-disc games, .m3u playlist for multi-disc games |
| scummvm | ScummVM Game Engine | ScummVM | | No | |
-| scv | Epoch Super Cassette Vision | _Placeholder_ | | | |
+| scv | Epoch Super Cassette Vision | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
| sega32x | Sega Mega Drive 32X | PicoDrive | | No | Single archive or ROM file |
| sega32xjp | Sega Super 32X [Japan] | PicoDrive | | No | Single archive or ROM file |
| sega32xna | Sega Genesis 32X [North America] | PicoDrive | | No | Single archive or ROM file |
@@ -751,26 +751,26 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| stv | Sega Titan Video Game System | MAME - Current | MAME4droid 2024 **(Standalone)**,
MAME4droid **(Standalone)** | Yes | Single archive file |
| sufami | Bandai SuFami Turbo | Snes9x - Current | Snes9x 2010,
Snes9x 2005 Plus,
Snes9x EX+ **(Standalone)**,
bsnes,
bsnes-hd,
bsnes-mercury Accuracy | | |
| supergrafx | NEC SuperGrafx | Beetle SuperGrafx | Beetle PCE,
PCE.emu **(Standalone)** | No | Single archive or ROM file |
-| supervision | Watara Supervision | Potator | | No | Single archive or ROM file |
-| supracan | Funtech Super A'Can | _Placeholder_ | | | |
+| supervision | Watara Supervision | Potator | MAME4droid 2024 **(Standalone)** | No | Single archive or ROM file |
+| supracan | Funtech Super A'Can | MAME4droid 2024 **(Standalone)** | | Yes/No | Single archive or ROM file. To make MAME4droid 2024 start these games create an empty file named internal_68k.bin and zip it into supracan.zip |
| switch | Nintendo Switch | Skyline **(Standalone)** | | Yes | |
| symbian | Symbian | EKA2L1 **(Standalone)** | | Yes | See the specific _Symbian and Nokia N-Gage_ section in the User guide |
| tanodragon | Tano Dragon | _Placeholder_ | | | |
| tg16 | NEC TurboGrafx-16 | Beetle PCE | Beetle PCE FAST,
Beetle SuperGrafx,
PCE.emu **(Standalone)** | No | Single archive or ROM file |
| tg-cd | NEC TurboGrafx-CD | Beetle PCE | Beetle PCE FAST,
Beetle SuperGrafx,
PCE.emu **(Standalone)** | Yes | |
-| ti99 | Texas Instruments TI-99 | _Placeholder_ | | | |
+| ti99 | Texas Instruments TI-99 | MAME4droid 2024 **(Standalone)** | | Yes | See the specific _Texas Instruments TI-99_ section in the user guide |
| tic80 | TIC-80 Fantasy Computer | TIC-80 | | No | Single .tic file |
| to8 | Thomson TO8 | Theodore | | | |
| triforce | Namco-Sega-Nintendo Triforce | _Placeholder_ | | | |
| trs-80 | Tandy TRS-80 | _Placeholder_ | | | |
| type-x | Taito Type X | _Placeholder_ | | | |
| uzebox | Uzebox Open Source Console | Uzem | | | |
-| vectrex | GCE Vectrex | vecx | | No | Single archive or ROM file |
+| vectrex | GCE Vectrex | vecx | MAME4droid 2024 **(Standalone)** | Yes for MAME4droid 2024 | Single archive or ROM file |
| vic20 | Commodore VIC-20 | VICE xvic | | No | Single archive or tape, cartridge or diskette image file |
-| videopac | Philips Videopac G7000 | O2EM | | Yes | Single archive or ROM file |
+| videopac | Philips Videopac G7000 | O2EM | MAME4droid 2024 **(Standalone)** | Yes | Single archive or ROM file |
| virtualboy | Nintendo Virtual Boy | Beetle VB | | No | |
| vpinball | Visual Pinball | _Placeholder_ | | | |
-| vsmile | VTech V.Smile | _Placeholder_ | | | |
+| vsmile | VTech V.Smile | MAME4droid 2024 **(Standalone)** | | Yes | Single archive or ROM file |
| wasm4 | WASM-4 Fantasy Console | WASM-4 | | No | Single .wasm file |
| wii | Nintendo Wii | Dolphin | Dolphin **(Standalone)**,
Dolphin MMJR **(Standalone)**,
Dolphin MMJR2 **(Standalone)** | No | |
| wiiu | Nintendo Wii U | _Placeholder_ | | | |
@@ -779,11 +779,11 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| windows9x | Microsoft Windows 9x | DOSBox-Pure | | No | |
| wonderswan | Bandai WonderSwan | Beetle Cygne | Swan.emu **(Standalone)** | No | Single archive or ROM file |
| wonderswancolor | Bandai WonderSwan Color | Beetle Cygne | Swan.emu **(Standalone)** | No | Single archive or ROM file |
-| x1 | Sharp X1 | X Millennium | | No | Single archive or diskette/tape file |
-| x68000 | Sharp X68000 | PX68k | | Yes | |
+| x1 | Sharp X1 | X Millennium | MAME4droid 2024 [Diskette] **(Standalone)**,
MAME4droid 2024 [Tape] **(Standalone)** | Yes for MAME4droid 2024 | Single archive or diskette/tape file |
+| x68000 | Sharp X68000 | PX68k | MAME4droid 2024 **(Standalone)** | Yes | |
| xbox | Microsoft Xbox | _Placeholder_ | | | |
| xbox360 | Microsoft Xbox 360 | _Placeholder_ | | | |
-| zmachine | Infocom Z-machine | MojoZork | | | |
+| zmachine | Infocom Z-machine | MojoZork | | No | |
| zx81 | Sinclair ZX81 | EightyOne | | | |
| zxnext | Sinclair ZX Spectrum Next | _Placeholder_ | | | |
| zxspectrum | Sinclair ZX Spectrum | Fuse | Speccy **(Standalone)** | No | Single archive or ROM file |
diff --git a/ANDROID.md b/ANDROID.md
index 89e3f1db6..7a9bca459 100644
--- a/ANDROID.md
+++ b/ANDROID.md
@@ -62,8 +62,6 @@ The following emulators are configured for FileProvider access:
* GBC.emu
* Lynx.emu
* MD.emu (genesis, mastersystem, megadrive, megadrivejp)
-* MAME4droid 2024
-* MAME4droid
* NES.emu
* NGP.emu
* PCE.emu (pcengine, supergrafx and tg16 systems)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0ef7013f3..590d58bfe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,16 +13,44 @@
* (Linux) Added a DEINIT_ON_LAUNCH CMake build flag to support KMS/direct framebuffer access
* Added support for the new Lime3DS binary names on Linux, macOS and Windows
* (Linux) Added support for the Flatpak release of Lime3DS
+* (Android) Added support for the Apple II (apple2) game system
+* (Android) Added support for the Apple IIGS (apple2gs) game system
* (Android) Added support for the Emerson Arcadia 2001 (arcadia) game system
-* (Android) Added support for the Infocom Z-machine (zmachine) game system
+* (Android) Added support for the Acorn Archimedes (archimedes) game system
+* (Android) Added support for the Bally Astrocade (astrocde) game system
+* (Android) Added support for the Acorn Computers BBC Micro (bbcmicro) game system
+* (Android) Added support for the Console Arcade Systems (consolearcade) game system
+* (Android) Added support for the VTech CreatiVision (crvision) game system
+* (Android) Added support for the Acorn Electron (electron) game system
* (Android) Added support for the Emulators (emulators) game system
+* (Android) Added support for the Fujitsu FM-7 (fm7) game system
+* (Android) Added support for the Fujitsu FM Towns (fmtowns) game system
+* (Android) Added support for the Bit Corporation Gamate (gamate) game system
+* (Android) Added support for the Tiger Electronics Game.com (gamecom) game system
+* (Android) Added support for the Hartung Game Master (gmaster) game system
+* (Android) Added support for the Apple Macintosh (macintosh) game system
+* (Android) Added support for the Casio PV-1000 (pv1000) game system
+* (Android) Added support for the Epoch Super Cassette Vision (scv) game system
+* (Android) Added support for the Funtech Super A'Can (supracan) game system
+* (Android) Added support for the Texas Instruments TI-99 (ti99) game system
+* (Android) Added support for the VTech V.Smile (vsmile) game system
+* (Android) Added support for the Infocom Z-machine (zmachine) game system
+* (Android) Added MAME4droid 2024 standalone as the default emulator for the adam, daphne and laserdisc systems
+* (Android) Added MAME4droid 2024 standalone as an alternative emulator for the amstradcpc, atari7800, atarijaguar and cdimono1 systems
+* (Android) Added MAME4droid 2024 standalone as an alternative emulator for the channelf, gx4000, intellivision and megaduck systems
+* (Android) Added MAME4droid 2024 standalone as an alternative emulator for the model2, neogeocd, neogeocdjp and odyssey2 systems
+* (Android) Added MAME4droid 2024 standalone as an alternative emulator for the supervision, vectrex, videopac and x68000 systems
+* (Android) Added MAME4droid 2024 Local Artwork standalone as an alternative emulator for the gameandwatch and lcdgames systems
+* (Android) Added MAME4droid 2024 [Diskette] standalone and MAME4droid 2024 [Tape] standalone as alternative emulators for the x1 system
+* (Android) Defined explicit ROM paths for MAME4droid 2024 for the arcade, cps, cps1, cps2, cps3, mame, neogeo and stv systems
* (Android) Added IrataJaguar standalone as an alternative emulator for the atarijaguar system
* (Android) Added the melonDS RetroArch core as an alternative emulator for the nds system
-* Added the MojoZork RetroArch core as the default emulator for the zmachine system on Linux, macOS and Windows
+* Added the MojoZork RetroArch core as the default emulator for the zmachine system
* Added ACE-DL standalone as an alternative emulator for the amstradcpc system on Linux, macOS and Windows
* Added ColEm standalone as an alternative emulator for the adam and colecovision systems on Linux and Windows
* (Windows) Added WinArcadia standalone as an alternative emulator for the arcadia system
* Added the .elf, .tmd and .wuhb file extensions to the wiiu system on Linux, macOS and Windows
+* (Android) Added %GAMEDIRRAW%, %ROMPATHRAW% and %ROMRAW% variables that can be used with the %EXTRA% and %EXTRAARRAY% variables
* (macOS) Changed the minimum required OS version from 10.15 "Catalina" to 11 "Big Sur"
### Bug fixes
diff --git a/INSTALL-DEV.md b/INSTALL-DEV.md
index d2951f4c6..e668c0abb 100644
--- a/INSTALL-DEV.md
+++ b/INSTALL-DEV.md
@@ -1762,9 +1762,9 @@ The es_systems.xml file on Android utilizes variables heavily to implement the _
There are two main ways to pass options to emulators, using _extras_ or using the _data_ URI. There can only be a single data URI but there can be an arbitrary amount of extras. To understand more about the way this works, you can read about the _putExtra()_ and and _setData()_ functions here:\
https://developer.android.com/reference/android/content/Intent
-`%EXTRA_` - This passes an _extra_ which contains any additional information that the emulator may support. This is provided as a key/value pair where you define the key name following the literal %EXTRA_ string and terminate it with a % sign and then assign the value using an equal sign. For example %EXTRA_LIBRETRO%=puae_libretro_android.so will pass the extra named _LIBRETRO_ with its value set to _puae_libretro_android.so_. You can pass an unlimited number of extras and you can also use various ROM variables in combination with this as described below.
+`%EXTRA_` - This passes an _extra_ which contains any additional information that the emulator may support. This is provided as a key/value pair where you define the key name following the literal %EXTRA_ string and terminate it with a % sign and then assign the value using an equal sign. For example %EXTRA_LIBRETRO%=puae_libretro_android.so will pass the extra named _LIBRETRO_ with its value set to _puae_libretro_android.so_. You can pass an unlimited number of extras and you can also use various ROM variables in combination with this as described below. It's also possible to use the `%GAMEDIRRAW%`, `%ROMPATHRAW%` and `%ROMRAW%` variables inside an `%EXTRA_` variable definition, which will expand to the the directory of the game file, the ROM directory and the path to the game file respectively.
-`%EXTRAARRAY_` - Defines an array of comma-separated string values following the key name. Only literal strings are supported, so this can't be used in combination with any ROM variables. As commas are used as separator characters, you'll need to escape any comma signs that you want to include in the actual value. For example %EXTRAARRAY_Parameters%=pone,p\\,two,pthree will pass the extra named _Parameters_ with the three separate array entries _pone_, _p,two_ and _pthree_.
+`%EXTRAARRAY_` - Defines an array of comma-separated string values following the key name. Only literal strings are supported, so this can't be used in combination with any ROM variables. As commas are used as separator characters, you'll need to escape any comma signs that you want to include in the actual value. For example %EXTRAARRAY_Parameters%=pone,p\\,two,pthree will pass the extra named _Parameters_ with the three separate array entries _pone_, _p,two_ and _pthree_. It's also possible to use the `%GAMEDIRRAW%`, `%ROMPATHRAW%` and `%ROMRAW%` variables inside an `%EXTRAARRAY_` variable definition, which will expand to the the directory of the game file, the ROM directory and the path to the game file respectively.
`%EXTRABOOL_` - Sets an extra with a boolean value, i.e. true/1 or false/0.
diff --git a/README.md b/README.md
index 0d5cad347..9a57ccce5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# ES-DE Frontend
-ES-DE (formerly EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection.
+ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection.
It's officially supported on Linux, macOS, Windows and Android but can also be used on BSD Unix and the Raspberry Pi if you build it yourself from source code.
@@ -29,7 +29,7 @@ https://gitlab.com/es-de/themes/themes-list
Visit https://es-de.org to download the latest ES-DE release or go to the [package registry](https://gitlab.com/es-de/emulationstation-de/-/packages) where you can also find most previous releases.
-The Android port of ES-DE is a paid app, which you can get on [Patreon](https://www.patreon.com/es_de).
+The Android port of ES-DE is a paid app, which you can get on [Patreon](https://www.patreon.com/es_de) or on the [Samsung Galaxy Store](https://galaxystore.samsung.com/detail/org.es_de.frontend.galaxy).
If you're using a Raspberry Pi or if you run FreeBSD, NetBSD or OpenBSD then you need to compile from source code as no prebuilt packages are provided for these platforms. A detailed build guide is available in [INSTALL.md](INSTALL.md).