diff --git a/papers/newIns.md b/papers/newIns.md index 5a328c96..9176bd1a 100644 --- a/papers/newIns.md +++ b/papers/newIns.md @@ -114,8 +114,9 @@ the following instrument types are available: - 44: T6W28 - 45: K007232 - 46: GA20 -- 47: Pokémon Mini +- 47: Pokémon Mini/QuadTone - 48: SM8521 +- 49: PV-1000 the following feature codes are recognized: diff --git a/src/engine/platform/zxbeeperquadtone.cpp b/src/engine/platform/zxbeeperquadtone.cpp index 50082d04..b6e6e144 100644 --- a/src/engine/platform/zxbeeperquadtone.cpp +++ b/src/engine/platform/zxbeeperquadtone.cpp @@ -152,7 +152,7 @@ int DivPlatformZXBeeperQuadTone::dispatch(DivCommand c) { switch (c.cmd) { case DIV_CMD_NOTE_ON: { if (c.chan<4) { - DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_BEEPER); + DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_POKEMINI); if (c.value!=DIV_NOTE_NULL) { chan[c.chan].baseFreq=NOTE_FREQUENCY(c.value); chan[c.chan].freqChanged=true; @@ -256,7 +256,7 @@ int DivPlatformZXBeeperQuadTone::dispatch(DivCommand c) { break; case DIV_CMD_PRE_PORTA: if (chan[c.chan].active && c.value2) { - if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_BEEPER)); + if (parent->song.resetMacroOnPorta) chan[c.chan].macroInit(parent->getIns(chan[c.chan].ins,DIV_INS_POKEMINI)); } if (!chan[c.chan].inPorta && c.value && !parent->song.brokenPortaArp && chan[c.chan].std.arp.will && !NEW_ARP_STRAT) chan[c.chan].baseFreq=NOTE_FREQUENCY(chan[c.chan].note); chan[c.chan].inPorta=c.value; diff --git a/src/engine/sysDef.cpp b/src/engine/sysDef.cpp index 509dc02c..80c987e2 100644 --- a/src/engine/sysDef.cpp +++ b/src/engine/sysDef.cpp @@ -1848,7 +1848,7 @@ void DivEngine::registerSystems() { {"Channel 1", "Channel 2", "Channel 3", "Channel 4", "PCM"}, {"CH1", "CH2", "CH3", "CH4", "PCM"}, {DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PULSE, DIV_CH_PCM}, - {DIV_INS_BEEPER, DIV_INS_BEEPER, DIV_INS_BEEPER, DIV_INS_BEEPER, DIV_INS_AMIGA}, + {DIV_INS_POKEMINI, DIV_INS_POKEMINI, DIV_INS_POKEMINI, DIV_INS_POKEMINI, DIV_INS_AMIGA}, {}, { {0x12, {DIV_CMD_STD_NOISE_MODE, "12xx: Set pulse width"}} diff --git a/src/gui/guiConst.cpp b/src/gui/guiConst.cpp index 07f959ad..214eb468 100644 --- a/src/gui/guiConst.cpp +++ b/src/gui/guiConst.cpp @@ -128,7 +128,7 @@ const char* insTypes[DIV_INS_MAX+1]={ "T6W28", "K007232", "GA20", - "Pokémon Mini", + "Pokémon Mini/QuadTone", "SM8521", "PV-1000", NULL