From a33304f567bccaf13c78b75dc93b51becc285d36 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 25 Jul 2017 18:34:39 -0700
Subject: [PATCH] GB Memory: Initialize peripheral pointers

---
 CHANGES         | 1 +
 src/gb/memory.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 30d59fedf..5b2c39914 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,7 @@ Bugfixes:
  - GBA: Reset active region as needed when loading a ROM
  - Qt: Fix command line debugger closing second game
  - GB MBC: Pocket Cam memory should be accessible without enabling
+ - GB Memory: Initialize peripheral pointers
 Misc:
  - Qt: Don't rebuild library view if style hasn't changed
 
diff --git a/src/gb/memory.c b/src/gb/memory.c
index f37f6ef73..608f97e34 100644
--- a/src/gb/memory.c
+++ b/src/gb/memory.c
@@ -103,6 +103,8 @@ void GBMemoryInit(struct GB* gb) {
 	gb->memory.mbcWrite = NULL;
 
 	gb->memory.rtc = NULL;
+	gb->memory.rotation = NULL;
+	gb->memory.rumble = NULL;
 
 	GBIOInit(gb);
 }