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

Fix more RTC regressions

Browse Source
This commit is contained in:
Lior Halphon 2020-08-05 01:39:19 +03:00
parent 289853445f
commit d3664d5da0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Core/mbc.c
View File

@ -88,7 +88,6 @@ void GB_update_mbc_mappings(GB_gameboy_t *gb)
gb->mbc_ram_bank = gb->mbc3.ram_bank; gb->mbc_ram_bank = gb->mbc3.ram_bank;
if (!gb->is_mbc30) { if (!gb->is_mbc30) {
gb->mbc_rom_bank &= 0x7F; gb->mbc_rom_bank &= 0x7F;
gb->mbc_ram_bank &= 0x3;
} }
if (gb->mbc_rom_bank == 0) { if (gb->mbc_rom_bank == 0) {
gb->mbc_rom_bank = 1; gb->mbc_rom_bank = 1;

10
Core/memory.c
View File

@ -183,7 +183,7 @@ static uint8_t read_mbc_ram(GB_gameboy_t *gb, uint16_t addr)
} }
} }
if ((!gb->mbc_ram_enable || !gb->mbc_ram_size) && if ((!gb->mbc_ram_enable) &&
gb->cartridge_type->mbc_subtype != GB_CAMERA && gb->cartridge_type->mbc_subtype != GB_CAMERA &&
gb->cartridge_type->mbc_type != GB_HUC1 && gb->cartridge_type->mbc_type != GB_HUC1 &&
gb->cartridge_type->mbc_type != GB_HUC3) { gb->cartridge_type->mbc_type != GB_HUC3) {
@ -205,7 +205,7 @@ static uint8_t read_mbc_ram(GB_gameboy_t *gb, uint16_t addr)
return GB_camera_read_register(gb, addr); return GB_camera_read_register(gb, addr);
} }
if (!gb->mbc_ram) { if (!gb->mbc_ram || gb->mbc_ram_size) {
return 0xFF; return 0xFF;
} }
@ -213,7 +213,11 @@ static uint8_t read_mbc_ram(GB_gameboy_t *gb, uint16_t addr)
return GB_camera_read_image(gb, addr - 0xa100); return GB_camera_read_image(gb, addr - 0xa100);
} }
uint8_t ret = gb->mbc_ram[((addr & 0x1FFF) + gb->mbc_ram_bank * 0x2000) & (gb->mbc_ram_size - 1)]; uint8_t effective_bank = gb->mbc_ram_bank;
if (gb->is_mbc30) {
effective_bank &= 0x3;
}
uint8_t ret = gb->mbc_ram[((addr & 0x1FFF) + effective_bank * 0x2000) & (gb->mbc_ram_size - 1)];
if (gb->cartridge_type->mbc_type == GB_MBC2) { if (gb->cartridge_type->mbc_type == GB_MBC2) {
ret |= 0xF0; ret |= 0xF0;
} }