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

Update to upstream/master

Browse Source
This commit is contained in:
radius 2017-12-09 21:07:11 -05:00
commit be3385a8c1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/display.c
View File

@ -289,10 +289,12 @@ void GB_palette_changed(GB_gameboy_t *gb, bool background_palette, uint8_t index
void GB_set_color_correction_mode(GB_gameboy_t *gb, GB_color_correction_mode_t mode) void GB_set_color_correction_mode(GB_gameboy_t *gb, GB_color_correction_mode_t mode)
{ {
gb->color_correction_mode = mode; gb->color_correction_mode = mode;
if (gb->is_cgb) {
for (unsigned i = 0; i < 32; i++) { for (unsigned i = 0; i < 32; i++) {
GB_palette_changed(gb, false, i * 2); GB_palette_changed(gb, false, i * 2);
GB_palette_changed(gb, true, i * 2); GB_palette_changed(gb, true, i * 2);
} }
}
} }
/* /*

5
Core/z80_cpu.c
View File

@ -1064,7 +1064,7 @@ static void ld_a_da16(GB_gameboy_t *gb, uint8_t opcode)
static void di(GB_gameboy_t *gb, uint8_t opcode) static void di(GB_gameboy_t *gb, uint8_t opcode)
{ {
/* DI is NOT delayed, not even on a CGB. Mooneye's di_timing-GS test fails on a CGB /* DI is NOT delayed, not even on a CGB. Mooneye's di_timing-GS test fails on a CGB
for different reasons.*/ for different reasons. */
GB_advance_cycles(gb, 4); GB_advance_cycles(gb, 4);
gb->ime = false; gb->ime = false;
} }
@ -1073,8 +1073,9 @@ static void ei(GB_gameboy_t *gb, uint8_t opcode)
{ {
/* ei is actually "disable interrupts for one instruction, then enable them". */ /* ei is actually "disable interrupts for one instruction, then enable them". */
GB_advance_cycles(gb, 4); GB_advance_cycles(gb, 4);
gb->ime = false; if (!gb->ime && !gb->ime_toggle) {
gb->ime_toggle = true; gb->ime_toggle = true;
}
} }
static void ld_hl_sp_r8(GB_gameboy_t *gb, uint8_t opcode) static void ld_hl_sp_r8(GB_gameboy_t *gb, uint8_t opcode)