etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-30 16:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

many fixes to NES system playback

Browse source
This commit is contained in:
tildearrow 2021-12-04 02:19:14 -05:00
parent 3286c3c0c5
commit 6599eb4f7e
3 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/engine/platform/nes.cpp
View file

@ -37,14 +37,14 @@ static int dacRates[6]={
}; };
static unsigned char noiseTable[256]={ static unsigned char noiseTable[256]={
8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 7, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 5, 4,
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4,
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4,
3, 2, 1, 0, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4,
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4,
3, 2, 1, 0, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4,
15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4,
3, 2, 1, 0, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 11, 10, 9, 8, 7, 6, 5, 4,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
@ -65,9 +65,12 @@ void DivPlatformNES::tick() {
for (int i=0; i<4; i++) { for (int i=0; i<4; i++) {
chan[i].std.next(); chan[i].std.next();
if (chan[i].std.hadVol) { if (chan[i].std.hadVol) {
chan[i].outVol=(chan[i].vol*chan[i].std.vol)/15; // ok, why are the volumes like that?
chan[i].outVol=chan[i].std.vol-(15-chan[i].vol);
if (chan[i].outVol<0) chan[i].outVol=0;
if (i==2) { // triangle if (i==2) { // triangle
apu_wr_reg(0x4000+i*4,(chan[i].outVol==0)?0:255); apu_wr_reg(0x4000+i*4,(chan[i].outVol==0)?0:255);
chan[i].freqChanged=true;
} else { } else {
apu_wr_reg(0x4000+i*4,0x30|chan[i].outVol|((chan[i].duty&3)<<6)); apu_wr_reg(0x4000+i*4,0x30|chan[i].outVol|((chan[i].duty&3)<<6));
} }
@ -84,7 +87,7 @@ void DivPlatformNES::tick() {
} else { } else {
if (!chan[i].inPorta) { if (!chan[i].inPorta) {
if (chan[i].std.arpMode) { if (chan[i].std.arpMode) {
chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp+24)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].std.arp)/12.0f)));
} else { } else {
chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f))); chan[i].baseFreq=round(FREQ_BASE/pow(2.0f,((float)(chan[i].note+chan[i].std.arp-12)/12.0f)));
} }
@ -103,13 +106,8 @@ void DivPlatformNES::tick() {
if (i!=2) { if (i!=2) {
apu_wr_reg(0x4000+i*4,0x30|chan[i].outVol|((chan[i].duty&3)<<6)); apu_wr_reg(0x4000+i*4,0x30|chan[i].outVol|((chan[i].duty&3)<<6));
} }
} if (i==3) { // noise
if (chan[i].std.hadWave) { chan[i].freqChanged=true;
if (chan[i].wave!=chan[i].std.wave) {
chan[i].wave=chan[i].std.wave;
if (i==2) {
if (!chan[i].keyOff) chan[i].keyOn=true;
}
} }
} }
if (chan[i].sweepChanged) { if (chan[i].sweepChanged) {
@ -126,7 +124,6 @@ void DivPlatformNES::tick() {
chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE; chan[i].freq=(chan[i].baseFreq*(ONE_SEMITONE-chan[i].pitch))/ONE_SEMITONE;
if (chan[i].freq>2047) chan[i].freq=2047; if (chan[i].freq>2047) chan[i].freq=2047;
} }
if (chan[i].note>0x5d) chan[i].freq=0x01;
if (chan[i].keyOn) { if (chan[i].keyOn) {
//rWrite(16+i*5+1,((chan[i].duty&3)<<6)|(63-(ins->gb.soundLen&63))); //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)); //rWrite(16+i*5+2,((chan[i].vol<<4))|(ins->gb.envLen&7)|((ins->gb.envDir&1)<<3));
@ -140,7 +137,7 @@ void DivPlatformNES::tick() {
} }
} }
if (i==3) { // noise if (i==3) { // noise
apu_wr_reg(0x4002+i*4,chan[i].freq); apu_wr_reg(0x4002+i*4,(chan[i].duty<<7)|chan[i].freq);
apu_wr_reg(0x4003+i*4,0xf0); apu_wr_reg(0x4003+i*4,0xf0);
} else { } else {
apu_wr_reg(0x4002+i*4,chan[i].freq&0xff); apu_wr_reg(0x4002+i*4,chan[i].freq&0xff);
@ -240,7 +237,7 @@ int DivPlatformNES::dispatch(DivCommand c) {
} }
case DIV_CMD_STD_NOISE_MODE: case DIV_CMD_STD_NOISE_MODE:
chan[c.chan].duty=c.value; chan[c.chan].duty=c.value;
if (c.chan!=2) { if (c.chan==3) { // noise
chan[c.chan].freqChanged=true; chan[c.chan].freqChanged=true;
} }
break; break;

2
src/engine/platform/nes.h
View file

@ -15,7 +15,7 @@ class DivPlatformNES: public DivDispatch {
freq(0), freq(0),
baseFreq(0), baseFreq(0),
pitch(0), pitch(0),
prevFreq(-1), prevFreq(65535),
ins(-1), ins(-1),
note(0), note(0),
duty(0), duty(0),

9
src/engine/playback.cpp
View file

@ -133,6 +133,15 @@ bool DivEngine::perSystemEffect(int ch, unsigned char effect, unsigned char effe
return false; return false;
} }
break; break;
case DIV_SYSTEM_NES:
switch (effect) {
case 0x12: // duty or noise mode
dispatchCmd(DivCommand(DIV_CMD_STD_NOISE_MODE,ch,effectVal));
break;
default:
return false;
}
break;
default: default:
return false; return false;
} }