From 1bd9bca2457b4e9d7d465eee98aff5acfa50f4ab Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Tue, 20 Dec 2022 13:23:53 -0800 Subject: [PATCH 1/8] Add two presets, removed some dupes Added a Neo Geo Pocket and Atari 7800 with Ballblazer or Commando preset. Removed Touchdown Fever presets as they were duplicates of the Triple Z80 presets. --- src/gui/presets.cpp | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 917b74de5..920bc7166 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -114,6 +114,19 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_GB, 64, 0, "") } ); + ENTRY( + "Neo Geo Pocket", { + CH(DIV_SYSTEM_T6W28, 64, 0, "") + CH(DIV_SYSTEM_PCM_DAC, 64, -127, + "rate=11025\n" + "outDepth=5\n" + ) + CH(DIV_SYSTEM_PCM_DAC, 64, 127, + "rate=11025\n" + "outDepth=5\n" + ) // don't know what the actual sample rate is + } + ); ENTRY( "NEC PC Engine/TurboGrafx-16", { CH(DIV_SYSTEM_PCE, 64, 0, "") @@ -190,6 +203,12 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_TIA, 64, 0, "") } ); + ENTRY( + "Atari 7800 + Ballblazer/Commando", { + CH(DIV_SYSTEM_TIA, 64, 0, "") + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); ENTRY( "Atari Lynx", { CH(DIV_SYSTEM_LYNX, 64, 0, "") @@ -2187,30 +2206,6 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=2") } ); - ENTRY( - "SNK Touchdown Fever", { - CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"), - CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2") - } - ); - ENTRY( - "SNK Touchdown Fever (drums mode on OPL)", { - CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"), - CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2") - } - ); - ENTRY( - "SNK Touchdown Fever (drums mode on Y8950)", { - CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"), - CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2") - } - ); - ENTRY( - "SNK Touchdown Fever (drums mode on OPL and Y8950)", { - CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"), - CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2") - } - ); ENTRY( "Alpha denshi Alpha-68K", { CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz From a4bfbfe8d95e0d58936eca24a93aaf4307ccb730 Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Tue, 20 Dec 2022 14:48:30 -0800 Subject: [PATCH 2/8] Fixed missing commas + Atari arcade presets --- src/gui/presets.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 920bc7166..12f5244f4 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -116,11 +116,11 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Neo Geo Pocket", { - CH(DIV_SYSTEM_T6W28, 64, 0, "") + CH(DIV_SYSTEM_T6W28, 64, 0, ""), CH(DIV_SYSTEM_PCM_DAC, 64, -127, "rate=11025\n" "outDepth=5\n" - ) + ), CH(DIV_SYSTEM_PCM_DAC, 64, 127, "rate=11025\n" "outDepth=5\n" @@ -205,7 +205,7 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Atari 7800 + Ballblazer/Commando", { - CH(DIV_SYSTEM_TIA, 64, 0, "") + CH(DIV_SYSTEM_TIA, 64, 0, ""), CH(DIV_SYSTEM_POKEY, 64, 0, "") } ); @@ -1671,6 +1671,25 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1") } ); + ENTRY( + "Atari Marble Madness", { + CH(DIV_SYSTEM_YM2151, 64, 0, ""), // clock should be 3.579 MHz + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); + ENTRY( + "Atari Championship Sprint", { + CH(DIV_SYSTEM_YM2151, 64, 0, ""), // clock should be 3.579 MHz + CH(DIV_SYSTEM_POKEY, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); + ENTRY( + "Atari Tetris", { + CH(DIV_SYSTEM_POKEY, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); ENTRY( "Sega Kyugo", { CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), From fe042b84cd80408d348949f367a34d5d9eb08d6e Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Tue, 20 Dec 2022 14:50:49 -0800 Subject: [PATCH 3/8] Wait that's the default clock speed derp --- src/gui/presets.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 12f5244f4..a63f7e562 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -1673,13 +1673,13 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Atari Marble Madness", { - CH(DIV_SYSTEM_YM2151, 64, 0, ""), // clock should be 3.579 MHz + CH(DIV_SYSTEM_YM2151, 64, 0, ""), CH(DIV_SYSTEM_POKEY, 64, 0, "") } ); ENTRY( "Atari Championship Sprint", { - CH(DIV_SYSTEM_YM2151, 64, 0, ""), // clock should be 3.579 MHz + CH(DIV_SYSTEM_YM2151, 64, 0, ""), CH(DIV_SYSTEM_POKEY, 64, 0, ""), CH(DIV_SYSTEM_POKEY, 64, 0, "") } From 8f972daf00d3dc1cd14dc667ec8a230fa854aaf6 Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Tue, 20 Dec 2022 15:04:06 -0800 Subject: [PATCH 4/8] One more for good measure --- src/gui/presets.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index a63f7e562..81416055f 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -1690,6 +1690,14 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_POKEY, 64, 0, "") } ); + ENTRY( + "Atari I, Robot", { + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // clock speed should be 1.512 MHz + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here + CH(DIV_SYSTEM_POKEY, 64, 0, "") // same here... + } + ); ENTRY( "Sega Kyugo", { CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), From 5f81ae48d8013f4f71174837ae860fda68b08bb9 Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Tue, 20 Dec 2022 20:52:51 -0800 Subject: [PATCH 5/8] As you wish --- src/gui/presets.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 81416055f..b9a4a2101 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -2233,6 +2233,30 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_OPL2_DRUMS, 64, 0, "clockSel=2") } ); + ENTRY( + "SNK Touchdown Fever", { + CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"), + CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2") + } + ); + ENTRY( + "SNK Touchdown Fever (drums mode on OPL)", { + CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"), + CH(DIV_SYSTEM_Y8950, 64, 0, "clockSel=2") + } + ); + ENTRY( + "SNK Touchdown Fever (drums mode on Y8950)", { + CH(DIV_SYSTEM_OPL, 64, 0, "clockSel=2"), + CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2") + } + ); + ENTRY( + "SNK Touchdown Fever (drums mode on OPL and Y8950)", { + CH(DIV_SYSTEM_OPL_DRUMS, 64, 0, "clockSel=2"), + CH(DIV_SYSTEM_Y8950_DRUMS, 64, 0, "clockSel=2") + } + ); ENTRY( "Alpha denshi Alpha-68K", { CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=3"), // 3MHz From 41a21ebb915d233d69aabb7260412c9567d95a49 Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Wed, 21 Dec 2022 12:42:47 -0800 Subject: [PATCH 6/8] A few more for better measure Some MSM5232 arcades --- src/gui/presets.cpp | 105 ++++++++++++++++++++++++++++++++------------ 1 file changed, 78 insertions(+), 27 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index b9a4a2101..59e261324 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -1671,33 +1671,6 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_MSM6295, 64, 0, "clockSel=1") } ); - ENTRY( - "Atari Marble Madness", { - CH(DIV_SYSTEM_YM2151, 64, 0, ""), - CH(DIV_SYSTEM_POKEY, 64, 0, "") - } - ); - ENTRY( - "Atari Championship Sprint", { - CH(DIV_SYSTEM_YM2151, 64, 0, ""), - CH(DIV_SYSTEM_POKEY, 64, 0, ""), - CH(DIV_SYSTEM_POKEY, 64, 0, "") - } - ); - ENTRY( - "Atari Tetris", { - CH(DIV_SYSTEM_POKEY, 64, 0, ""), - CH(DIV_SYSTEM_POKEY, 64, 0, "") - } - ); - ENTRY( - "Atari I, Robot", { - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // clock speed should be 1.512 MHz - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here - CH(DIV_SYSTEM_POKEY, 64, 0, "") // same here... - } - ); ENTRY( "Sega Kyugo", { CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), @@ -2066,6 +2039,33 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_MSM6295, 64, 127, "clockSel=14") // 1.193MHz (3.579545MHz / 3), Right output } ); + ENTRY( + "Atari Marble Madness", { + CH(DIV_SYSTEM_YM2151, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); + ENTRY( + "Atari Championship Sprint", { + CH(DIV_SYSTEM_YM2151, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); + ENTRY( + "Atari Tetris", { + CH(DIV_SYSTEM_POKEY, 64, 0, ""), + CH(DIV_SYSTEM_POKEY, 64, 0, "") + } + ); + ENTRY( + "Atari I, Robot", { + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // clock speed should be 1.512 MHz + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here + CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here + CH(DIV_SYSTEM_POKEY, 64, 0, "") // same here... + } + ); ENTRY( "Data East Karnov", { CH(DIV_SYSTEM_OPN, 64, 0, "clockSel=5"), // 1.5MHz @@ -2297,6 +2297,20 @@ void FurnaceGUI::initSystemPresets() { ) // software controlled 8 bit DAC } ); + ENTRY( + "Alpha denshi Equites", { + CH(DIV_SYSTEM_MSM5232, 64, 0, ""), // // clock speed should be 6.144 MHz + CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), + CH(DIV_SYSTEM_DAC, 64, 0, + "rate=11025\n" + "outDepth=5\n" + ), + CH(DIV_SYSTEM_DAC, 64, 0, + "rate=11025\n" + "outDepth=5\n" + ) // don't know what the actual sample rate is + } + ); ENTRY( "Neo Geo MVS", { CH(DIV_SYSTEM_YM2610_FULL, 64, 0, "") @@ -2369,6 +2383,43 @@ void FurnaceGUI::initSystemPresets() { CH(DIV_SYSTEM_YM2610B_EXT, 64, 0, "") } ); + ENTRY( + "Taito Metal Soldier Isaac II", { + CH(DIV_SYSTEM_MSM5232, 64, 0, ""), + CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3"), + CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=3") + } + ); + ENTRY( + "Taito The Fairyland Story", { + CH(DIV_SYSTEM_MSM5232, 64, 0, ""), + CH(DIV_SYSTEM_AY8910, 64, 0, + "clockSel=3\n" + "chipType=1\n" + ), + CH(DIV_SYSTEM_DAC, 64, 0, + "rate=11025\n" + "outDepth=7\n" + ) // don't know what the actual sample rate is + } + ); + ENTRY( + "Taito Wyvern F-0", { + CH(DIV_SYSTEM_MSM5232, 64, 0, ""), + CH(DIV_SYSTEM_AY8910, 64, 0, + "clockSel=3\n" + "chipType=1\n" + ), + CH(DIV_SYSTEM_AY8910, 64, 0, + "clockSel=3\n" + "chipType=1\n" + ), + CH(DIV_SYSTEM_DAC, 64, 0, + "rate=11025\n" + "outDepth=7\n" + ) // don't know what the actual sample rate is + } + ); ENTRY( "Seta 1", { CH(DIV_SYSTEM_X1_010, 64, 0, "") From 4cf97bba5ea15757af8095864182d62e52735f9e Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Wed, 21 Dec 2022 14:37:36 -0800 Subject: [PATCH 7/8] Fixed typos --- src/gui/presets.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 59e261324..428f467a7 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -2301,11 +2301,11 @@ void FurnaceGUI::initSystemPresets() { "Alpha denshi Equites", { CH(DIV_SYSTEM_MSM5232, 64, 0, ""), // // clock speed should be 6.144 MHz CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), - CH(DIV_SYSTEM_DAC, 64, 0, + CH(DIV_SYSTEM_PCM_DAC, 64, 0, "rate=11025\n" "outDepth=5\n" ), - CH(DIV_SYSTEM_DAC, 64, 0, + CH(DIV_SYSTEM_PCM_DAC, 64, 0, "rate=11025\n" "outDepth=5\n" ) // don't know what the actual sample rate is @@ -2397,7 +2397,7 @@ void FurnaceGUI::initSystemPresets() { "clockSel=3\n" "chipType=1\n" ), - CH(DIV_SYSTEM_DAC, 64, 0, + CH(DIV_SYSTEM_PCM_DAC, 64, 0, "rate=11025\n" "outDepth=7\n" ) // don't know what the actual sample rate is @@ -2414,7 +2414,7 @@ void FurnaceGUI::initSystemPresets() { "clockSel=3\n" "chipType=1\n" ), - CH(DIV_SYSTEM_DAC, 64, 0, + CH(DIV_SYSTEM_PCM_DAC, 64, 0, "rate=11025\n" "outDepth=7\n" ) // don't know what the actual sample rate is From 005aab057fb95cee5d08bf66e02076c61bc081cb Mon Sep 17 00:00:00 2001 From: Epictyphlosion <34047941+Epictyphlosion@users.noreply.github.com> Date: Wed, 21 Dec 2022 16:12:15 -0800 Subject: [PATCH 8/8] Wait, you can set custom clock speeds? --- src/gui/presets.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/gui/presets.cpp b/src/gui/presets.cpp index 428f467a7..d8cf21afb 100644 --- a/src/gui/presets.cpp +++ b/src/gui/presets.cpp @@ -2060,10 +2060,10 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Atari I, Robot", { - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // clock speed should be 1.512 MHz - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here - CH(DIV_SYSTEM_POKEY, 64, 0, ""), // same here - CH(DIV_SYSTEM_POKEY, 64, 0, "") // same here... + CH(DIV_SYSTEM_POKEY, 64, 0, "customClock=1512000"), + CH(DIV_SYSTEM_POKEY, 64, 0, "customClock=1512000"), + CH(DIV_SYSTEM_POKEY, 64, 0, "customClock=1512000"), + CH(DIV_SYSTEM_POKEY, 64, 0, "customClock=1512000") } ); ENTRY( @@ -2299,7 +2299,7 @@ void FurnaceGUI::initSystemPresets() { ); ENTRY( "Alpha denshi Equites", { - CH(DIV_SYSTEM_MSM5232, 64, 0, ""), // // clock speed should be 6.144 MHz + CH(DIV_SYSTEM_MSM5232, 64, 0, "customClock=6144000"), CH(DIV_SYSTEM_AY8910, 64, 0, "clockSel=14"), CH(DIV_SYSTEM_PCM_DAC, 64, 0, "rate=11025\n"