From cf55fcbb52f91059f59b59d5e8419fffdee679a2 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Thu, 20 Nov 2014 22:55:29 -0800
Subject: [PATCH] GBA: Improve reset behavior

---
 src/gba/gba.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gba/gba.c b/src/gba/gba.c
index 3bee11ddf..f8abc057d 100644
--- a/src/gba/gba.c
+++ b/src/gba/gba.c
@@ -201,6 +201,12 @@ void GBAReset(struct ARMCore* cpu) {
 	GBAVideoReset(&gba->video);
 	GBAAudioReset(&gba->audio);
 	GBAIOInit(gba);
+
+	GBASIODeinit(&gba->sio);
+	GBASIOInit(&gba->sio);
+
+	gba->timersEnabled = 0;
+	memset(gba->timers, 0, sizeof(gba->timers));
 }
 
 static void GBAProcessEvents(struct ARMCore* cpu) {