From 3921204ee82674bfdc9e35e69f29420104670252 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Wed, 13 Jul 2022 15:44:54 -0700
Subject: [PATCH] Housekeeping

---
 src/manifest.tal | 75 +++++++-----------------------------------------
 src/nasu.tal     |  4 +--
 2 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/src/manifest.tal b/src/manifest.tal
index 0478b86..8fa1462 100644
--- a/src/manifest.tal
+++ b/src/manifest.tal
@@ -95,7 +95,7 @@ JMP2r
 
 	;get-sub JSR2
 	;menu-close JSR2
-	DUP2 #0000 EQU2 ,&skip JCN
+	ORAk #00 EQU ,&skip JCN
 		DUP2 JSR2
 		&skip
 	POP2
@@ -247,7 +247,7 @@ JMP2r
 
 	,&mask STR POP
 	;draw-menu/sel LDA ;get-cat JSR2
-	DUP2 #0000 EQU2 ,&skip JCN
+	ORAk #00 EQU ,&skip JCN
 	;draw-menu/sel LDA ;get-catx JSR2 ,&anchor STR2
 	LDAk STH INC2 ;skip-str JSR2
 	STHr #00
@@ -359,69 +359,14 @@ JMP2r
 
 ( stdlib )
 
-@scat ( src* dst* -- )
-
-	DUP2 ,slen JSR ADD2
-
-@scpy ( src* dst* -- )
-
-	STH2
-	&while
-		LDAk STH2kr STA INC2r
-		INC2 LDAk ,&while JCN
-	POP2
-	#00 STH2r STA
-
-JMP2r
-
-@slen ( str* -- len* )
-
-	DUP2 ,scap JSR SWP2 SUB2
-
-JMP2r
-
-@scap ( str* -- end* )
-
-	LDAk #00 NEQ JMP JMP2r
-	&while INC2 LDAk ,&while JCN
-
-JMP2r
-
-@sput ( char str* -- )
-
-	,scap JSR STA
-
-JMP2r
-
-@spop ( str* -- )
-
-	LDAk ,&no-null JCN
-		POP2 JMP2r &no-null
-	#00 ROT ROT ,scap JSR #0001 SUB2 STA
-
-JMP2r
-
-@mclr ( addr* len* -- )
-
-	OVR2 ADD2 SWP2
-	&loop
-		STH2k #00 STH2r STA
-		INC2 GTH2k ,&loop JCN
-	POP2 POP2
-
-JMP2r
-
-@mcpy ( src* dst* len* -- )
-
-	SWP2 STH2
-	OVR2 ADD2 SWP2
-	&loop
-		LDAk STH2kr STA INC2r
-		INC2 GTH2k ,&loop JCN
-	POP2 POP2
-	POP2r
-
-JMP2r
+@scap ( str* -- end* ) LDAk #00 NEQ JMP JMP2r &w INC2 LDAk ,&w JCN JMP2r
+@spop ( str* -- ) LDAk ,&n JCN POP2 JMP2r &n ,scap JSR #0001 SUB2 #00 ROT ROT STA JMP2r
+@sput ( chr str* -- ) ,scap JSR STA JMP2r
+@slen ( str* -- len* ) DUP2 ,scap JSR SWP2 SUB2 JMP2r
+@scat ( src* dst* -- ) DUP2 ,slen JSR ADD2
+@scpy ( src* dst* -- ) STH2 &w LDAk STH2kr STA INC2r INC2 LDAk ,&w JCN POP2 #00 STH2r STA JMP2r
+@mclr ( src* len* -- ) OVR2 ADD2 SWP2 &l STH2k #00 STH2r STA INC2 GTH2k ,&l JCN POP2 POP2 JMP2r
+@mcpy ( src* dst* len* -- ) SWP2 STH2 OVR2 ADD2 SWP2 &loop LDAk STH2kr STA INC2r INC2 GTH2k ,&loop JCN POP2 POP2 POP2r JMP2r
 
 @print ( short* -- )
 
diff --git a/src/nasu.tal b/src/nasu.tal
index a4feaf1..c194cc5 100644
--- a/src/nasu.tal
+++ b/src/nasu.tal
@@ -219,7 +219,7 @@ BRK
 @on-button ( -> )
 
 	.Controller/button DEI2 ;find-modkey JSR2
-	DUP2 #0000 EQU2 ,&skip JCN
+	ORAk #00 EQU ,&skip JCN
 		DUP2 JSR2
 		&skip
 	POP2
@@ -295,7 +295,7 @@ BRK
 		#03 SFT2 NIP STH
 		#03 SFT2 NIP STH SWPr
 		.Mouse/state DEI DUP .cursor/last LDZ
-			DUP2 #0000 EQU2 ,&end JCN
+			ORAk #00 EQU ,&end JCN
 			DUP2 #0100 NEQ2 ,&no-down JCN STH2kr ;set-selection-from JSR2 &no-down
 			DUP2 #0101 NEQ2 ,&no-up JCN STH2kr ;set-selection-to JSR2 &no-up
 		&end