ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB MBC: Fix MBC2 saves (fixes #954)

This commit is contained in:
Vicki Pfau 2018-01-08 18:24:29 -08:00
parent caea7e0700
commit 3723ebea20
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -36,6 +36,7 @@ Bugfixes:
- LR35902: Fix watchpoints not reporting new value - LR35902: Fix watchpoints not reporting new value
- GBA Audio: Increase PSG volume (fixes mgba.io/i/932) - GBA Audio: Increase PSG volume (fixes mgba.io/i/932)
- 3DS: Fix opening files in directory names with trailing slashes - 3DS: Fix opening files in directory names with trailing slashes
- GB MBC: Fix MBC2 saves (fixes mgba.io/i/954)
Misc: Misc:
- GBA Timer: Use global cycles for timers - GBA Timer: Use global cycles for timers
- GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722) - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)

19
src/gb/mbc.c
View File

@ -31,6 +31,7 @@ static void _GBHuC3(struct GB*, uint16_t address, uint8_t value);
static void _GBPocketCam(struct GB* gb, uint16_t address, uint8_t value); static void _GBPocketCam(struct GB* gb, uint16_t address, uint8_t value);
static void _GBTAMA5(struct GB* gb, uint16_t address, uint8_t value); static void _GBTAMA5(struct GB* gb, uint16_t address, uint8_t value);
static uint8_t _GBMBC2Read(struct GBMemory*, uint16_t address);
static uint8_t _GBMBC7Read(struct GBMemory*, uint16_t address); static uint8_t _GBMBC7Read(struct GBMemory*, uint16_t address);
static void _GBMBC7Write(struct GBMemory* memory, uint16_t address, uint8_t value); static void _GBMBC7Write(struct GBMemory* memory, uint16_t address, uint8_t value);
@ -214,7 +215,8 @@ void GBMBCInit(struct GB* gb) {
break; break;
case GB_MBC2: case GB_MBC2:
gb->memory.mbcWrite = _GBMBC2; gb->memory.mbcWrite = _GBMBC2;
gb->sramSize = 0x200; gb->memory.mbcRead = _GBMBC2Read;
gb->sramSize = 0x100;
break; break;
case GB_MBC3: case GB_MBC3:
gb->memory.mbcWrite = _GBMBC3; gb->memory.mbcWrite = _GBMBC3;
@ -396,6 +398,7 @@ void _GBMBC1(struct GB* gb, uint16_t address, uint8_t value) {
void _GBMBC2(struct GB* gb, uint16_t address, uint8_t value) { void _GBMBC2(struct GB* gb, uint16_t address, uint8_t value) {
struct GBMemory* memory = &gb->memory; struct GBMemory* memory = &gb->memory;
int shift = (address & 1) * 4;
int bank = value & 0xF; int bank = value & 0xF;
switch (address >> 13) { switch (address >> 13) {
case 0x0: case 0x0:
@ -405,7 +408,6 @@ void _GBMBC2(struct GB* gb, uint16_t address, uint8_t value) {
break; break;
case 0xA: case 0xA:
memory->sramAccess = true; memory->sramAccess = true;
GBMBCSwitchSramBank(gb, memory->sramCurrentBank);
break; break;
default: default:
// TODO // TODO
@ -419,6 +421,13 @@ void _GBMBC2(struct GB* gb, uint16_t address, uint8_t value) {
} }
GBMBCSwitchBank(gb, bank); GBMBCSwitchBank(gb, bank);
break; break;
case 0x5:
if (!memory->sramAccess) {
return;
}
address &= 0x1FF;
memory->sramBank[(address >> 1)] &= 0xF0 >> shift;
memory->sramBank[(address >> 1)] |= (value & 0xF) << shift;
default: default:
// TODO // TODO
mLOG(GB_MBC, STUB, "MBC2 unknown address: %04X:%02X", address, value); mLOG(GB_MBC, STUB, "MBC2 unknown address: %04X:%02X", address, value);
@ -426,6 +435,12 @@ void _GBMBC2(struct GB* gb, uint16_t address, uint8_t value) {
} }
} }
static uint8_t _GBMBC2Read(struct GBMemory* memory, uint16_t address) {
address &= 0x1FF;
int shift = (address & 1) * 4;
return (memory->sramBank[(address >> 1)] >> shift) | 0xF0;
}
void _GBMBC3(struct GB* gb, uint16_t address, uint8_t value) { void _GBMBC3(struct GB* gb, uint16_t address, uint8_t value) {
struct GBMemory* memory = &gb->memory; struct GBMemory* memory = &gb->memory;
int bank = value & 0x7F; int bank = value & 0x7F;

2
src/gb/memory.c
View File

@ -294,7 +294,7 @@ void GBStore8(struct LR35902Core* cpu, uint16_t address, int8_t value) {
case GB_REGION_EXTERNAL_RAM + 1: case GB_REGION_EXTERNAL_RAM + 1:
if (memory->rtcAccess) { if (memory->rtcAccess) {
memory->rtcRegs[memory->activeRtcReg] = value; memory->rtcRegs[memory->activeRtcReg] = value;
} else if (memory->sramAccess && memory->sram) { } else if (memory->sramAccess && memory->sram && memory->mbcType != GB_MBC2) {
memory->sramBank[address & (GB_SIZE_EXTERNAL_RAM - 1)] = value; memory->sramBank[address & (GB_SIZE_EXTERNAL_RAM - 1)] = value;
} else { } else {
memory->mbcWrite(gb, address, value); memory->mbcWrite(gb, address, value);