From 3fc9f6fb294e66ad9de1711de0088fb3cb9b7e82 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sat, 29 Aug 2020 21:36:33 +0200 Subject: [PATCH] small cleanup --- src/kernal/screen_m65/mega65_chrout_screen.s | 1 + src/kernal/screen_m65/mega65_cursor.s | 1 + src/kernal/screen_m65/mega65_screen_helpers_scrlpnt.s | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/kernal/screen_m65/mega65_chrout_screen.s b/src/kernal/screen_m65/mega65_chrout_screen.s index 9251532d..837ccf9c 100644 --- a/src/kernal/screen_m65/mega65_chrout_screen.s +++ b/src/kernal/screen_m65/mega65_chrout_screen.s @@ -40,6 +40,7 @@ m65_chrout_screen_literal: // entry point for m65_chrout_screen_quote // Prepare .Z and M65_LPNT_SCR for colour memory manipulation + ldz M65__TXTCOL jsr m65_helper_scrlpnt_color // Store the new color in screen memory diff --git a/src/kernal/screen_m65/mega65_cursor.s b/src/kernal/screen_m65/mega65_cursor.s index 54d0ec36..3df29bf2 100644 --- a/src/kernal/screen_m65/mega65_cursor.s +++ b/src/kernal/screen_m65/mega65_cursor.s @@ -39,6 +39,7 @@ m65_cursor_undraw: // Cursor undraw - color jsr m65_helper_scrlpnt_color + ldz M65__TXTCOL lda GDCOL sta_lp (M65_LPNT_SCR),z diff --git a/src/kernal/screen_m65/mega65_screen_helpers_scrlpnt.s b/src/kernal/screen_m65/mega65_screen_helpers_scrlpnt.s index f9b91ccf..31630d11 100644 --- a/src/kernal/screen_m65/mega65_screen_helpers_scrlpnt.s +++ b/src/kernal/screen_m65/mega65_screen_helpers_scrlpnt.s @@ -4,10 +4,6 @@ m65_helper_scrlpnt_color: - // Set .Z to the current column - - ldz M65__TXTCOL // XXX probably not the best place for this - // Setting M65_LPNT_SCR to point to colour memory (starts from $FF80000) lda #$0F