From 43f3c37f99cee9e74a71d0972a3cfe3448a5590c Mon Sep 17 00:00:00 2001
From: Zane Kaminski <zanekaminski@gmail.com>
Date: Fri, 2 Apr 2021 21:07:16 -0400
Subject: [PATCH] Fix RAM disk always patched, even if cdrEN or dbgEN

---
 bin/driver7M5.bin | Bin 1909 -> 1921 bytes
 bin/rom8M.bin     | Bin 8388608 -> 8388608 bytes
 rdisk.c           |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/driver7M5.bin b/bin/driver7M5.bin
index 17e7e76afafdc657fc5396635301d862070f78af..a031110a43ff6c47fa3edb57591981a92c7ec5f8 100755
GIT binary patch
delta 182
zcmey$*T_F1(0G&2eP#x~Qjg~h2ND?=AAooXN)R3^3y8;)!NABMmBt5C!{)WIC7Y3P
z*5nV2iQIqG0%Wuq<kA=zPfd<t(q;TKxr<4g@!RBWOsVEBD%lJQUR~)73@f~v(-;`m
zh-owETs`2o)1g&v6VGaf3I+xSl^i*^szqKcKvl~oyD^(Ga!jsaR$%(~WAZ#^MMj0m
P2bkp<{Wd>fp2`dWvN$-%

delta 170
zcmZqV|H?NZ(0G~8eP#x~Qjg~h2ND?=AAooXN)R5)4-k(hgMpDjDvb}OhRtqcOEx28
z-{cRBiQFI50%Wuq<kA=z_f3vr(q()$xr<4g@zvyQOsU!yD%lJQUR~)740FV^8Fa25
z@Z0IoDz}MeHA4jh1A|JA1VVmt5VI+x$m9-Y1*ZQjlUFe-GU`k|!z|AjviS}3RAvBS
Ca5Uur

diff --git a/bin/rom8M.bin b/bin/rom8M.bin
index a90951d6f428ef2fd0a3939e2c6258586836624b..4843457467bfe12ca86f134d8a56b154848450b8 100755
GIT binary patch
delta 702
zcmX}iJ4{ny96<5^NBi-t#RsAy?Y$ST^-*4mh@uE62wt()CyD~CN<oWnQB>3>Tw~&H
zZo=qbNMs^}#tm2F>g1rCiwnjWVvO-LMu*>Ul9S0~{FxkAxp}V7_0Q?Ip@!L>Pd<r_
zb$^kCq^QriN>u$V?ax(UM3hvdg8!a;C;L65(@ITw2}37KensMyQ3<C+z4P81x<-BT
zei}Nees~d64>fhzX)&GW!y?npWJ+YFJSx>67GiJOo`z=wuVq|B?9uT5>!sszz4GQw
z-KYw^uckKhelK}JOIynH>Md=kST=6y7rtkUwnjb*P>3QFqXYpgLlC7{julvmRVc%1
zlw%FnVjU{59+e0o3<D-CRAB>bY(xZ`uo+vh6;V{92DPX|J+@&x8n6S6*oh|W!frHU
z5B8!3`_PIuv|~RGpaY#ah%R*F5F8vv4~`&)qln`ej^hMQ;uKD!7iVx5eK?2n=*IvC
zkw6j`a1oa<gcOD`g3GvqG)8e1*Ki#-a1*z18+R~<ySRsO+{Xhv!~`DUady#uQu^@^
D0VgFx

delta 700
zcmYMqJ4{ni0LJliXb(!MD2h-k?Y$S;`nUyDL;(@;$-AJUfPl6r1u4D(@r4~~NF3bE
zS)5(m3`t{12so2Cxwznj2@?Y`ghl_2F$}-qpYKa1lg?yDN~W?>j+Ap&E&3`ywk<nE
zWTNSpScnPvGgHx$f92fBlzT)-;f?40|76#v*L^A><vSfUR4jKb)LCo`e_Y6Uy=15|
zxuQ1>Wy@6^GS!e>9Y_eX<?XN#9|~;|{=N|T((uOr+5JgO2_XVwo~>PfHC2@?&>N;Q
zv;H`>*HV@Y>pDvrvMb$hsrL^3t-aQx%jbG`%(#LI+1Q5d$bk#Fa3k}{!%pl%K6Yad
z3a}T2D1rz3;KhCv!v{YMn6OZSQUnl02nTQwhj17+!YD&IDsTixaSW9>jw+nMNmQc-
zwK#=3oJKv)paExb4(D+J7jX%VXhJhu(26#+BZ3Ze;xew_D!OnD*U^n0^x_8k(2oJ!
z#4SV-!ys<s4u%lNFh+0}qex&3_i!H%@DPvi7*8;c2~6TCrtl2U@d7XL3e#y<@b&K>
Fe*sS5x1az3

diff --git a/rdisk.c b/rdisk.c
index d978e3b..72fc516 100644
--- a/rdisk.c
+++ b/rdisk.c
@@ -186,14 +186,14 @@ static void RDInit(IOParamPtr p, DCtlPtr d, RDiskStorage_t *c) {
 	peek24L((long*)0x40851D9C, c->cdrDisPos);
 	// Patch
 	if (c->dbgDisPos < RDiskSize) {
-		if (c->ramdisk) { poke24(c->ramdisk + c->dbgDisPos, c->dbgDisByte); }
+		if (c->ramdisk && !dbgEN) { poke24(c->ramdisk + c->dbgDisPos, c->dbgDisByte); }
 		else { peek24(dbgEN ? 
 			RDiskBuf + c->dbgDisPos : 
 			(char*)0x40851DA8, c->dbgDisByte);
 		}
 	}
 	if (c->dbgDisPos < RDiskSize) {
-		if (c->ramdisk) { poke24(c->ramdisk + c->cdrDisPos, c->cdrDisByte); }
+		if (c->ramdisk && !cdrEN) { poke24(c->ramdisk + c->cdrDisPos, c->cdrDisByte); }
 		else { peek24(cdrEN ? 
 			RDiskBuf + c->cdrDisPos : 
 			(char*)0x40851DA9, c->cdrDisByte);