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

Merge branch 'master' into new_apu

This commit is contained in:
Lior Halphon 2017-08-12 21:43:09 +03:00
parent dba7370d6d 7df4e56454
commit d43daed6a6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Core/display.c
View File

@ -204,10 +204,12 @@ static void display_vblank(GB_gameboy_t *gb)
}
if (!gb->disable_rendering && ((!(gb->io_registers[GB_IO_LCDC] & 0x80) || gb->stopped) || gb->frame_skip_state == GB_FRAMESKIP_LCD_TURNED_ON)) {
/* LCD is off, set screen to white */
uint32_t white = gb->rgb_encode_callback(gb, 0xFF, 0xFF, 0xFF);
/* LCD is off, set screen to white or black (if LCD is on in stop mode) */
uint32_t color = (gb->io_registers[GB_IO_LCDC] & 0x80) && gb->stopped ?
gb->rgb_encode_callback(gb, 0, 0, 0) :
gb->rgb_encode_callback(gb, 0xFF, 0xFF, 0xFF);
for (unsigned i = 0; i < WIDTH * LINES; i++) {
gb ->screen[i] = white;
gb ->screen[i] = color;
}
}

2
Core/memory.c
View File

@ -556,7 +556,7 @@ static void write_high_memory(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
}
return;
case GB_IO_KEY1:
if (!gb->is_cgb) {
if (!gb->cgb_mode) {
return;
}
gb->io_registers[GB_IO_KEY1] = value;