mirror/bsnes
1
0
Fork 0
mirror of https://github.com/bsnes-emu/bsnes.git synced 2025-09-02 14:52:52 +02:00
Code Issues Projects Releases Wiki Activity

Adjustment to SCX's write conflict implementation

Browse Source
This commit is contained in:
Lior Halphon
2024-07-08 00:18:27 +03:00
parent c3e3fb91cc
commit 18206718e3
1 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Core/sm83_cpu.c
View File

@@ -22,10 +22,10 @@ typedef enum {
GB_CONFLICT_SGB_LCDC, GB_CONFLICT_SGB_LCDC,
GB_CONFLICT_WX, GB_CONFLICT_WX,
GB_CONFLICT_LCDC_CGB, GB_CONFLICT_LCDC_CGB,
GB_CONFLICT_SCX_CGB,
GB_CONFLICT_LCDC_CGB_DOUBLE, GB_CONFLICT_LCDC_CGB_DOUBLE,
GB_CONFLICT_STAT_CGB_DOUBLE, GB_CONFLICT_STAT_CGB_DOUBLE,
GB_CONFLICT_NR10_CGB_DOUBLE, GB_CONFLICT_NR10_CGB_DOUBLE,
GB_CONFLICT_SCX_CGB_DOUBLE,
} conflict_t; } conflict_t;
static const conflict_t cgb_conflict_map[0x80] = { static const conflict_t cgb_conflict_map[0x80] = {
@@ -36,7 +36,7 @@ static const conflict_t cgb_conflict_map[0x80] = {
[GB_IO_BGP] = GB_CONFLICT_PALETTE_CGB, [GB_IO_BGP] = GB_CONFLICT_PALETTE_CGB,
[GB_IO_OBP0] = GB_CONFLICT_PALETTE_CGB, [GB_IO_OBP0] = GB_CONFLICT_PALETTE_CGB,
[GB_IO_OBP1] = GB_CONFLICT_PALETTE_CGB, [GB_IO_OBP1] = GB_CONFLICT_PALETTE_CGB,
[GB_IO_SCX] = GB_CONFLICT_SCX_CGB, [GB_IO_SCX] = GB_CONFLICT_READ_OLD,
}; };
static const conflict_t cgb_double_conflict_map[0x80] = { static const conflict_t cgb_double_conflict_map[0x80] = {
@@ -45,7 +45,7 @@ static const conflict_t cgb_double_conflict_map[0x80] = {
[GB_IO_LYC] = GB_CONFLICT_READ_OLD, [GB_IO_LYC] = GB_CONFLICT_READ_OLD,
[GB_IO_STAT] = GB_CONFLICT_STAT_CGB_DOUBLE, [GB_IO_STAT] = GB_CONFLICT_STAT_CGB_DOUBLE,
[GB_IO_NR10] = GB_CONFLICT_NR10_CGB_DOUBLE, [GB_IO_NR10] = GB_CONFLICT_NR10_CGB_DOUBLE,
[GB_IO_SCX] = GB_CONFLICT_SCX_CGB, [GB_IO_SCX] = GB_CONFLICT_SCX_CGB_DOUBLE,
}; };
/* Todo: verify on an MGB */ /* Todo: verify on an MGB */
@@ -308,17 +308,10 @@ static void cycle_write(GB_gameboy_t *gb, uint16_t addr, uint8_t value)
break; break;
} }
case GB_CONFLICT_SCX_CGB: case GB_CONFLICT_SCX_CGB_DOUBLE:
if (gb->cgb_double_speed) { GB_advance_cycles(gb, gb->pending_cycles - 2);
GB_advance_cycles(gb, gb->pending_cycles - 2); GB_write_memory(gb, addr, value);
GB_write_memory(gb, addr, value); gb->pending_cycles = 6;
gb->pending_cycles = 6;
}
else {
GB_advance_cycles(gb, gb->pending_cycles);
GB_write_memory(gb, addr, value);
gb->pending_cycles = 4;
}
break; break;
case GB_CONFLICT_NR10_CGB_DOUBLE: { case GB_CONFLICT_NR10_CGB_DOUBLE: {