From 0b747ded64480d1d0835f94e721c1af9acaefbb0 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sun, 23 Aug 2020 21:50:50 +0200 Subject: [PATCH] compilation fixes --- src/basic/,imports.s | 2 +- src/kernal/screen/e56c.screen_calculate_pointers.s | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/basic/,imports.s b/src/basic/,imports.s index 1e9b0319..f8e402dd 100644 --- a/src/basic/,imports.s +++ b/src/basic/,imports.s @@ -36,7 +36,6 @@ .label hw_entry_reset = KERNAL().hw_entry_reset .label clear_screen = KERNAL().clear_screen -.label M65_SETWIN_Y = KERNAL().M65_SETWIN_Y #if CONFIG_DBG_PRINTF .label printf = KERNAL().printf @@ -61,4 +60,5 @@ .label M65_ISMODE65 = KERNAL().M65_ISMODE65 .label M65_SLOW = KERNAL().M65_SLOW .label M65_FAST = KERNAL().M65_FAST +.label M65_SETWIN_Y = KERNAL().M65_SETWIN_Y #endif diff --git a/src/kernal/screen/e56c.screen_calculate_pointers.s b/src/kernal/screen/e56c.screen_calculate_pointers.s index 87286443..ab0d632d 100644 --- a/src/kernal/screen/e56c.screen_calculate_pointers.s +++ b/src/kernal/screen/e56c.screen_calculate_pointers.s @@ -15,9 +15,12 @@ screen_calculate_pointers: +#if ROM_LAYOUT_M65 + jsr M65_ISMODE65 - bcs !+ - jmp m65_screen_upd_txtrow_off -!: + bcc_16 m65_screen_upd_txtrow_off + +#endif + jsr screen_calculate_PNT_USER jmp screen_calculate_PNTR_LNMX