Merge branch 'master' into SID3

This commit is contained in:
tildearrow 2024-09-13 23:46:03 -05:00
commit 47f36f99d9
188 changed files with 5790 additions and 546 deletions

View file

@ -320,6 +320,11 @@ void FurnaceGUI::initSystemPresets() {
CH(DIV_SYSTEM_NDS, 1.0f, 0, "")
}
);
ENTRY(
"Watara Supervision", {
CH(DIV_SYSTEM_SUPERVISION, 1.0f, 0, "")
}
);
CATEGORY_END;
CATEGORY_BEGIN(_("Computers"),_("let's get to work on chiptune today."));
@ -519,6 +524,18 @@ void FurnaceGUI::initSystemPresets() {
) // variable rate, Mono DAC
}
);
SUB_ENTRY(
"MSX + MoonSound", {
CH(DIV_SYSTEM_AY8910, 1.0f, 0, "chipType=1"),
CH(DIV_SYSTEM_OPL4, 1.0f, 0, "")
}
);
SUB_ENTRY(
"MSX + MoonSound (drums mode)", {
CH(DIV_SYSTEM_AY8910, 1.0f, 0, "chipType=1"),
CH(DIV_SYSTEM_OPL4_DRUMS, 1.0f, 0, "")
}
);
ENTRY(
_("NEC PC-6001"), {
CH(DIV_SYSTEM_AY8910, 1.0f, 0, "customClock=3993600")
@ -1319,6 +1336,11 @@ void FurnaceGUI::initSystemPresets() {
)
}
);
ENTRY(
"Epoch Super Cassette Vision", {
CH(DIV_SYSTEM_UPD1771C, 1.0f, 0, "")
}
);
CATEGORY_END;
CATEGORY_BEGIN(_("Arcade systems"),_("INSERT COIN"));
@ -1895,6 +1917,30 @@ void FurnaceGUI::initSystemPresets() {
}
);
ENTRY(
_("Psikyo"), {}
);
SUB_ENTRY(
_("Psikyo 68EC020 hardware with OPL4"), {
CH(DIV_SYSTEM_OPL4, 1.0f, 0, "")
}
);
SUB_ENTRY(
_("Psikyo 68EC020 hardware with OPL4 (drums mode)"), {
CH(DIV_SYSTEM_OPL4_DRUMS, 1.0f, 0, "")
}
);
SUB_ENTRY(
_("Psikyo SH-2 hardware"), {
CH(DIV_SYSTEM_OPL4, 1.0f, 0, "clockSel=1")
}
);
SUB_ENTRY(
_("Psikyo SH-2 hardware (drums mode)"), {
CH(DIV_SYSTEM_OPL4_DRUMS, 1.0f, 0, "clockSel=1")
}
);
ENTRY(
_("Sega"), {}
);
@ -2719,6 +2765,16 @@ void FurnaceGUI::initSystemPresets() {
CH(DIV_SYSTEM_ESFM, 1.0f, 0, "")
}
);
ENTRY(
"Yamaha YMF278B (OPL4)", {
CH(DIV_SYSTEM_OPL4, 1.0f, 0, "")
}
);
SUB_ENTRY(
"Yamaha YMF278B (drums mode)", {
CH(DIV_SYSTEM_OPL4_DRUMS, 1.0f, 0, "")
}
);
if (settings.hiddenSystems) {
ENTRY(
_("Yamaha YMU759 (MA-2)"), {
@ -2930,6 +2986,16 @@ void FurnaceGUI::initSystemPresets() {
CH(DIV_SYSTEM_NDS, 1.0f, 0, "")
}
);
ENTRY(
"Yamaha YMF278B (OPL4)", {
CH(DIV_SYSTEM_OPL4, 1.0f, 0, "")
}
);
SUB_ENTRY(
"Yamaha YMF278B (drums mode)", {
CH(DIV_SYSTEM_OPL4_DRUMS, 1.0f, 0, "")
}
);
CATEGORY_END;
CATEGORY_BEGIN(_("Wavetable"),_("chips which use user-specified waveforms to generate sound."));
@ -3125,6 +3191,16 @@ void FurnaceGUI::initSystemPresets() {
CH(DIV_SYSTEM_SID3, 1.0f, 0, "")
}
);
ENTRY(
_("Watara Supervision"), {
CH(DIV_SYSTEM_SUPERVISION, 1.0f, 0, "")
}
);
ENTRY(
_("NEC μPD1771C"), {
CH(DIV_SYSTEM_UPD1771C, 1.0f, 0, "")
}
);
CATEGORY_END;
CATEGORY_BEGIN(_("DefleMask-compatible"),_("these configurations are compatible with DefleMask.\nselect this if you need to save as .dmf or work with that program."));