From 9c18b9b41e5c6a57de6a5703e4318f9c2ea03467 Mon Sep 17 00:00:00 2001 From: ketmar Date: Thu, 23 Jul 2020 04:57:35 +0000 Subject: [PATCH] dsforth: cosmetic file renamings FossilOrigin-Name: 98e0ae796ff0bdb68594b1402783cd239f5662f437b759e761cf38e5f822b527 --- dsforth/main_emit6.zas | 19 ++++++++++--------- dsforth/{font6x8.fnt => main_font6x8.fnt} | Bin 2 files changed, 10 insertions(+), 9 deletions(-) rename dsforth/{font6x8.fnt => main_font6x8.fnt} (100%) diff --git a/dsforth/main_emit6.zas b/dsforth/main_emit6.zas index 6b41a17..b42c39b 100644 --- a/dsforth/main_emit6.zas +++ b/dsforth/main_emit6.zas @@ -8,15 +8,16 @@ ;; Ketmar ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -font6x8: - incbin "font6x8.fnt" +font6x8_data: + incbin "main_font6x8.fnt" -$FORTH_CONST (E6FONT) font6x8 -$FORTH_CONST (E6CURXY) emit6y -$FORTH_CONST (E6CURX) emit6x -$FORTH_CONST (E6CURY) emit6y -$FORTH_CONST (E6WASSCROLL) emit6wasscrl -$FORTH_CONST CONWIDTH 42 +$FORTH_CONST (E6FONTADDR) font6x8_addr +font6x8_addr: defw font6x8_data +$FORTH_CONST (E6CURXY) emit6y +$FORTH_CONST (E6CURX) emit6x +$FORTH_CONST (E6CURY) emit6y +$FORTH_CONST (E6WASSCROLL) emit6wasscrl +$FORTH_CONST CONWIDTH 42 emit6wasscrl: defb 0 ;; current pos x & y @@ -66,7 +67,7 @@ DrawChar6: add hl,hl add hl,hl add hl,hl - ld bc,font6x8 + ld bc,(font6x8_addr) add hl,bc push hl pop ix diff --git a/dsforth/font6x8.fnt b/dsforth/main_font6x8.fnt similarity index 100% rename from dsforth/font6x8.fnt rename to dsforth/main_font6x8.fnt -- 2.11.4.GIT