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

GBA Serialize: Fix loading states in Hblank

This commit is contained in:
Vicki Pfau 2018-09-01 14:59:33 -07:00
parent 94ec760a9f
commit eb4ef6d8a7
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -11,6 +11,7 @@ Bugfixes:
- GB I/O: DMA register is R/W - GB I/O: DMA register is R/W
- GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1126) - GBA Video: Improve sprite cycle counting (fixes mgba.io/i/1126)
- GBA: Reset WAITCNT properly - GBA: Reset WAITCNT properly
- GBA Serialize: Fix loading states in Hblank
Misc: Misc:
- FFmpeg: Support libswresample (fixes mgba.io/i/1120, mgba.io/b/123) - FFmpeg: Support libswresample (fixes mgba.io/i/1120, mgba.io/b/123)

2
src/gba/video.c
View File

@ -321,7 +321,7 @@ void GBAVideoDeserialize(struct GBAVideo* video, const struct GBASerializedState
uint32_t when; uint32_t when;
LOAD_32(when, 0, &state->video.nextEvent); LOAD_32(when, 0, &state->video.nextEvent);
GBARegisterDISPSTAT dispstat = video->p->memory.io[REG_DISPSTAT >> 1]; GBARegisterDISPSTAT dispstat = state->io[REG_DISPSTAT >> 1];
if (GBARegisterDISPSTATIsInHblank(dispstat)) { if (GBARegisterDISPSTATIsInHblank(dispstat)) {
video->event.callback = _startHdraw; video->event.callback = _startHdraw;
} else { } else {