From d96a19420daf4848362321af53b166b51c2676a9 Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Tue, 4 Jan 2022 16:43:22 -0800
Subject: [PATCH] GBA I/O: Disable open bus behavior on invalid register 06A

---
 CHANGES      | 1 +
 src/gba/io.c | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGES b/CHANGES
index 6caf301f1..1f39c97b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ Emulation fixes:
  - GBA: Improve timing when not booting from BIOS
  - GBA BIOS: Work around IRQ handling hiccup in Mario & Luigi (fixes mgba.io/i/1059)
  - GBA I/O: Redo internal key input, enabling edge-based key IRQs
+ - GBA I/O: Disable open bus behavior on invalid register 06A
  - GBA Memory: Fix misaligned 32-bit I/O loads (fixes mgba.io/i/2307)
 Other fixes:
  - Core: Don't attempt to restore rewind diffs past start of rewind
diff --git a/src/gba/io.c b/src/gba/io.c
index 8c6bbb5ad..0cd3c4e25 100644
--- a/src/gba/io.c
+++ b/src/gba/io.c
@@ -922,6 +922,7 @@ uint16_t GBAIORead(struct GBA* gba, uint32_t address) {
 		// Handled transparently by registers
 		break;
 	case 0x066:
+	case 0x06A:
 	case 0x06E:
 	case 0x076:
 	case 0x07A: