From cba38c9ada6f14a0645b7780dd62e93dc88358ff Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Sat, 3 Nov 2018 15:15:02 -0700
Subject: [PATCH] GBA Hardware: Fix RTC handshake transition (fixes #1134)

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

diff --git a/CHANGES b/CHANGES
index 25f7f381e..58d4c5d58 100644
--- a/CHANGES
+++ b/CHANGES
@@ -63,6 +63,7 @@ Bugfixes:
  - GB, GBA Video: Don't call finishFrame twice in thread proxy
  - GB Audio: Fix channel 1, 2 and 4 reset timing
  - Util: Fix wrapping edge cases in RingFIFO
+ - GBA Hardware: Fix RTC handshake transition (fixes mgba.io/i/1134)
 Misc:
  - GBA Timer: Use global cycles for timers
  - GBA: Extend oddly-sized ROMs to full address space (fixes mgba.io/i/722)
diff --git a/src/gba/hardware.c b/src/gba/hardware.c
index 20d342012..70704a5d2 100644
--- a/src/gba/hardware.c
+++ b/src/gba/hardware.c
@@ -171,7 +171,7 @@ void _rtcReadPins(struct GBACartridgeHardware* hw) {
 	case 1:
 		if ((hw->pinState & 5) == 5) {
 			hw->rtc.transferStep = 2;
-		} else {
+		} else if ((hw->pinState & 5) != 1) {
 			hw->rtc.transferStep = 0;
 		}
 		break;