From 27569aae1bcd3cdac70aa02740120efda426bf13 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 13 Jul 2023 15:30:29 -0400
Subject: [PATCH] Update Dusk

---
 build.fs | 8 ++++----
 duskos   | 2 +-
 ti84.fs  | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build.fs b/build.fs
index d7afb41..ec3c574 100644
--- a/build.fs
+++ b/build.fs
@@ -9,14 +9,14 @@ RS_ADDR $100 - value SYSVARS
 SYSVARS $80 + value LCD_MEM
 SYSVARS $82 + value GRID_MEM
 SYSVARS $85 + value KBD_MEM
-xcomp 305 306 loadr \ font compiler
+xcomp 405 406 loadr \ font compiler
 z80a xcompc
-301 304 loadr \ ti-84 boot code
+401 404 loadr \ ti-84 boot code
 z80c corel
 create ~FNT cpfnt3x5
-310 313 loadr \ LCD
+410 413 loadr \ LCD
 gridsub
-315 319 loadr \ KBD
+415 419 loadr \ KBD
 : init lcd$ kbd$ grid$ ;
 xwrap
 xorg $100 - here over - spitrom
diff --git a/duskos b/duskos
index 007037e..448b970 160000
--- a/duskos
+++ b/duskos
@@ -1 +1 @@
-Subproject commit 007037e8411e349c2cdad99f626341a1ddd9599d
+Subproject commit 448b9701483919a0c3daf1e85de62e786a565b0c
diff --git a/ti84.fs b/ti84.fs
index e3a684b..849ad7d 100644
--- a/ti84.fs
+++ b/ti84.fs
@@ -1,8 +1,8 @@
 ( ----- 000 )
 TI-84+ MASTER INDEX
 
-301 TI-84+ boot code           305 Font compiler
-310 LCD Driver                 315 Keyboard driver
+401 TI-84+ boot code           405 Font compiler
+410 LCD Driver                 415 Keyboard driver
 ( ----- 001 )
 \ TI-84+ requires specific code at specific offsets which
 \ come in conflict with Collapse OS' boot code. We thus
@@ -65,8 +65,8 @@ $100 xstart
 ( ----- 006 )
 : cpfnt3x5
   _h allot0 ( space char )
-  307 blk@ blk( 21 _l 320 + 21 _l 320 + 21 _l drop ( 63 )
-  308 blk@ blk( 21 _l 320 + 10 _l drop ( 94! ) ;
+  407 blk@ blk( 21 _l 320 + 21 _l 320 + 21 _l drop ( 63 )
+  408 blk@ blk( 21 _l 320 + 10 _l drop ( 94! ) ;
 ( ----- 007 )
 .X.X.XX.X.XXX...X..X...XX...X...............X.X..X.XX.XX.X.XXXX
 .X.X.XXXXXX...XX.X.X..X..X.XXX.X............XX.XXX...X..XX.XX..
-- 
2.45.2