Merge pull request #2862 from dansanderson/master

c65 target: conio accesses all color RAM in 80x25 text mode
2026-04-19 09:28:25 +00:00 · 2026-01-09 23:45:05 +01:00
parent 1e1e8a686e 5296d394e4
commit 034f73a9e1
2 changed files with 21 additions and 1 deletions
@@ -18,8 +18,19 @@ _cpeekcolor:
        lda     SCREEN_PTR
        sta     ptr1

+        php
+        sei
+        lda     $D030
+        ora     #$01
+        sta     $D030
        ldy     #0
        lda     (ptr1),y
+        tay
+        lda     $D030
+        and     #$FE
+        sta     $D030
+        tya
+        plp

        ldx     #>$0000
        rts
@@ -113,10 +113,19 @@ putchar:

        lda     ptr4 + 1
        clc
-        adc     #>$d000
+        adc     #>$D000
        sta     ptr4 + 1

+        php
+        sei
+        lda     $D030
+        ora     #$01
+        sta     $D030
        lda     CHARCOLOR
        sta     (ptr4),y    ; Set color
+        lda     $D030
+        and     #$FE
+        sta     $D030
+        plp

        rts