From 15ef8704e3f6c0bd972923c062dddd7b073d69fe Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sat, 26 Dec 2020 22:15:11 +0100 Subject: [PATCH] palette handling improvements --- src/kernal/board_m65/4000.mega65_vectable_kernal_1.s | 4 +++- src/kernal/board_m65/mega65_colorset.s | 4 ++++ src/kernal/board_m65/mega65_modeset.s | 1 - src/kernal/board_m65/mega65_reset_part.s | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/kernal/board_m65/4000.mega65_vectable_kernal_1.s b/src/kernal/board_m65/4000.mega65_vectable_kernal_1.s index ec3a1fb8..1034196f 100644 --- a/src/kernal/board_m65/4000.mega65_vectable_kernal_1.s +++ b/src/kernal/board_m65/4000.mega65_vectable_kernal_1.s @@ -27,7 +27,8 @@ !addr VK1__M65_CLRWIN = $4000 + 2 * 13 !addr VK1__m65_screen_upd_txtrow_off = $4000 + 2 * 14 !addr VK1__m65_shadow_BZP = $4000 + 2 * 15 - !addr VK1__m65_colorset = $4000 + 2 * 16 + !addr VK1__m65_colorset_reset = $4000 + 2 * 16 + !addr VK1__m65_colorset = $4000 + 2 * 17 } else { @@ -63,5 +64,6 @@ !word M65_CLRWIN !word m65_screen_upd_txtrow_off !word m65_shadow_BZP + !word m65_colorset_reset !word m65_colorset } diff --git a/src/kernal/board_m65/mega65_colorset.s b/src/kernal/board_m65/mega65_colorset.s index 640096ca..2723f8f6 100644 --- a/src/kernal/board_m65/mega65_colorset.s +++ b/src/kernal/board_m65/mega65_colorset.s @@ -16,6 +16,10 @@ m65_colorset: m65_colorset_reset: + ; Make sure VIC-IV is unlocked + + jsr viciv_unhide + ; Enable RAM palette lda VIC_CTRLA diff --git a/src/kernal/board_m65/mega65_modeset.s b/src/kernal/board_m65/mega65_modeset.s index f7d5a637..c02eb04a 100644 --- a/src/kernal/board_m65/mega65_modeset.s +++ b/src/kernal/board_m65/mega65_modeset.s @@ -67,7 +67,6 @@ m65_mode65: jsr vicii_init jsr viciv_init - jsr m65_colorset_reset ; Initialize various memory structures diff --git a/src/kernal/board_m65/mega65_reset_part.s b/src/kernal/board_m65/mega65_reset_part.s index a687df09..abc943a2 100644 --- a/src/kernal/board_m65/mega65_reset_part.s +++ b/src/kernal/board_m65/mega65_reset_part.s @@ -6,7 +6,10 @@ m65_reset_part: + jsr map_KERNAL_1 + jsr (VK1__m65_colorset_reset) jsr map_NORMAL ; we want normal memory mapping + jsr viciv_shutdown ; by default we do not want the VIC-IV jsr M65_MODEGET