Max/SameBoy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct preservation of NRx1's state on pre-CGB models

Browse Source
This commit is contained in:
Lior Halphon 2020-12-01 14:18:19 +02:00
parent 74cf452a48
commit 13bc8679f9
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Core/apu.c
View File

@ -633,11 +633,11 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
break; break;
case GB_IO_NR52: { case GB_IO_NR52: {
uint8_t old_nrx1[] = { uint8_t old_pulse_lengths[] = {
gb->io_registers[GB_IO_NR11], gb->apu.square_channels[0].pulse_length,
gb->io_registers[GB_IO_NR21], gb->apu.square_channels[1].pulse_length,
gb->io_registers[GB_IO_NR31], gb->apu.wave_channel.pulse_length,
gb->io_registers[GB_IO_NR41] gb->apu.noise_channel.pulse_length
}; };
if ((value & 0x80) && !gb->apu.global_enable) { if ((value & 0x80) && !gb->apu.global_enable) {
GB_apu_init(gb); GB_apu_init(gb);
@ -649,17 +649,14 @@ void GB_apu_write(GB_gameboy_t *gb, uint8_t reg, uint8_t value)
} }
memset(&gb->apu, 0, sizeof(gb->apu)); memset(&gb->apu, 0, sizeof(gb->apu));
memset(gb->io_registers + GB_IO_NR10, 0, GB_IO_WAV_START - GB_IO_NR10); memset(gb->io_registers + GB_IO_NR10, 0, GB_IO_WAV_START - GB_IO_NR10);
old_nrx1[0] &= 0x3F;
old_nrx1[1] &= 0x3F;
gb->apu.global_enable = false; gb->apu.global_enable = false;
} }
if (!GB_is_cgb(gb) && (value & 0x80)) { if (!GB_is_cgb(gb) && (value & 0x80)) {
GB_apu_write(gb, GB_IO_NR11, old_nrx1[0]); gb->apu.square_channels[0].pulse_length = old_pulse_lengths[0];
GB_apu_write(gb, GB_IO_NR21, old_nrx1[1]); gb->apu.square_channels[1].pulse_length = old_pulse_lengths[1];
GB_apu_write(gb, GB_IO_NR31, old_nrx1[2]); gb->apu.wave_channel.pulse_length = old_pulse_lengths[2];
GB_apu_write(gb, GB_IO_NR41, old_nrx1[3]); gb->apu.noise_channel.pulse_length = old_pulse_lengths[3];
} }
} }
break; break;