From deb6c369c4535e0ba17f74ad08fa37e9eaf9e0dc Mon Sep 17 00:00:00 2001
From: TiKevin83 <travismcgeehan@gmail.com>
Date: Sun, 24 May 2020 16:15:55 -0400
Subject: [PATCH] Cleanup VRAM access glitch

---
 libgambatte/src/memory.cpp |   5 +++--
 output/dll/libgambatte.dll | Bin 186368 -> 186368 bytes
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libgambatte/src/memory.cpp b/libgambatte/src/memory.cpp
index f76da1511d..9873a0080d 100644
--- a/libgambatte/src/memory.cpp
+++ b/libgambatte/src/memory.cpp
@@ -655,10 +655,11 @@ unsigned Memory::nontrivial_read(unsigned const p, unsigned long const cc) {
 				if (!lcd_.vramReadable(cc))
 					return 0xFF;
 
-				if (lcd_.vramExactlyReadable(cc))
-					if (p < 0x9000) {
+				if (p < 0x9000) {
+					if (lcd_.vramExactlyReadable(cc)) {
 						return 0x00;
 					}
+				}
 
 				return cart_.vrambankptr()[p];
 			}
diff --git a/output/dll/libgambatte.dll b/output/dll/libgambatte.dll
index f2ee239b6d3f81fdbb2c60c063940f57fd8a952b..6d541404ebbd23f8f52f37b984c768841bd712c1 100644
GIT binary patch
delta 282
zcmZqJz}>Kcdjkg}v(3{Jo4FYy4>4v<PCa}`Wh*lSgJbg#CjQpdK-RGqsU3_A3=A*l
z0XdET7!EKn@HdA~_C6xdTLckV01{!JTz=${VIC7$%><AL2T)hT{$5U?5P$1$pb0MB
z?Hxd#qxFj-*Y2wx-REC?`8B!lxWeRlM`M`EU`+nW+Q*D0ryi?hTs8UrF-yjT$&$yz
z7&#{w9Pep5vF!w-&wh}5r~9`vNrD;KK!z$%Bo1f;11}J70a{qIjESLU29N;+Fgd=7
uisIW3v@<0L2x=Jxyp_qG;ITG&d(rf-Z+9?mH=My#uEY3s`^qCs;lco0-DTkb

delta 285
zcmZqJz}>Kcdjkg}v&OaKo4FYy4>6`qPCa}`Wg{~KgJbg#CjQptK-RGqsU3_A3=A)4
z0XdET7!EKn@HYof_C6xdn+FkD01{!ITz=${N){6XL&N@FP9VkK$_&)z(%s$x<T+Zu
zD01z->d}4v1;b?Sql%MP9gSgX`Zby7r~;75KiT}45eGle@CghI#gj9SRWh!d{P>t9
zW6EUN<6%s^KY{AhC(k*a(){Q6_CLoN1NMWQJl(&YNfOM+1~OEEB5^=xGVlWN7NGq#
z%a|ByW&jyL0F&dJs3^YuKs!@{fZ*k2#!It%eSPM=pS^0;m8SPh+YM(hmFqBm+`jS%
HQ@AhyAC+fE