dont trash akku if possible, use VDC register when in 80column mode

diff --git a/libsrc/c128/waitvblank.s b/libsrc/c128/waitvblank.s
index 54699286c831b3deef1411f5a1fb191a189c8784..e0a469d0e9c93eb965c5f206e35fe5435b6c556d 100644 (file)
--- a/libsrc/c128/waitvblank.s
+++ b/libsrc/c128/waitvblank.s
@@ -4,10 +4,22 @@
         .include        "c128.inc"
 
 _waitvblank:
+
+        lda     MODE
+        bmi     @c80
+
 @l1:
-        lda     VIC_CTRL1
+        bit     VIC_CTRL1
         bpl     @l1
 @l2:
-        lda     VIC_CTRL1
+        bit     VIC_CTRL1
         bmi     @l2
         rts
+
+@c80:
+        ;FIXME: do we have to switch banks?
+@l3:
+        lda     VDC_INDEX
+        and     #$20
+        beq     @l3
+        rts

diff --git a/libsrc/c64/waitvblank.s b/libsrc/c64/waitvblank.s
index 606f4168104f978516abcbe1a294ea24b2db0373..dd90878410682ad373bd6b55d9822042b88a4166 100644 (file)
--- a/libsrc/c64/waitvblank.s
+++ b/libsrc/c64/waitvblank.s
@@ -5,9 +5,9 @@
 
 _waitvblank:
 @l1:
-        lda     VIC_CTRL1
+        bit     VIC_CTRL1
         bpl     @l1
 @l2:
-        lda     VIC_CTRL1
+        bit     VIC_CTRL1
         bmi     @l2
         rts