From 7b8c56107aeb97d16653bc6c2cfa49161b941473 Mon Sep 17 00:00:00 2001 From: Mike Naberezny Date: Sun, 16 Aug 2009 21:44:10 -0700 Subject: [PATCH] Fixed bad merge with Ed's ADC overflow patch. --- src/py65/devices/mpu6502.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/py65/devices/mpu6502.py b/src/py65/devices/mpu6502.py index 035a918..0ec94f0 100644 --- a/src/py65/devices/mpu6502.py +++ b/src/py65/devices/mpu6502.py @@ -308,7 +308,7 @@ class MPU: self.flags |= self.OVERFLOW data = result if data > 255: - self.flags|=self.OVERFLOW+self.CARRY + self.flags |= self.CARRY data &=255 if data == 0: self.flags |= self.ZERO