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

Fix MMM01 RAM size detection (Closes #446)

Browse Source
This commit is contained in:
Lior Halphon 2022-06-12 21:28:58 +03:00
parent 4d90504688
commit 3fbeb61c09
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Core/mbc.c
View File

@ -185,14 +185,16 @@ void GB_configure_cart(GB_gameboy_t *gb)
gb->tpp1.rom_bank = 1; gb->tpp1.rom_bank = 1;
} }
if (gb->rom[0x147] == 0 && gb->rom_size > 0x8000) { if (gb->cartridge_type->mbc_type != GB_MMM01) {
GB_log(gb, "ROM header reports no MBC, but file size is over 32Kb. Assuming cartridge uses MBC3.\n"); if (gb->rom[0x147] == 0 && gb->rom_size > 0x8000) {
gb->cartridge_type = &GB_cart_defs[0x11]; GB_log(gb, "ROM header reports no MBC, but file size is over 32Kb. Assuming cartridge uses MBC3.\n");
gb->cartridge_type = &GB_cart_defs[0x11];
}
else if (gb->rom[0x147] != 0 && memcmp(gb->cartridge_type, &GB_cart_defs[0], sizeof(GB_cart_defs[0])) == 0) {
GB_log(gb, "Cartridge type %02x is not yet supported.\n", gb->rom[0x147]);
}
} }
else if (gb->rom[0x147] != 0 && memcmp(gb->cartridge_type, &GB_cart_defs[0], sizeof(GB_cart_defs[0])) == 0) {
GB_log(gb, "Cartridge type %02x is not yet supported.\n", gb->rom[0x147]);
}
if (gb->mbc_ram) { if (gb->mbc_ram) {
free(gb->mbc_ram); free(gb->mbc_ram);
gb->mbc_ram = NULL; gb->mbc_ram = NULL;
@ -213,7 +215,12 @@ void GB_configure_cart(GB_gameboy_t *gb)
} }
else { else {
static const unsigned ram_sizes[256] = {0, 0x800, 0x2000, 0x8000, 0x20000, 0x10000}; static const unsigned ram_sizes[256] = {0, 0x800, 0x2000, 0x8000, 0x20000, 0x10000};
gb->mbc_ram_size = ram_sizes[gb->rom[0x149]]; if (gb->cartridge_type->mbc_type == GB_MMM01) {
gb->mbc_ram_size = ram_sizes[gb->rom[gb->rom_size - 0x8000 + 0x149]];
}
else {
gb->mbc_ram_size = ram_sizes[gb->rom[0x149]];
}
} }
if (gb->mbc_ram_size) { if (gb->mbc_ram_size) {