From 3ece0bbe55856488c7ca2eabffe7ca8a4a310577 Mon Sep 17 00:00:00 2001
From: neauoire <aliceffekt@gmail.com>
Date: Mon, 27 Dec 2021 15:55:26 -0800
Subject: [PATCH] Fixed del char in control-trap

---
 src/main.tal  | 23 ++++++-----------------
 src/utils.tal |  2 +-
 2 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/src/main.tal b/src/main.tal
index 782bdb3..3f4f505 100644
--- a/src/main.tal
+++ b/src/main.tal
@@ -329,7 +329,7 @@ BRK
 		#01 ;draw-filepath JSR2
 		POP BRK
 		&no-edit-backspace
-	( special ) #20 >~ ,&no-edit-enter JCN
+	( special ) DUP IS-VALID ,&no-edit-enter JCN
 		;on-frame .Screen/vector DEO2
 		;on-button .Controller/vector DEO2
 		#00 .state/blink STZ
@@ -1478,15 +1478,13 @@ RTN
 
 @mcpy ( src* dst* len* -- )
 
-	SWP2 STH2 SWP2 STH2
-	#0000
-	&loop 
-		( src ) STH2kr LDA
-		( dst ) OVR2r STH2r STA
-		( inc ) INC2r SWP2r INC2r SWP2r
+	SWP2 STH2
+	OVR2 ++ SWP2
+	&loop
+		LDAk STH2kr STA INC2r
 		INC2 GTH2k ,&loop JCN
 	POP2 POP2
-	POP2r POP2r
+	POP2r
 
 RTN
 
@@ -1518,15 +1516,6 @@ RTN
 
 RTN
 
-@print-str ( string* -- )
-
-	#0001 SUB2
-	&while
-		INC2 LDAk DUP #18 DEO ,&while JCN 
-	POP2
-
-RTN
-
 @print-hex ( value* -- )
 
 	SWP ,&byte JSR
diff --git a/src/utils.tal b/src/utils.tal
index ef3d648..e6f0cee 100644
--- a/src/utils.tal
+++ b/src/utils.tal
@@ -13,7 +13,7 @@
 %8*  { #30 SFT } %8/  { #03 SFT } %8**  { #30 SFT2 } %8//  { #03 SFT2 }
 %10* { #40 SFT } %10/ { #04 SFT } %10** { #40 SFT2 } %10// { #04 SFT2 }
 %20* { #50 SFT } %20/ { #05 SFT } %20** { #50 SFT2 } %20// { #05 SFT2 }
-%40* { #60 SFT } %40/ { #06 SFT } %40** { #60 SFT2 } %60// { #05 SFT2 }
+%40* { #60 SFT } %40/ { #06 SFT } %40** { #60 SFT2 } 
 
 %2MOD  { #01 AND } %2MOD2  { #0001 AND2 }
 %4MOD  { #03 AND } %4MOD2  { #0003 AND2 }