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

Correct read of IF and write of IE

Browse Source
This commit is contained in:
Lior Halphon 2016-04-02 16:29:02 +03:00
parent 8ff433bb97
commit da00e240e5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Core/memory.c
View File

@ -94,8 +94,9 @@ static unsigned char read_high_memory(GB_gameboy_t *gb, unsigned short addr)
if (addr < 0xFF80) { if (addr < 0xFF80) {
switch (addr & 0xFF) { switch (addr & 0xFF) {
case GB_IO_JOYP:
case GB_IO_IF: case GB_IO_IF:
return gb->io_registers[GB_IO_IF] | 0xE0;
case GB_IO_JOYP:
case GB_IO_DIV: case GB_IO_DIV:
case GB_IO_TIMA: case GB_IO_TIMA:
case GB_IO_TMA: case GB_IO_TMA:
@ -473,7 +474,7 @@ static void write_high_memory(GB_gameboy_t *gb, unsigned short addr, unsigned ch
if (addr == 0xFFFF) { if (addr == 0xFFFF) {
/* Interrupt mask */ /* Interrupt mask */
gb->interrupt_enable = value; gb->interrupt_enable = value & 0x1F;
return; return;
} }