otomatalabs/furnace
7
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

arp commands should have 1 byte arg

Browse source
This commit is contained in:
tildearrow 2025-04-08 04:00:55 -05:00
parent 24cd378e50
commit ad5fb97822
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
papers/export-tech.md
View file

@ -70,7 +70,9 @@ hex | description
c3 | vibrato range (b) c3 | vibrato range (b)
c4 | vibrato shape (b) c4 | vibrato shape (b)
c5 | pitch (c) c5 | pitch (c)
c6 | arpeggio (bb) // note1, note2 c6 | arpeggio (X)
| - bit 4-7: note 1
| - bit 0-3: note 2
c7 | volume (b) c7 | volume (b)
c8 | vol slide (s) c8 | vol slide (s)
c9 | porta (bb) // target, speed c9 | porta (bb) // target, speed

4
src/engine/cmdStream.cpp
View file

@ -229,13 +229,13 @@ bool DivCSPlayer::tick() {
case DIV_CMD_HINT_VIBRATO_RANGE: case DIV_CMD_HINT_VIBRATO_RANGE:
case DIV_CMD_HINT_VIBRATO_SHAPE: case DIV_CMD_HINT_VIBRATO_SHAPE:
case DIV_CMD_HINT_VOLUME: case DIV_CMD_HINT_VOLUME:
case DIV_CMD_HINT_ARPEGGIO:
arg0=(unsigned char)stream.readC(); arg0=(unsigned char)stream.readC();
break; break;
case DIV_CMD_HINT_PITCH: case DIV_CMD_HINT_PITCH:
arg0=(signed char)stream.readC(); arg0=(signed char)stream.readC();
break; break;
case DIV_CMD_HINT_VIBRATO: case DIV_CMD_HINT_VIBRATO:
case DIV_CMD_HINT_ARPEGGIO:
case DIV_CMD_HINT_PORTA: case DIV_CMD_HINT_PORTA:
arg0=(signed char)stream.readC(); arg0=(signed char)stream.readC();
arg1=(unsigned char)stream.readC(); arg1=(unsigned char)stream.readC();
@ -515,7 +515,7 @@ bool DivCSPlayer::tick() {
e->dispatchCmd(DivCommand(DIV_CMD_LEGATO,i,chan[i].note)); e->dispatchCmd(DivCommand(DIV_CMD_LEGATO,i,chan[i].note));
break; break;
case DIV_CMD_HINT_ARPEGGIO: case DIV_CMD_HINT_ARPEGGIO:
chan[i].arp=(((unsigned char)arg0)<<4)|(arg1&15); chan[i].arp=(unsigned char)arg0;
break; break;
case DIV_CMD_HINT_ARP_TIME: case DIV_CMD_HINT_ARP_TIME:
arpSpeed=arg0; arpSpeed=arg0;

4
src/engine/cmdStreamOps.cpp
View file

@ -237,13 +237,13 @@ int DivCS::getInsLength(unsigned char ins, unsigned char ext, unsigned char* spe
case 0xc3: // vib range case 0xc3: // vib range
case 0xc4: // vib shape case 0xc4: // vib shape
case 0xc5: // pitch case 0xc5: // pitch
case 0xc6: // arpeggio
case 0xc7: // volume case 0xc7: // volume
case 0xca: // legato case 0xca: // legato
case 0xfd: // waitc case 0xfd: // waitc
return 2; return 2;
case 0xcf: // pan case 0xcf: // pan
case 0xc2: // vibrato case 0xc2: // vibrato
case 0xc6: // arpeggio
case 0xc8: // vol slide case 0xc8: // vol slide
case 0xc9: // porta case 0xc9: // porta
return 3; return 3;
@ -329,11 +329,11 @@ void writeCommandValues(SafeWriter* w, const DivCommand& c) {
case DIV_CMD_HINT_TREMOLO: case DIV_CMD_HINT_TREMOLO:
case DIV_CMD_HINT_PANBRELLO: case DIV_CMD_HINT_PANBRELLO:
case DIV_CMD_HINT_PAN_SLIDE: case DIV_CMD_HINT_PAN_SLIDE:
case DIV_CMD_HINT_ARPEGGIO:
w->writeC(c.value); w->writeC(c.value);
break; break;
case DIV_CMD_HINT_PANNING: case DIV_CMD_HINT_PANNING:
case DIV_CMD_HINT_VIBRATO: case DIV_CMD_HINT_VIBRATO:
case DIV_CMD_HINT_ARPEGGIO:
case DIV_CMD_HINT_PORTA: case DIV_CMD_HINT_PORTA:
w->writeC(c.value); w->writeC(c.value);
w->writeC(c.value2); w->writeC(c.value2);

4
src/gui/csPlayer.cpp
View file

@ -65,8 +65,8 @@ String disasmCmd(unsigned char* buf, size_t bufLen, unsigned int addr, unsigned
return fmt::sprintf("pitch $%.2x",(int)buf[addr+1]); return fmt::sprintf("pitch $%.2x",(int)buf[addr+1]);
break; break;
case 0xc6: case 0xc6:
if (addr+2>=bufLen) return "???"; if (addr+1>=bufLen) return "???";
return fmt::sprintf("arp %d, %d",(int)buf[addr+1],(int)buf[addr+2]); return fmt::sprintf("arp $%.2x",(int)buf[addr+1]);
break; break;
case 0xc7: case 0xc7:
if (addr+1>=bufLen) return "???"; if (addr+1>=bufLen) return "???";