Fix MMM01 RAM size detection (Closes
@@ -185,6 +185,7 @@ void GB_configure_cart(GB_gameboy_t *gb)
gb->tpp1.rom_bank = 1;
}
+ if (gb->cartridge_type->mbc_type != GB_MMM01) {
if (gb->rom[0x147] == 0 && gb->rom_size > 0x8000) {
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];
@@ -192,6 +193,7 @@ void GB_configure_cart(GB_gameboy_t *gb)
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) {
free(gb->mbc_ram);
@@ -213,8 +215,13 @@ void GB_configure_cart(GB_gameboy_t *gb)
}
else {
static const unsigned ram_sizes[256] = {0, 0x800, 0x2000, 0x8000, 0x20000, 0x10000};
+ 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) {
gb->mbc_ram = malloc(gb->mbc_ram_size);
