From b6c0b27b284a90045ea7e0b8e65abd77cde906a2 Mon Sep 17 00:00:00 2001
From: Joshua Bell <inexorabletash@gmail.com>
Date: Thu, 22 Mar 2018 09:13:26 -0700
Subject: [PATCH] one more byte into font def

---
 desktop/desktop.s    |  2 +-
 desktop/inc/font.inc | 39 +++++++++++++++++++++++++++------------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/desktop/desktop.s b/desktop/desktop.s
index d4d2a20..972aa56 100644
--- a/desktop/desktop.s
+++ b/desktop/desktop.s
@@ -40,7 +40,7 @@ INVOKER_FILENAME := $280         ; File to invoke (PREFIX must be set)
 
 ;;; ============================================================
 
-        .assert * = $8D02, error, "Segment length mismatch"
+        .assert * = $8D03, error, "Segment length mismatch"
         PAD_TO $8E00
 
 ;;; ============================================================
diff --git a/desktop/inc/font.inc b/desktop/inc/font.inc
index 329807f..c0740be 100644
--- a/desktop/inc/font.inc
+++ b/desktop/inc/font.inc
@@ -1,15 +1,18 @@
 ;;; ============================================================
 ;;; Font
 
-font_definition:
+.proc font_definition
+        count  := 128
+        height := 9
+
         .assert * = font_flag, error, "Entry point mismatch"
         .byte   $00             ; type: 0=regular, $80=double-width
 
         .assert * = font_last_char, error, "Entry point mismatch"
-        .byte   $7F             ; lastchar
+        .byte   count - 1       ; lastchar
 
         .assert * = font_height, error, "Entry point mismatch"
-        .byte   9               ; height
+        .byte   height          ; height
 
         .assert * = font_width_table, error, "Entry point mismatch"
         .byte   $01,$07,$07,$07,$07,$07,$01,$07
@@ -42,6 +45,7 @@ font_definition:
         ;; glyph0-row1b, glyph1-row1b, ...
         ;; ...
 
+        ;; row 0
         .byte   $00,$00,$00,$3F,$77,$01,$01,$00
         .byte   $00,$7F,$00,$00,$7F,$20,$3E,$3E
         .byte   $00,$00,$3C,$00,$00,$00,$00,$00
@@ -59,6 +63,7 @@ font_definition:
         .byte   $00,$00,$00,$00,$06,$00,$00,$00
         .byte   $00,$00,$00,$04,$01,$01,$05,$00
 
+        ;; row 1
         .byte   $00,$7F,$00,$21,$1C,$03,$01,$00
         .byte   $00,$01,$08,$08,$40,$20,$41,$41
         .byte   $00,$00,$42,$00,$00,$00,$08,$00
@@ -76,6 +81,7 @@ font_definition:
         .byte   $00,$00,$00,$00,$06,$00,$00,$00
         .byte   $00,$00,$00,$02,$01,$02,$0A,$00
 
+        ;; row 2
         .byte   $00,$41,$00,$12,$08,$07,$01,$00
         .byte   $0C,$01,$08,$1C,$40,$20,$5D,$5D
         .byte   $77,$03,$04,$1F,$0C,$18,$1C,$0C
@@ -93,6 +99,7 @@ font_definition:
         .byte   $0F,$1E,$0F,$1E,$1F,$1B,$1B,$23
         .byte   $1B,$1B,$1F,$02,$01,$02,$00,$00
 
+        ;; row 3
         .byte   $00,$41,$3F,$0C,$08,$0F,$01,$00
         .byte   $06,$01,$08,$3E,$40,$24,$45,$55
         .byte   $52,$02,$08,$0A,$00,$30,$36,$12
@@ -110,6 +117,7 @@ font_definition:
         .byte   $1B,$1B,$1B,$03,$06,$1B,$1B,$2B
         .byte   $0E,$1B,$18,$01,$01,$04,$00,$2A
 
+        ;; row 4
         .byte   $00,$01,$20,$0C,$08,$1F,$01,$7F
         .byte   $7F,$01,$6B,$6B,$40,$26,$45,$4D
         .byte   $12,$02,$3E,$0A,$3F,$7F,$63,$21
@@ -127,6 +135,7 @@ font_definition:
         .byte   $1B,$1B,$03,$0E,$06,$1B,$1B,$2B
         .byte   $04,$1B,$0C,$02,$01,$02,$00,$14
 
+        ;; row 5
         .byte   $00,$01,$20,$12,$08,$3F,$01,$00
         .byte   $06,$01,$3E,$08,$40,$3F,$5D,$55
         .byte   $12,$02,$10,$0A,$00,$30,$7F,$12
@@ -144,6 +153,7 @@ font_definition:
         .byte   $1B,$1B,$03,$18,$06,$1B,$0E,$2B
         .byte   $0E,$1B,$06,$02,$01,$02,$00,$2A
 
+        ;; row 6
         .byte   $00,$01,$20,$2D,$08,$0D,$01,$00
         .byte   $0C,$01,$1C,$08,$40,$06,$41,$41
         .byte   $00,$00,$1A,$0A,$0C,$18,$00,$0C
@@ -161,6 +171,7 @@ font_definition:
         .byte   $0F,$1E,$03,$0F,$06,$1E,$04,$1F
         .byte   $1B,$1E,$1F,$04,$01,$01,$00,$14
 
+        ;; row 7
         .byte   $00,$7F,$3F,$3F,$1C,$18,$01,$00
         .byte   $00,$01,$08,$08,$40,$04,$3E,$3E
         .byte   $00,$00,$4F,$00,$00,$00,$00,$00
@@ -178,20 +189,24 @@ font_definition:
         .byte   $03,$18,$00,$00,$00,$00,$00,$00
         .byte   $00,$18,$00,$00,$00,$00,$00,$2A
 
-L8C83:  .byte   $00,$00,$00,$00,$77,$30,$01
-        .byte   $00,$00,$7F,$00,$00,$7F,$00,$00
-        .byte   $00,$00,$00,$7A,$00,$00,$00,$00
-        .byte   $00,$14,$55,$2A,$00,$7F,$00,$00
+        ;; row 8
+        .byte   $00,$00,$00,$00,$77,$30,$01,$00
+        .byte   $00,$7F,$00,$00,$7F,$00,$00,$00
+        .byte   $00,$00,$7A,$00,$00,$00,$00,$00
+        .byte   $14,$55,$2A,$00,$7F,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$01,$00,$00
+        .byte   $00,$00,$00,$00,$01,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
         .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $00,$00,$00,$00,$00,$00,$00,$00
-        .byte   $0E,$00,$00,$07,$00,$00,$00,$00
-        .byte   $00,$03,$18,$00,$00,$00,$00,$00
-        .byte   $00,$00,$0E,$00,$00,$00,$00,$00
+        .byte   $00,$00,$00,$00,$00,$00,$00,$0E
+        .byte   $00,$00,$07,$00,$00,$00,$00,$00
+        .byte   $03,$18,$00,$00,$00,$00,$00,$00
+        .byte   $00,$0E,$00,$00,$00,$00,$00,$00
         ;; end of font glyphs
+
+        .assert * = font_definition + 3 + count + count * height, error, "Font length mismatch"
+.endproc