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

Fixed NR51 volume levels (They’re 1-8, not 0-7)

Browse Source
This commit is contained in:
Lior Halphon 2018-01-06 11:58:07 +02:00
parent d62ff4eb75
commit a1af4c59ca
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/apu.c
View File

@ -27,11 +27,11 @@ static void update_sample(GB_gameboy_t *gb, unsigned index, uint8_t value, unsig
if (gb->apu_output.sample_rate) { if (gb->apu_output.sample_rate) {
unsigned left_volume = 0; unsigned left_volume = 0;
if (gb->io_registers[GB_IO_NR51] & (1 << index)) { if (gb->io_registers[GB_IO_NR51] & (1 << index)) {
left_volume = gb->io_registers[GB_IO_NR50] & 7; left_volume = (gb->io_registers[GB_IO_NR50] & 7) + 1;
} }
unsigned right_volume = 0; unsigned right_volume = 0;
if (gb->io_registers[GB_IO_NR51] & (0x10 << index)) { if (gb->io_registers[GB_IO_NR51] & (0x10 << index)) {
right_volume = (gb->io_registers[GB_IO_NR50] >> 4) & 7; right_volume = ((gb->io_registers[GB_IO_NR50] >> 4) & 7) + 1;
} }
GB_sample_t output = {(0xf - value) * left_volume, (0xf - value) * right_volume}; GB_sample_t output = {(0xf - value) * left_volume, (0xf - value) * right_volume};
if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) { if (*(uint32_t *)&(gb->apu_output.current_sample[index]) != *(uint32_t *)&output) {

6
Core/apu.h
View File

@ -6,9 +6,9 @@
#ifdef GB_INTERNAL #ifdef GB_INTERNAL
/* Divides nicely and never overflows with 4 channels and 8 volume levels */ /* Divides nicely and never overflows with 4 channels and 8 (1-8) volume levels */
#define MAX_CH_AMP 0x1FFE #define MAX_CH_AMP 0x1FE0
#define CH_STEP (MAX_CH_AMP/0xF/7) #define CH_STEP (MAX_CH_AMP/0xF/8)
#endif #endif
/* APU ticks are 2MHz, triggered by an internal APU clock. */ /* APU ticks are 2MHz, triggered by an internal APU clock. */