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

GBA: Reset WAITCNT properly

This commit is contained in:
Vicki Pfau 2018-09-01 14:44:43 -07:00
parent e2652ee5f4
commit 5a877db291
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -48,6 +48,7 @@ Bugfixes:
- GBA Video: Make layer disabling work consistently - GBA Video: Make layer disabling work consistently
- GB: Fix IRQ disabling on the same T-cycle as an assert - GB: Fix IRQ disabling on the same T-cycle as an assert
- Core: Fix ordering events when scheduling during events - Core: Fix ordering events when scheduling during events
- GBA: Reset WAITCNT properly
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)

1
src/gba/memory.c
View File

@ -121,6 +121,7 @@ void GBAMemoryReset(struct GBA* gba) {
} }
memset(gba->memory.io, 0, sizeof(gba->memory.io)); memset(gba->memory.io, 0, sizeof(gba->memory.io));
GBAAdjustWaitstates(gba, 0);
gba->memory.agbPrint = 0; gba->memory.agbPrint = 0;
memset(&gba->memory.agbPrintCtx, 0, sizeof(gba->memory.agbPrintCtx)); memset(&gba->memory.agbPrintCtx, 0, sizeof(gba->memory.agbPrintCtx));