From 5ef288fc907e943325a34153d503cb6997e85e57 Mon Sep 17 00:00:00 2001
From: Luxferre <3335173-suborg@users.noreply.gitlab.com>
Date: Fri, 29 Jul 2022 08:24:37 +0300
Subject: [PATCH] PXL working

---
 tal-lib/esop-lib.tal |  22 ++++++++++++++++++++++
 tal-lib/font.eso     | Bin 0 -> 227 bytes
 tal-lib/font.tal     |  21 ++-------------------
 3 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 tal-lib/esop-lib.tal
 create mode 100644 tal-lib/font.eso

diff --git a/tal-lib/esop-lib.tal b/tal-lib/esop-lib.tal
new file mode 100644
index 0000000..5ffd759
--- /dev/null
+++ b/tal-lib/esop-lib.tal
@@ -0,0 +1,22 @@
+( ESOP stdlib, macro part )
+
+|00 @Control [ &framevec $2 &io $2 &random $1 &status $1 &sound $1 &syscall $1 ]
+
+( control block macros )
+
+%SETSCRVEC { .Control/framevec DEO2 }
+%INKEY { .Control/io DEI2 }
+%PXL { .Control/io DEO2 }
+%RND { .Control/random DEI }
+%STACKTRACE { #ff .Control/random DEO }
+%DEVSTAT { .Control/status DEI }
+%SND { .Control/sound DEO }
+%SYS { .Control/syscall DEO }
+
+( some syscall macros )
+
+%HLT { #1f SYS }
+%DBG { #20 SYS SYS }
+
+( byte to short )
+%BTS { #00 SWP }
diff --git a/tal-lib/font.eso b/tal-lib/font.eso
new file mode 100644
index 0000000000000000000000000000000000000000..b513bb74ba09ecd5e086756c68f80a12b8b40150
GIT binary patch
literal 227
zcmV~$v1!9l5CG6qP@#y6F`3}Ugp_IB9!AB-2+!~_BBT(W;R+QhL@Ez(g(?v=!xbVJ
zV>H8IObTH{M#y^-r3`CXK11}z4{Ioo3<*Cz9VJ@6zwjTfN`MSH=&cyWkOu-!8~T79
zLA?OrSKd-ZL-@7c75ZgYchK1p#om+IhW2!EI~naWob_&ZK3gvtt@K-Jn`M&8W}bAE
zLT}VrN4>Su(#=j<xqa9ISOu{*ikfSpp7GLX!m)3pCNvaOJmG*Ga~@JlX%SG<YeHqn
KvL7v>ZT|taM`8N_

literal 0
HcmV?d00001

diff --git a/tal-lib/font.tal b/tal-lib/font.tal
index 0a42f53..9067e07 100644
--- a/tal-lib/font.tal
+++ b/tal-lib/font.tal
@@ -1,21 +1,4 @@
-( ESOP stdlib )
-
-|00 @Control [ &framevec $2 &io $2 &random $1 &status $1 &sound $1 &syscall $1 ]
-
-( byte to short )
-( x -- 00 x )
-%BTS { #00 SWP }
-
-( screen is #54 x #30 )
-
-%SETSCRVEC { .Control/framevec DEO2 }
-%RND { .Control/random DEI }
-%STACKTRACE { #ff .Control/random DEO }
-%SYS { .Control/syscall DEO }
-%INKEY { .Control/io DEI2 }
-%PXL { .Control/io DEO2 }
-%DBG { #20 SYS SYS }
-%SND { .Control/sound DEO }
+~esop-lib.tal
 
 ( subtract #20 from the ASCII code and you get the offset from the nanofont label )
 %CHAR-TO-NF { #20 SUB ;nanofont ADD }
@@ -26,7 +9,7 @@
   BRK
 
 @on-frame
-  DUP2 INC PXL
+  INC DUP2 PXL
 BRK
 
 @putc