all repos — mgba @ 327f1dfe47c1a756e455839e296410e0e9f1550d

mGBA Game Boy Advance Emulator

GBA Serialize: Fix loading states in Hblank
Vicki Pfau vi@endrift.com
Sat, 01 Sep 2018 14:59:33 -0700
commit

327f1dfe47c1a756e455839e296410e0e9f1550d

parent

5a877db291236cd803d37fbdb489a4c0462f480e

2 files changed, 2 insertions(+), 1 deletions(-)

jump to
M CHANGESCHANGES

@@ -49,6 +49,7 @@ - GBA Video: Make layer disabling work consistently

- GB: Fix IRQ disabling on the same T-cycle as an assert - Core: Fix ordering events when scheduling during events - GBA: Reset WAITCNT properly + - GBA Serialize: Fix loading states in Hblank Misc: - GBA Timer: Use global cycles for timers - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
M src/gba/video.csrc/gba/video.c

@@ -323,7 +323,7 @@ LOAD_32(video->frameCounter, 0, &state->video.frameCounter);

uint32_t when; 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)) { video->event.callback = _startHdraw; } else {