Merge branch 'vrc6' of https://github.com/cam900/furnace into cam900-vrc6

This commit is contained in:
tildearrow 2022-03-27 22:16:04 -05:00
commit 4422ff7695
17 changed files with 1234 additions and 3 deletions

View file

@ -2091,7 +2091,7 @@ void FurnaceGUI::drawInsEdit() {
if ((ins->type==DIV_INS_PCE || ins->type==DIV_INS_AY8930)) {
volMax=31;
}
if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_VERA) {
if (ins->type==DIV_INS_OPL || ins->type==DIV_INS_VERA || ins->type==DIV_INS_VRC6) {
volMax=63;
}
if (ins->type==DIV_INS_AMIGA) {
@ -2156,6 +2156,10 @@ void FurnaceGUI::drawInsEdit() {
dutyLabel="Waveform pos.";
dutyMax=255;
}
if (ins->type==DIV_INS_VRC6) {
dutyLabel="Duty";
dutyMax=7;
}
bool dutyIsRel=(ins->type==DIV_INS_C64 && !ins->c64.dutyIsAbs);
const char* waveLabel="Waveform";
@ -2164,7 +2168,7 @@ void FurnaceGUI::drawInsEdit() {
if (ins->type==DIV_INS_C64 || ins->type==DIV_INS_AY || ins->type==DIV_INS_AY8930 || ins->type==DIV_INS_SAA1099) {
bitMode=true;
}
if (ins->type==DIV_INS_STD) waveMax=0;
if (ins->type==DIV_INS_STD || ins->type==DIV_INS_VRC6) waveMax=0;
if (ins->type==DIV_INS_TIA || ins->type==DIV_INS_VIC || ins->type==DIV_INS_OPLL) waveMax=15;
if (ins->type==DIV_INS_C64) waveMax=4;
if (ins->type==DIV_INS_SAA1099) waveMax=2;