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

GB, GBA Savedata: Fix savestate loading overwriting saves on reset

This commit is contained in:
Vicki Pfau 2018-07-25 21:27:51 -07:00
parent f888d9b408
commit d25d4d30ff
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -43,6 +43,7 @@ Bugfixes:
- GB I/O: DMA register is R/W - GB I/O: DMA register is R/W
- GB Video: Fix SCX timing - GB Video: Fix SCX timing
- GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1126) - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1126)
- GB, GBA Savedata: Fix savestate loading overwriting saves on reset
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)

2
src/gb/gb.c
View File

@ -295,7 +295,6 @@ void GBUnloadROM(struct GB* gb) {
gb->isPristine = false; gb->isPristine = false;
gb->sramMaskWriteback = false; gb->sramMaskWriteback = false;
GBSavedataUnmask(gb);
GBSramDeinit(gb); GBSramDeinit(gb);
if (gb->sramRealVf) { if (gb->sramRealVf) {
gb->sramRealVf->close(gb->sramRealVf); gb->sramRealVf->close(gb->sramRealVf);
@ -468,6 +467,7 @@ void GBReset(struct LR35902Core* cpu) {
cpu->memory.setActiveRegion(cpu, cpu->pc); cpu->memory.setActiveRegion(cpu, cpu->pc);
gb->sramMaskWriteback = false;
GBSavedataUnmask(gb); GBSavedataUnmask(gb);
} }

1
src/gba/gba.c
View File

@ -185,6 +185,7 @@ void GBAReset(struct ARMCore* cpu) {
struct GBA* gba = (struct GBA*) cpu->master; struct GBA* gba = (struct GBA*) cpu->master;
if (!gba->rr || (!gba->rr->isPlaying(gba->rr) && !gba->rr->isRecording(gba->rr))) { if (!gba->rr || (!gba->rr->isPlaying(gba->rr) && !gba->rr->isRecording(gba->rr))) {
gba->memory.savedata.maskWriteback = false;
GBASavedataUnmask(&gba->memory.savedata); GBASavedataUnmask(&gba->memory.savedata);
} }