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

CGB halt interrupt timing

Browse Source
This commit is contained in:
Lior Halphon 2018-03-17 23:21:14 +02:00
parent 12ae5745db
commit 0dc30f081a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Core/z80_cpu.c
View File

@ -1367,14 +1367,14 @@ void GB_cpu_run(GB_gameboy_t *gb)
return; return;
} }
if (gb->halted) { if (gb->halted && !gb->is_cgb) {
GB_advance_cycles(gb, 2); GB_advance_cycles(gb, 2);
} }
uint8_t interrupt_queue = gb->interrupt_enable & gb->io_registers[GB_IO_IF] & 0x1F; uint8_t interrupt_queue = gb->interrupt_enable & gb->io_registers[GB_IO_IF] & 0x1F;
if (gb->halted) { if (gb->halted) {
GB_advance_cycles(gb, 2); GB_advance_cycles(gb, gb->is_cgb? 4 : 2);
} }
bool effecitve_ime = gb->ime; bool effecitve_ime = gb->ime;