diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbca2f9ac..b89e281e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,7 @@ In addition to the above many bugs have been fixed and the application has recei
* Added Amiberry standalone as an alternative emulator for the amiga, amiga1200, amiga600, amigacd32 and cdtv systems on Linux and macOS
* Added MAME standalone as an alternative emulator for the atari7800 and x1 systems
* Set %STARTDIR%=%GAMEDIR% for the X Millennium RetroArch core as it created temporary files in the ES-DE directory
+* Added TIC-80 standalone as an alternative emulator for the tic80 system
* Added the MAME - Current RetroArch core as an alternative emulator for the apple2 system
* Added the MAME - Current RetroArch core and MAME standalone as alternative emulators for the daphne, odyssey2, vectrex and videopac systems
* Added MAME standalone as an alternative emulator for the fmtowns system on Unix and Windows
@@ -88,7 +89,6 @@ In addition to the above many bugs have been fixed and the application has recei
* (Linux) Added support for the Microsoft Xbox 360 (xbox360) game system by running xenia via Wine or Proton
* (Linux) Added support for the Atari Jaguar CD (atarijaguarcd) game system by running BigPEmu via Wine or Proton
* (Linux) Added BigPEmu Wine and BigPEmu Proton as alternative emulators for the atarijaguar system
-* (Linux) Added Demul Wine and Demul Proton as alternative emulators for the atomiswave, dreamcast, naomi and naomi2 systems
* (Linux) Added Model 2 Emulator Wine and Model 2 Emulator Proton as alternative emulators for the model2 system
* (Linux) Added 3dSen Wine and 3dSen Proton as alternative emulators for the famicom and nes systems
* (Linux) Added support for the Visual Pinball (vpinball) game system
@@ -110,6 +110,7 @@ In addition to the above many bugs have been fixed and the application has recei
* Removed the videopac platform ID entry as it's identical to odyssey2
* Changed the platform for the videopac system to odyssey2 to improve scraping
* Changed the full name for the vectrex system from "Smith Engineering Vectrex" to "GCE Vectrex"
+* Changed the fullname for the tic80 system from "TIC-80 Game Engine" to "TIC-80 Fantasy Computer"
* (modern-es-de) Replaced the carousel images for the c64 and dos systems
* Changed the screensaver to never show the same game again until all games have been cycled through
* Reduced the slideshow screensaver fade-in time
diff --git a/USERGUIDE-DEV.md b/USERGUIDE-DEV.md
index a06be60fa..61eabbfc7 100644
--- a/USERGUIDE-DEV.md
+++ b/USERGUIDE-DEV.md
@@ -857,14 +857,13 @@ Likewise the contents of the `WineCfg (Proton).sh` file could look something lik
The following Windows emulators are supported, and the setup for most of these is covered in detail in specific sections of this document:
-| System name | Emulator | Filename |
-| :---------------------------------------------- | :--------------- | :-----------------------|
-| atarijaguar/atarijaguarcd | BigPEmu | BigPEmu/BigPEmu.exe |
-| atomiswave/consolearcade/dreamcast/naomi/naomi2 | Demul | demul/demul.exe |
-| famicom/nes | 3dSen | 3dSen/3dSen.exe |
-| model2 | Model 2 Emulator | m2emulator/EMULATOR.EXE |
-| xbox360 | xenia | xenia/xenia.exe |
-| xbox360 | xenia | xenia/xenia_canary.exe |
+| System name | Emulator | Filename |
+| :------------------------ | :--------------- | :-----------------------|
+| atarijaguar/atarijaguarcd | BigPEmu | BigPEmu/BigPEmu.exe |
+| famicom/nes | 3dSen | 3dSen/3dSen.exe |
+| model2 | Model 2 Emulator | m2emulator/EMULATOR.EXE |
+| xbox360 | xenia | xenia/xenia.exe |
+| xbox360 | xenia | xenia/xenia_canary.exe |
## Running emulators in fullscreen mode
@@ -1351,7 +1350,7 @@ The following arcade boards have been considered:
| Nintendo VS. System/PlayChoice-10 | Nintendo Famicom/NES | MAME |
| Sammy Corporation Atomiswave | Sega Dreamcast | Flycast, Flycast Dojo |
| Sega Chihiro | Microsoft Xbox | xemu, Cxbx-Reloaded, MAME |
-| Sega Naomi/Naomi 2/SP | Sega Dreamcast | Flycast, Demul |
+| Sega Naomi/Naomi 2/SP | Sega Dreamcast | Flycast |
| Sega Mega Play/Mega-Tech/C-2 | Sega Mega Drive/Genesis | MAME |
| Sega Shooting Zone/System E | Sega Master System | MAME |
| Sega Titan Video Game System (ST-V) | Sega Saturn | Kronos, Mednafen, MAME |
@@ -3790,7 +3789,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| atarilynx | Atari Lynx | Handy | Beetle Lynx,
Mednafen **(Standalone)** | | |
| atarist | Atari ST [also STE and Falcon] | Hatari | Hatari **(Standalone)** | Yes | Single archive or image file for single-diskette games, .m3u playlist for multi-diskette games |
| atarixe | Atari XE | Atari800 | Atari800 **(Standalone)** | No | |
-| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W],
Demul **(Wine)** [U],
Demul **(Proton)** [U] | Depends | Single archive file |
+| atomiswave | Sammy Corporation Atomiswave | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W] | Depends | Single archive file |
| bbcmicro | Acorn Computers BBC Micro | MAME **(Standalone)** | | Yes | Single archive or diskette image file |
| c64 | Commodore 64 | VICE x64sc Accurate | VICE x64sc Accurate **(Standalone)**,
VICE x64 Fast,
VICE x64 SuperCPU,
VICE x128,
Frodo | No | Single archive or image file for tape, cartridge or single-diskette games, .m3u playlist for multi-diskette games |
| cavestory | Cave Story (NXEngine) | NXEngine | | | |
@@ -3800,7 +3799,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| channelf | Fairchild Channel F | FreeChaF | | | |
| coco | Tandy Color Computer | XRoar CoCo 2 NTSC **(Standalone)** | XRoar CoCo 2 PAL **(Standalone)** | Yes | See the specific _Tandy Color Computer_ section elsewhere in this guide |
| colecovision | Coleco ColecoVision | blueMSX | Gearcoleco,
openMSX **(Standalone)**,
ares **(Standalone)** | Yes | Single archive or ROM file |
-| consolearcade | Console Arcade Systems | MAME - Current | MAME **(Standalone)**,
Flycast,
Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul [Sega Naomi] **(Standalone)** [W],
Demul [Sega Naomi] **(Wine)** [U],
Demul [Sega Naomi] **(Proton)** [U],
Kronos [UW],
Mednafen [Sega Saturn] **(Standalone)**,
Play! **(Standalone)**,
RPCS3 Shortcut **(Standalone)**,
Triforce **(Standalone)** [UW],
xemu **(Standalone)**,
Cxbx-Reloaded **(Standalone)** [W],
_Shortcut or script_ | Depends | See the specific _Console Arcade Systems_ section elsewhere in this guide |
+| consolearcade | Console Arcade Systems | MAME - Current | MAME **(Standalone)**,
Flycast,
Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Kronos [UW],
Mednafen [Sega Saturn] **(Standalone)**,
Play! **(Standalone)**,
RPCS3 Shortcut **(Standalone)**,
Triforce **(Standalone)** [UW],
xemu **(Standalone)**,
Cxbx-Reloaded **(Standalone)** [W],
_Shortcut or script_ | Depends | See the specific _Console Arcade Systems_ section elsewhere in this guide |
| cps | Capcom Play System | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME **(Standalone)**,
FinalBurn Neo,
FinalBurn Neo **(Standalone)** [UW],
FB Alpha 2012,
FB Alpha 2012 CPS-1,
FB Alpha 2012 CPS-2,
FB Alpha 2012 CPS-3 | Depends | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
| cps1 | Capcom Play System I | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME **(Standalone)**,
FinalBurn Neo,
FinalBurn Neo **(Standalone)** [UW],
FB Alpha 2012,
FB Alpha 2012 CPS-1 | Depends | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
| cps2 | Capcom Play System II | MAME - Current | MAME 2010,
MAME 2003-Plus,
MAME 2000,
MAME **(Standalone)**,
FinalBurn Neo,
FinalBurn Neo **(Standalone)** [UW],
FB Alpha 2012,
FB Alpha 2012 CPS-2 | Depends | See the specific _Arcade and Neo Geo_ section elsewhere in this guide |
@@ -3811,7 +3810,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| doom | Doom | PrBoom | PrBoom+ **(Standalone)**,
Boom 3 [UW],
Boom 3 xp [UW],
_Shortcut or script_ | No | |
| dos | DOS (PC) | DOSBox-Pure | DOSBox-Core,
DOSBox-SVN,
DOSBox-X **(Standalone)**,
DOSBox Staging **(Standalone)** | No | See the specific _DOS / PC_ section elsewhere in this guide |
| dragon32 | Dragon Data Dragon 32 | XRoar Dragon 32 **(Standalone)** | XRoar Dragon 64 **(Standalone)** | Yes | See the specific _Dragon 32 and Tano Dragon_ section elsewhere in this guide |
-| dreamcast | Sega Dreamcast | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Redream **(Standalone)**,
Demul **(Standalone)** [W],
Demul **(Wine)** [U],
Demul **(Proton)** [U] | No | In separate folder interpreted as a file, with .m3u playlist if multi-disc game |
+| dreamcast | Sega Dreamcast | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Redream **(Standalone)**,
Demul **(Standalone)** [W] | No | In separate folder interpreted as a file, with .m3u playlist if multi-disc game |
| easyrpg | EasyRPG Game Engine | EasyRPG | EasyRPG Player **(Standalone)** | No | See the specific _EasyRPG Game Engine_ section elsewhere in this guide |
| electron | Acorn Electron | MAME [Tape] **(Standalone)** | MAME [Diskette DFS] **(Standalone)**,
MAME [Diskette ADFS] **(Standalone)** | Yes | Single archive, or single tape or diskette image file |
| emulators | Emulators | _Suspend ES-DE_ | _Keep ES-DE running_,
_AppImage (Suspend ES-DE)_ [U],
_AppImage (Keep ES-DE running)_ [U] | No | See the specific _Ports and desktop applications_ section elsewhere in this guide |
@@ -3863,8 +3862,8 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| msxturbor | MSX Turbo R | blueMSX | openMSX **(Standalone)**,
openMSX No Machine **(Standalone)** | Yes | |
| mugen | M.U.G.E.N Game Engine | Ikemen GO **(Standalone)** | | No | See the specific _M.U.G.E.N Game Engine_ section elsewhere in this guide |
| multivision | Othello Multivision | Gearsystem | | | |
-| naomi | Sega NAOMI | Flycast | Flycast **(Standalone)**,
Flycast Dojo **(Standalone)**,
Demul **(Standalone)** [W],
Demul **(Wine)** [U],
Demul **(Proton)** [U] | 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],
Demul **(Wine)** [U],
Demul **(Proton)** [U] | Yes | Single archive file + .chd file in subdirectory if GD-ROM game |
+| 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 |
| n3ds | Nintendo 3DS | Citra [UW],
Citra **(Standalone)** [M] | Citra 2018 [UW],
Citra **(Standalone)** [UW] | No | Single ROM file |
| n64 | Nintendo 64 | Mupen64Plus-Next | Mupen64Plus **(Standalone)**,
ParaLLEl N64,
simple64 **(Standalone)** [UW],
Rosalie's Mupen GUI **(Standalone)** [UW],
Project64 **(Standalone)** [W],
ares **(Standalone)**,
sixtyforce **(Standalone)** [M] | No | Single archive or ROM file |
@@ -3930,7 +3929,7 @@ The **@** symbol indicates that the emulator is _deprecated_ and will be removed
| tg16 | NEC TurboGrafx-16 | Beetle PCE | Beetle PCE FAST,
Mednafen **(Standalone)**,
Mesen **(Standalone)** [UW],
ares **(Standalone)** | No | Single archive or ROM file |
| tg-cd | NEC TurboGrafx-CD | Beetle PCE | Beetle PCE FAST,
Mednafen **(Standalone)**,
Mesen **(Standalone)** [UW],
ares **(Standalone)** | Yes | |
| ti99 | Texas Instruments TI-99 | MAME **(Standalone)** | | Yes | See the specific _Texas Instruments TI-99_ section elsewhere in this guide |
-| tic80 | TIC-80 Game Engine | TIC-80 | | No | Single .tic file |
+| tic80 | TIC-80 Fantasy Computer | TIC-80 | TIC-80 **(Standalone)** | No | Single .tic file |
| to8 | Thomson TO8 | Theodore | | | |
| triforce | Namco-Sega-Nintendo Triforce | Triforce **(Standalone)** [UW] | | No | |
| trs-80 | Tandy TRS-80 | sdl2trs DOS Diskette **(Standalone)** [UW] | sdl2trs Bootable Diskette **(Standalone)** [UW],
sdl2trs CMD File **(Standalone)** [UW] | Yes | See the specific _Tandy TRS-80_ section elsewhere in this guide |