esop

commit 6cd8c459bbca435048ce6dceb8f56572be83a68d
parent 91919c03e8d2dc86c9068a795a73b03483ec9e4a
Author: Luxferre <3335173-suborg@users.noreply.gitlab.com>
Date:   Fri, 29 Jul 2022 09:07:05 +0300

fixed inkey bytes

Diffstat:
M
tal-lib/esop-lib.tal
 | 
2
+-
M
tal-lib/font.tal
 | 
3
++-
M
web/esop-ext.js
 | 
2
+-

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/tal-lib/esop-lib.tal b/tal-lib/esop-lib.tal
@@ -41,7 +41,7 @@
 
 ( jump to label or subroutine if a particular key is pressed )
 ( label* keymask* -- )
-%JMPKEY { DBGSHORT INKEY AND2 SWP2 JCN2 }
+%JMPKEY { INKEY AND2 SWP2 JCN2 }
 %JSRKEY { INKEY AND2 SWP2 JSR2 }
 
 ( misc macros )
diff --git a/tal-lib/font.tal b/tal-lib/font.tal
@@ -9,10 +9,11 @@
 BRK
 
 @on-frame
+  DUP2 PXL
   ,&adv KP-A JMPKEY 
   BRK
   &adv
-    INC DUP2 PXL
+    INC
 BRK
 
 @putc
diff --git a/web/esop-ext.js b/web/esop-ext.js
@@ -111,7 +111,7 @@ function ESOPExtensions() {
       var k = e.key
       if(k in livemap) {
         var keyval = livemap[k],
-            portnum = keyval>7 ? 3 : 2,
+            portnum = keyval>7 ? 2 : 3,
             bitmask = 1<<(keyval&7)
         vm.setdev(portnum, vm.getdev(portnum) | bitmask)
       }