implement the final game boy bits

This commit is contained in:
tildearrow 2021-05-28 01:26:57 -05:00
parent 83ce4f0ebe
commit fc87899aa8
3 changed files with 43 additions and 11 deletions

View File

@ -23,8 +23,8 @@ void DivPlatformGB::updateWave() {
}
static unsigned char gbVolMap[16]={
0x00, 0x60, 0x60, 0x60,
0x60, 0x60, 0x40, 0x40,
0x00, 0x00, 0x00, 0x00,
0x60, 0x60, 0x60, 0x60,
0x40, 0x40, 0x40, 0x40,
0x20, 0x20, 0x20, 0x20
};
@ -93,6 +93,12 @@ void DivPlatformGB::tick() {
}
}
}
if (chan[i].sweepChanged) {
chan[i].sweepChanged=false;
if (i==0) {
rWrite(16+i*5,chan[i].sweep);
}
}
if (chan[i].freqChanged || chan[i].keyOn || chan[i].keyOff) {
DivInstrument* ins=parent->getIns(chan[i].ins);
if (i==3) { // noise
@ -110,7 +116,6 @@ void DivPlatformGB::tick() {
rWrite(16+i*5,0x80);
rWrite(16+i*5+2,gbVolMap[chan[i].vol]);
} else {
rWrite(16+i*5,0x00);
rWrite(16+i*5+1,((chan[i].duty&3)<<6)|(63-(ins->gb.soundLen&63)));
rWrite(16+i*5+2,((chan[i].vol<<4))|(ins->gb.envLen&7)|((ins->gb.envDir&1)<<3));
}
@ -123,7 +128,7 @@ void DivPlatformGB::tick() {
}
}
if (i==3) { // noise
rWrite(16+i*5+3,chan[i].freq&0xff);
rWrite(16+i*5+3,(chan[i].freq&0xff)|(chan[i].duty?8:0));
rWrite(16+i*5+4,((chan[i].keyOn||chan[i].keyOff)?0x80:0x00)|((ins->gb.soundLen<64)<<6));
} else {
rWrite(16+i*5+3,(2048-chan[i].freq)&0xff);
@ -163,9 +168,11 @@ int DivPlatformGB::dispatch(DivCommand c) {
chan[c.chan].std.init(NULL);
break;
case DIV_CMD_INSTRUMENT:
chan[c.chan].ins=c.value;
if (c.chan!=2) {
chan[c.chan].vol=parent->getIns(chan[c.chan].ins)->gb.envVol;
if (chan[c.chan].ins!=c.value) {
chan[c.chan].ins=c.value;
if (c.chan!=2) {
chan[c.chan].vol=parent->getIns(chan[c.chan].ins)->gb.envVol;
}
}
break;
case DIV_CMD_VOLUME:
@ -208,8 +215,10 @@ int DivPlatformGB::dispatch(DivCommand c) {
break;
}
case DIV_CMD_STD_NOISE_MODE:
//snNoiseMode=(c.value&1)|((c.value&16)>>3);
updateSNMode=true;
chan[c.chan].duty=c.value;
if (c.chan==3) {
chan[c.chan].freqChanged=true;
}
break;
case DIV_CMD_PANNING: {
lastPan&=~(0x11<<c.chan);
@ -226,6 +235,18 @@ int DivPlatformGB::dispatch(DivCommand c) {
case DIV_CMD_PRE_PORTA:
chan[c.chan].std.init(parent->getIns(chan[c.chan].ins));
break;
case DIV_CMD_GB_SWEEP_DIR:
chan[c.chan].sweep&=0xf7;
if (c.value&1) {
chan[c.chan].sweep|=8;
}
chan[c.chan].sweepChanged=true;
break;
case DIV_CMD_GB_SWEEP_TIME:
chan[c.chan].sweep&=8;
chan[c.chan].sweep|=c.value&0x77;
chan[c.chan].sweepChanged=true;
break;
case DIV_CMD_GET_VOLMAX:
return 15;
break;

View File

@ -8,8 +8,8 @@
class DivPlatformGB: public DivDispatch {
struct Channel {
int freq, baseFreq, pitch;
unsigned char ins, note, duty;
bool active, insChanged, freqChanged, keyOn, keyOff;
unsigned char ins, note, duty, sweep;
bool active, insChanged, freqChanged, sweepChanged, keyOn, keyOff;
signed char vol, outVol, wave;
DivMacroInt std;
Channel():
@ -19,9 +19,11 @@ class DivPlatformGB: public DivDispatch {
ins(-1),
note(0),
duty(0),
sweep(0),
active(false),
insChanged(true),
freqChanged(false),
sweepChanged(false),
keyOn(false),
keyOff(false),
vol(15),

View File

@ -95,6 +95,15 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe
case 0x10: // select waveform
dispatchCmd(DivCommand(DIV_CMD_WAVE,ch,effectVal));
break;
case 0x11: case 0x12: // duty or noise mode
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
break;
case 0x13: // sweep params
dispatchCmd(DivCommand(DIV_CMD_GB_SWEEP_TIME,ch,effectVal));
break;
case 0x14: // sweep direction
dispatchCmd(DivCommand(DIV_CMD_GB_SWEEP_DIR,ch,effectVal));
break;
default:
return false;
}