From 61e765c916bc11423cf1d41a2351e3c1d2f27131 Mon Sep 17 00:00:00 2001 From: freq-mod <32672779+freq-mod@users.noreply.github.com> Date: Tue, 31 May 2022 15:23:38 +0200 Subject: [PATCH] more presets (#488) * more presets * oops consistency anyone? * alpha 68k was an alpha denshi system * more presets 6295 edition. Requires fact-checking, and maybe, cherrypicking * facepalm * #342 presets that should conclude it * address feedback * naming update * MSM6295 wasnt used in MLC * address feedback part 2 and adding OKI chips to the sample category --- src/gui/presets.cpp | 237 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 233 insertions(+), 4 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 8a459da0..8f971998 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -295,7 +295,19 @@ void FurnaceGUI::initSystemPresets() { DIV_SYSTEM_RF5C68, 64, 0, 0, 0 } + )); + cat.systems.push_back(FurnaceGUISysDef( + "OKI MSM6258", { + DIV_SYSTEM_MSM6258, 64, 0, 0, + 0 + } )); + cat.systems.push_back(FurnaceGUISysDef( + "OKI MSM6295", { + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); sysCategories.push_back(cat); cat=FurnaceGUISysCategory("Wavetable","chips which use user-specified waveforms to generate sound."); @@ -660,7 +672,7 @@ void FurnaceGUI::initSystemPresets() { } )); cat.systems.push_back(FurnaceGUISysDef( - "Commodore 64 (6581 SID + Sound Expander with drums mode)", { + "Commodore 64 (6581 SID + Sound Expander in drums mode)", { DIV_SYSTEM_C64_6581, 64, 0, 1, DIV_SYSTEM_OPL_DRUMS, 64, 0, 0, 0 @@ -674,11 +686,39 @@ void FurnaceGUI::initSystemPresets() { } )); cat.systems.push_back(FurnaceGUISysDef( - "Commodore 64 (8580 SID + Sound Expander with drums mode)", { + "Commodore 64 (8580 SID + Sound Expander in drums mode)", { DIV_SYSTEM_C64_8580, 64, 0, 1, DIV_SYSTEM_OPL_DRUMS, 64, 0, 0, 0 } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Commodore 64 (6581 SID + FM-YAM)", { + DIV_SYSTEM_C64_6581, 64, 0, 1, + DIV_SYSTEM_OPL2, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Commodore 64 (6581 SID + FM-YAM in drums mode)", { + DIV_SYSTEM_C64_6581, 64, 0, 1, + DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Commodore 64 (8580 SID + FM-YAM)", { + DIV_SYSTEM_C64_8580, 64, 0, 1, + DIV_SYSTEM_OPL2, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Commodore 64 (8580 SID + FM-YAM in drums mode)", { + DIV_SYSTEM_C64_8580, 64, 0, 1, + DIV_SYSTEM_OPL2_DRUMS, 64, 0, 0, + 0 + } )); cat.systems.push_back(FurnaceGUISysDef( "Amiga", { @@ -735,6 +775,15 @@ void FurnaceGUI::initSystemPresets() { // per-channel mixer (soft panning, post processing) isn't emulated at all 0 } + )); + cat.systems.push_back(FurnaceGUISysDef( + "MSX + Playsoniq", { + DIV_SYSTEM_AY8910, 64, 0, 16, + DIV_SYSTEM_SMS, 64, 0, 0, + DIV_SYSTEM_C64_8580, 64, 0, 0, + DIV_SYSTEM_SCC_PLUS, 64, 0, 0, + 0 + } )); cat.systems.push_back(FurnaceGUISysDef( "MSX + SCC", { @@ -777,6 +826,7 @@ void FurnaceGUI::initSystemPresets() { cat.systems.push_back(FurnaceGUISysDef( "ZX Spectrum (48K)", { DIV_SYSTEM_AY8910, 64, 0, 2, + DIV_SYSTEM_SFX_BEEPER, 64, 0, 0, 0 } )); @@ -786,6 +836,14 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "ZX Spectrum (128K) with TurboSound FM", { + DIV_SYSTEM_AY8910, 64, 0, 1, + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPN, 64, 0, 0, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Amstrad CPC", { DIV_SYSTEM_AY8910, 64, 0, 5, @@ -923,14 +981,13 @@ void FurnaceGUI::initSystemPresets() { 0 } )); - /* cat.systems.push_back(FurnaceGUISysDef( "Sharp X68000", { DIV_SYSTEM_YM2151, 64, 0, 2, DIV_SYSTEM_MSM6258, 64, 0, 0, 0 } - ));*/ + )); cat.systems.push_back(FurnaceGUISysDef( "FM Towns", { DIV_SYSTEM_YM2612, 64, 0, 2, @@ -955,6 +1012,16 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Gyruss", { + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Sega Kyugo", { DIV_SYSTEM_AY8910, 64, 0, 4, @@ -969,6 +1036,97 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Capcom CPS-1", { + DIV_SYSTEM_YM2151, 64, 0, 2, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Jaleco Mega System 1", { + DIV_SYSTEM_YM2151, 64, 0, 2, + DIV_SYSTEM_MSM6295, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "NMK 16-bit Arcade", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 2, + DIV_SYSTEM_MSM6295, 64, 0, 2, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Data East Arcade", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPL2, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Kaneko Toybox System", { + DIV_SYSTEM_AY8910, 64, 0, 1, + DIV_SYSTEM_AY8910, 64, 0, 1, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Tecmo Arcade", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Seibu Kaihatsu Arcade", { + DIV_SYSTEM_OPL2, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Data East Arcade (Dark Seal)", { + DIV_SYSTEM_YM2151, 64, 0, 2, + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 8, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Sunsoft Arcade", { + DIV_SYSTEM_YM2612, 64, 0, 4, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Atari Arcade (Rampart)", { + DIV_SYSTEM_OPLL, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Data East Deco 156", { + DIV_SYSTEM_MSM6295, 64, 0, 0, + DIV_SYSTEM_MSM6295, 64, 0, 8, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "SNK Triple Z80 (Chopper)", { //or Namco? + DIV_SYSTEM_Y8950, 64, 0, 0, + DIV_SYSTEM_OPL2, 64, 0, 0, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Sega System 18", { DIV_SYSTEM_YM2612, 64, 0, 2, @@ -977,6 +1135,13 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Sega System 1", { + DIV_SYSTEM_SMS, 64, 0, 2, + DIV_SYSTEM_SMS, 64, 0, 3, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Sega System 32", { DIV_SYSTEM_YM2612, 64, 0, 4, @@ -985,6 +1150,41 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Sega Hang-On", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_SEGAPCM, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "SNK Alpha-68K", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPLL, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Data East Karnov", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPL, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Capcom Arcade", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_OPN, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Data East PCX", { + DIV_SYSTEM_OPN, 64, 0, 0, + DIV_SYSTEM_PCE, 64, 0, 2, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Neo Geo MVS", { DIV_SYSTEM_YM2610_FULL, 64, 0, 0, @@ -997,6 +1197,22 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Capcom Exed Eyes", { + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_SMS, 64, 0, 0, + DIV_SYSTEM_SMS, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "Nichibutsu Arcade", { + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + DIV_SYSTEM_AY8910, 64, 0, 0, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Namco (3-channel WSG)", { DIV_SYSTEM_NAMCO, 64, 0, 0, @@ -1052,6 +1268,19 @@ void FurnaceGUI::initSystemPresets() { 0 } )); + cat.systems.push_back(FurnaceGUISysDef( + "Cave 68000", { + DIV_SYSTEM_YMZ280B, 64, 0, 0, + 0 + } + )); + cat.systems.push_back(FurnaceGUISysDef( + "SNK Triple Z80", { + DIV_SYSTEM_Y8950, 64, 0, 0, + DIV_SYSTEM_OPL, 64, 0, 0, + 0 + } + )); cat.systems.push_back(FurnaceGUISysDef( "Konami Bubble System", { DIV_SYSTEM_AY8910, 64, 0, 0,